Updating VEG to current VSG and porting to 4.0
Change-Id: I96bfee869b1a137786413306dab80d7e257aee30
(cherry picked from commit 40731830c4a0c37006702647f49c625c369b1a77)
diff --git a/xos/admin.py b/xos/admin.py
index b743a15..4d1de3a 100644
--- a/xos/admin.py
+++ b/xos/admin.py
@@ -1,4 +1,3 @@
-
# Copyright 2017-present Open Networking Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,7 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-
from django.contrib import admin
from services.veg.models import *
@@ -26,7 +24,7 @@
from django.utils import timezone
from django.contrib.contenttypes import generic
from suit.widgets import LinkedSelect
-from core.admin import ServiceAppAdmin,SliceInline,ServiceAttrAsTabInline, ReadOnlyAwareAdmin, XOSTabularInline, ServicePrivilegeInline, TenantRootTenantInline, TenantRootPrivilegeInline
+from core.admin import ServiceAppAdmin,SliceInline,ServiceAttrAsTabInline, ReadOnlyAwareAdmin, XOSTabularInline, ServicePrivilegeInline, SubscriberLinkInline, ProviderLinkInline, ProviderDependencyInline,SubscriberDependencyInline
from core.middleware import get_request
from functools import update_wrapper
@@ -42,12 +40,12 @@
list_display_links = ('backend_status_icon', 'name', )
fieldsets = [(None, {'fields': ['backend_status_text', 'name','enabled','versionNumber', 'description', "view_url", "icon_url", "service_specific_attribute", "node_label"],
'classes':['suit-tab suit-tab-general']}),
- ("backend config", {'fields': ["url_filter_kind"],
+ ("backend config", {'fields': [ "url_filter_kind" ],
'classes':['suit-tab suit-tab-backend']}),
("vEG config", {'fields': ["dns_servers", "docker_image_name", "docker_insecure_registry"],
'classes':['suit-tab suit-tab-veg']}) ]
readonly_fields = ('backend_status_text', "service_specific_attribute")
- inlines = [SliceInline,ServiceAttrAsTabInline,ServicePrivilegeInline]
+ inlines = [SliceInline,ServiceAttrAsTabInline,ServicePrivilegeInline, ProviderDependencyInline,SubscriberDependencyInline]
extracontext_registered_admins = True
@@ -60,6 +58,7 @@
#('tools', 'Tools'),
('slices','Slices'),
('serviceattrs','Additional Attributes'),
+ ('servicetenants', 'Dependencies'),
('serviceprivileges','Privileges') ,
)
@@ -67,7 +66,7 @@
) #('hpctools.html', 'top', 'tools') )
def get_queryset(self, request):
- return VEGService.get_service_objects_by_user(request.user)
+ return VEGService.select_by_user(request.user)
class VEGTenantForm(forms.ModelForm):
last_ansible_hash = forms.CharField(required=False)
@@ -76,8 +75,7 @@
def __init__(self,*args,**kwargs):
super (VEGTenantForm,self ).__init__(*args,**kwargs)
- self.fields['kind'].widget.attrs['readonly'] = True
- self.fields['provider_service'].queryset = VEGService.objects.all()
+ self.fields['owner'].queryset = VEGService.objects.all()
if self.instance:
# fields for the attributes
self.fields['last_ansible_hash'].initial = self.instance.last_ansible_hash
@@ -85,10 +83,9 @@
self.fields['wan_container_mac'].initial = self.instance.wan_container_mac
if (not self.instance) or (not self.instance.pk):
# default fields for an 'add' form
- self.fields['kind'].initial = VEG_KIND
self.fields['creator'].initial = get_request().user
if VEGService.objects.exists():
- self.fields["provider_service"].initial = VEGService.objects.all()[0]
+ self.fields["owner"].initial = VEGService.objects.all()[0]
def save(self, commit=True):
self.instance.creator = self.cleaned_data.get("creator")
@@ -101,18 +98,20 @@
fields = '__all__'
class VEGTenantAdmin(ReadOnlyAwareAdmin):
- list_display = ('backend_status_icon', 'id', 'subscriber_tenant' )
+ list_display = ('backend_status_icon', 'id', )
list_display_links = ('backend_status_icon', 'id')
- fieldsets = [ (None, {'fields': ['backend_status_text', 'kind', 'provider_service', 'subscriber_tenant', 'service_specific_id',
+ fieldsets = [ (None, {'fields': ['backend_status_text', 'owner', 'service_specific_id',
'wan_container_ip', 'wan_container_mac', 'creator', 'instance', 'last_ansible_hash'],
'classes':['suit-tab suit-tab-general']})]
readonly_fields = ('backend_status_text', 'service_specific_attribute', 'wan_container_ip', 'wan_container_mac')
+ inlines = (ProviderLinkInline, SubscriberLinkInline)
form = VEGTenantForm
- suit_form_tabs = (('general','Details'),)
+ suit_form_tabs = (('general','Details'),
+ ('servicelinks','Links'),)
def get_queryset(self, request):
- return VEGTenant.get_tenant_objects_by_user(request.user)
+ return VEGTenant.select_by_user(request.user)
admin.site.register(VEGService, VEGServiceAdmin)