remove obsolete services
diff --git a/xos/services/servcomp/__init__.py b/xos/services/servcomp/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/xos/services/servcomp/__init__.py
+++ /dev/null
diff --git a/xos/services/servcomp/admin.py b/xos/services/servcomp/admin.py
deleted file mode 100644
index 3abd7cd..0000000
--- a/xos/services/servcomp/admin.py
+++ /dev/null
@@ -1,68 +0,0 @@
-from django.contrib import admin
-
-from servcomp.models import *
-from django import forms
-from django.utils.safestring import mark_safe
-from django.contrib.auth.admin import UserAdmin
-from django.contrib.admin.widgets import FilteredSelectMultiple
-from django.contrib.auth.forms import ReadOnlyPasswordHashField
-from django.contrib.auth.signals import user_logged_in
-from django.utils import timezone
-from django.contrib.contenttypes import generic
-from suit.widgets import LinkedSelect
-from core.admin import SingletonAdmin,SliceInline,ServiceAttrAsTabInline, ReadOnlyAwareAdmin, XOSTabularInline
-
-class ServiceInline(XOSTabularInline):
- model = CompositionServiceThrough
- verbose_name = "Service"
- verbose_name_plural = "Services"
- extra = 0
- #suit_classes = 'suit-tab suit-tab-general'
- fields = ('backend_status_icon', 'service', 'order')
- readonly_fields = ('backend_status_icon',)
-
-class CompositionServiceAdmin(SingletonAdmin):
- model = CompositionService
- verbose_name = "Composition Service"
- verbose_name_plural = "Composition Service"
- list_display = ("backend_status_icon", "name","enabled")
- list_display_links = ('backend_status_icon', 'name', )
- fieldsets = [(None, {'fields': ['backend_status_text', 'name','enabled','versionNumber', 'description'], 'classes':['suit-tab suit-tab-general']})]
- readonly_fields = ('backend_status_text', )
- inlines = [SliceInline,ServiceAttrAsTabInline]
-
- user_readonly_fields = ["name", "enabled", "versionNumber", "description"]
-
- suit_form_tabs =(('general', 'Composition Service Details'),
- ('slices','Slices'),
- ('serviceattrs','Additional Attributes'),
- )
-
-class CompositionForm(forms.ModelForm):
- model = Composition
- class Media:
- js = ('/static/js/menu-sort-2.js',)
-
-class CompositionAdmin(ReadOnlyAwareAdmin):
- list_display = ('backend_status_icon', 'name' )
- list_display_links = ('backend_status_icon', 'name' )
- form = CompositionForm
-
- fields = ('backend_status_text', 'name')
- readonly_fields = ('backend_status_text', )
- user_readonly_fields = ('name',)
-
- inlines = [ServiceInline]
-
-class EndUserAdmin(ReadOnlyAwareAdmin):
- list_display = ('backend_status_icon', 'email', 'macAddress', 'composition' )
- list_display_links = ('backend_status_icon', 'email' )
-
- fields = ('backend_status_text', 'email', 'firstName', 'lastName', 'macAddress', 'composition')
- readonly_fields = ('backend_status_text', )
- user_readonly_fields = ('email', 'firstName', 'lastName', 'macAddress')
-
-admin.site.register(CompositionService, CompositionServiceAdmin)
-admin.site.register(Composition, CompositionAdmin)
-admin.site.register(EndUser, EndUserAdmin)
-
diff --git a/xos/services/servcomp/migrations/__init__.py b/xos/services/servcomp/migrations/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/xos/services/servcomp/migrations/__init__.py
+++ /dev/null
diff --git a/xos/services/servcomp/models.py b/xos/services/servcomp/models.py
deleted file mode 100644
index 192554a..0000000
--- a/xos/services/servcomp/models.py
+++ /dev/null
@@ -1,43 +0,0 @@
-from django.db import models
-from core.models import User, Service, SingletonModel, PlCoreBase
-import os
-from django.db import models
-from django.forms.models import model_to_dict
-
-class CompositionService(SingletonModel,Service):
- class Meta:
- app_label = "servcomp"
- verbose_name = "Service Composition Service"
-
-class Composition(PlCoreBase):
- class Meta:
- app_label = "servcomp"
-
- name = models.CharField(max_length=255);
- services = models.ManyToManyField(Service, through='CompositionServiceThrough', blank=True);
-
- def __unicode__(self):
- return self.name
-
-class CompositionServiceThrough(PlCoreBase):
- class Meta:
- app_label = "servcomp"
- ordering = ("order", )
-
- composition = models.ForeignKey(Composition)
- service = models.ForeignKey(Service, related_name="compositions")
- order = models.IntegerField(default=0)
-
-class EndUser(PlCoreBase):
- class Meta:
- app_label = "servcomp"
-
- email = models.CharField(max_length=255)
- firstName = models.CharField(max_length=80)
- lastName = models.CharField(max_length=80)
- macAddress = models.CharField(max_length=80)
- composition = models.ForeignKey(Composition, related_name="endUsers", blank=True, null=True)
-
- def __unicode__(self):
- return self.email
-
diff --git a/xos/services/servcomp/static/js/menu-sort-2.js b/xos/services/servcomp/static/js/menu-sort-2.js
deleted file mode 100644
index d7e3005..0000000
--- a/xos/services/servcomp/static/js/menu-sort-2.js
+++ /dev/null
@@ -1,21 +0,0 @@
-jQuery(function($) {
- $("div.inline-group").sortable({
- axis: 'y',
- placeholder: 'ui-state-highlight',
- forcePlaceholderSize: 'true',
- items: '.row1, .row2',
- update: update
- });
- $("div.inline-group").disableSelection();
-});
-function update() {
- $('.row1, .row2').each(function(i) {
- $(this).find('input[id$=order]').val(i+1);
- });
-}
-jQuery(document).ready(function($){
-// $(this).find('input[id$=order]').parent('div').parent('div').hide().parent().parent().css('cursor','move');
- $(this).find('input[id$=order]').parent('td').hide().parent('tr').parent('tbody').parent('table').find("th:contains('Order')").hide();
- $(this).find('input[id$=order]').parent('td').hide().parent('tr').parent('tbody').parent('table').css('cursor','move');
- $('.add-row a').click(update);
-});
diff --git a/xos/services/urlfilter/__init__.py b/xos/services/urlfilter/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/xos/services/urlfilter/__init__.py
+++ /dev/null
diff --git a/xos/services/urlfilter/admin.py b/xos/services/urlfilter/admin.py
deleted file mode 100644
index fe99623..0000000
--- a/xos/services/urlfilter/admin.py
+++ /dev/null
@@ -1,33 +0,0 @@
-from django.contrib import admin
-
-from urlfilter.models import *
-from django import forms
-from django.utils.safestring import mark_safe
-from django.contrib.auth.admin import UserAdmin
-from django.contrib.admin.widgets import FilteredSelectMultiple
-from django.contrib.auth.forms import ReadOnlyPasswordHashField
-from django.contrib.auth.signals import user_logged_in
-from django.utils import timezone
-from django.contrib.contenttypes import generic
-from suit.widgets import LinkedSelect
-from core.admin import SingletonAdmin,SliceInline,ServiceAttrAsTabInline, ReadOnlyAwareAdmin, PlStackTabularInline
-
-class UrlFilterServiceAdmin(SingletonAdmin):
- model = UrlFilterService
- verbose_name = "Url Filter Service"
- verbose_name_plural = "Url Filter Service"
- list_display = ("backend_status_icon", "name","enabled")
- list_display_links = ('backend_status_icon', 'name', )
- fieldsets = [(None, {'fields': ['backend_status_text', 'name','enabled','versionNumber', 'description'], 'classes':['suit-tab suit-tab-general']})]
- readonly_fields = ('backend_status_text', )
- inlines = [SliceInline,ServiceAttrAsTabInline]
-
- user_readonly_fields = ["name", "enabled", "versionNumber", "description"]
-
- suit_form_tabs =(('general', 'URL Filter Details'),
- ('slices','Slices'),
- ('serviceattrs','Additional Attributes'),
- )
-
-admin.site.register(UrlFilterService, UrlFilterServiceAdmin)
-
diff --git a/xos/services/urlfilter/migrations/0001_initial.py b/xos/services/urlfilter/migrations/0001_initial.py
deleted file mode 100644
index da06233..0000000
--- a/xos/services/urlfilter/migrations/0001_initial.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import models, migrations
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('core', '0005_network_ports'),
- ]
-
- operations = [
- migrations.CreateModel(
- name='UrlFilterService',
- fields=[
- ('service_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='core.Service')),
- ],
- options={
- 'verbose_name': 'URL Filter Service',
- },
- bases=('core.service', models.Model),
- ),
- ]
diff --git a/xos/services/urlfilter/migrations/__init__.py b/xos/services/urlfilter/migrations/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/xos/services/urlfilter/migrations/__init__.py
+++ /dev/null
diff --git a/xos/services/urlfilter/models.py b/xos/services/urlfilter/models.py
deleted file mode 100644
index adbb372..0000000
--- a/xos/services/urlfilter/models.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from django.db import models
-from core.models import User, Service, SingletonModel, PlCoreBase, DiffModelMixIn
-import os
-from django.db import models
-from django.forms.models import model_to_dict
-
-class UrlFilterService(SingletonModel, Service):
- class Meta:
- app_label = "urlfilter"
- verbose_name = "URL Filter Service"
-