CORD-1951: Remove obsolete files; replace header.py with symlink
Change-Id: I9fae39ff3b65e67ed0896b0ba2eae752dba82a77
(cherry picked from commit d599f2ed84d11de1f7e4e96958ea703291611542)
diff --git a/xos/admin.py b/xos/admin.py
deleted file mode 100644
index d755a90..0000000
--- a/xos/admin.py
+++ /dev/null
@@ -1,80 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-from django.contrib import admin
-
-from services.fabric.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.models import AddressPool
-from core.admin import ServiceAppAdmin,SliceInline,ServiceAttrAsTabInline, ReadOnlyAwareAdmin, XOSTabularInline, ServicePrivilegeInline, TenantRootTenantInline, TenantRootPrivilegeInline
-from core.middleware import get_request
-
-from functools import update_wrapper
-from django.contrib.admin.views.main import ChangeList
-from django.core.urlresolvers import reverse
-from django.contrib.admin.utils import quote
-
-#TODO this class has to be redone according to vEE needs
-class VEEServiceForm(forms.ModelForm):
- def __init__(self,*args,**kwargs):
- super (VEEServiceForm,self ).__init__(*args,**kwargs)
-
- def save(self, commit=True):
- return super(VEEServiceForm, self).save(commit=commit)
-
- class Meta:
- model = VEEService
- fields = '__all__'
-
-class VEEServiceAdmin(ReadOnlyAwareAdmin):
- model = VEEService
- verbose_name = "VEE Service"
- verbose_name_plural = "VEE Services"
- list_display = ("backend_status_icon", "name", "enabled")
- list_display_links = ('backend_status_icon', 'name', )
- fieldsets = [(None, {'fields': ['backend_status_text', 'name','enabled','versionNumber', 'description', "view_url", "icon_url", "autoconfig", ],
- 'classes':['suit-tab suit-tab-general']})]
- readonly_fields = ('backend_status_text', )
- inlines = [SliceInline,ServiceAttrAsTabInline,ServicePrivilegeInline]
- form = VEEServiceForm
-
- extracontext_registered_admins = True
-
- user_readonly_fields = ["name", "enabled", "versionNumber", "description"]
-
- suit_form_tabs =(('general', 'VEE Service Details'),
- ('administration', 'Administration'),
- #('tools', 'Tools'),
- ('slices','Slices'),
- ('serviceattrs','Additional Attributes'),
- ('serviceprivileges','Privileges'),
- )
-
- suit_form_includes = (('veeadmin.html', 'top', 'administration'),
- )
-
- def get_queryset(self, request):
- return VEEService.get_service_objects_by_user(request.user)
-
-admin.site.register(VEEService, VEEServiceAdmin)
diff --git a/xos/attic/header.py b/xos/attic/header.py
index 0b0b7e7..055ac8d 100644
--- a/xos/attic/header.py
+++ b/xos/attic/header.py
@@ -19,8 +19,4 @@
from core.models import Service
import traceback
from xos.exceptions import *
-from xos.config import Config
-
-SERVICE_NAME = 'vee'
-SERVICE_NAME_VERBOSE = 'VEE Service'
-SERVICE_NAME_VERBOSE_PLURAL = 'VEE Services'
\ No newline at end of file
+from xosconfig import Config
diff --git a/xos/header.py b/xos/header.py
deleted file mode 100644
index e6b02f8..0000000
--- a/xos/header.py
+++ /dev/null
@@ -1,26 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-from django.db import models
-from django.db.models import *
-from core.models import Service
-import traceback
-from xos.exceptions import *
-from xosconfig import Config
-
-SERVICE_NAME = 'vee'
-SERVICE_NAME_VERBOSE = 'VEE Service'
-SERVICE_NAME_VERBOSE_PLURAL = 'VEE Services'
diff --git a/xos/header.py b/xos/header.py
new file mode 120000
index 0000000..721b5c0
--- /dev/null
+++ b/xos/header.py
@@ -0,0 +1 @@
+attic/header.py
\ No newline at end of file
diff --git a/xos/templates/veeadmin.html b/xos/templates/veeadmin.html
deleted file mode 100644
index 28cbf46..0000000
--- a/xos/templates/veeadmin.html
+++ /dev/null
@@ -1,18 +0,0 @@
-
-<!--
-Copyright 2017-present Open Networking Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-
diff --git a/xos/vee-onboard.yaml b/xos/vee-onboard.yaml
index c66fca0..66d2cc2 100644
--- a/xos/vee-onboard.yaml
+++ b/xos/vee-onboard.yaml
@@ -30,7 +30,5 @@
# The following will concatenate with base_url automatically, if
# base_url is non-null.
xproto: ./
- synchronizer: synchronizer/manifest
- synchronizer_run: vee-synchronizer.py
tosca_resource: tosca/resources/veeservice.py, tosca/resources/veeserviceinstance.py
tosca_custom_types: vee.yaml
diff --git a/xos/vee.m4 b/xos/vee.m4
index 43dab8c..414dab8 100644
--- a/xos/vee.m4
+++ b/xos/vee.m4
@@ -32,21 +32,11 @@
properties:
xos_base_props
xos_base_service_props
- backend_network_label:
- type: string
- required: false
- description: Label that matches network used to connect HPC and BBS services.
- dns_servers:
- type: string
- required: false
- node_label:
- type: string
- required: false
tosca.nodes.VEEServiceInstance:
derived_from: tosca.nodes.Root
description: >
- A VEE Tenant.
+ A VEE Service Instance.
properties:
xos_base_tenant_props
s_tag:
diff --git a/xos/vee.yaml b/xos/vee.yaml
index 63d5294..3a20614 100644
--- a/xos/vee.yaml
+++ b/xos/vee.yaml
@@ -96,21 +96,11 @@
type: string
required: false
description: Version number of Service.
- backend_network_label:
- type: string
- required: false
- description: Label that matches network used to connect HPC and BBS services.
- dns_servers:
- type: string
- required: false
- node_label:
- type: string
- required: false
tosca.nodes.VEEServiceInstance:
derived_from: tosca.nodes.Root
description: >
- A VEE Tenant.
+ A VEE Service Instance.
properties:
kind:
type: string