Updating vEG to new docker containers, new_base and dependecies
Change-Id: I6414cae27801ff0d26b0a7b3eb2f53312d874bf0
diff --git a/xos/admin.py b/xos/admin.py
index ebe6353..e6c9cfa 100644
--- a/xos/admin.py
+++ b/xos/admin.py
@@ -18,53 +18,6 @@
from django.core.urlresolvers import reverse
from django.contrib.admin.utils import quote
-#-----------------------------------------------------------------------------
-# vEG
-#-----------------------------------------------------------------------------
-
-class VEGServiceForm(forms.ModelForm):
- bbs_api_hostname = forms.CharField(required=False)
- bbs_api_port = forms.IntegerField(required=False)
- bbs_server = forms.CharField(required=False)
- backend_network_label = forms.CharField(required=False)
- bbs_slice = forms.ModelChoiceField(queryset=Slice.objects.all(), required=False)
- dns_servers = forms.CharField(required=False)
- url_filter_kind = forms.ChoiceField(choices=VEGService.URL_FILTER_KIND_CHOICES, required=False)
- node_label = forms.CharField(required=False)
- docker_image_name = forms.CharField(required=False)
- docker_insecure_registry = forms.BooleanField(required=False)
-
- def __init__(self,*args,**kwargs):
- super (VEGServiceForm,self ).__init__(*args,**kwargs)
- if self.instance:
- self.fields['bbs_api_hostname'].initial = self.instance.bbs_api_hostname
- self.fields['bbs_api_port'].initial = self.instance.bbs_api_port
- self.fields['bbs_server'].initial = self.instance.bbs_server
- self.fields['backend_network_label'].initial = self.instance.backend_network_label
- self.fields['bbs_slice'].initial = self.instance.bbs_slice
- self.fields['dns_servers'].initial = self.instance.dns_servers
- self.fields['url_filter_kind']. initial = self.instance.url_filter_kind
- self.fields['node_label'].initial = self.instance.node_label
- self.fields['docker_image_name'].initial = self.instance.docker_image_name
- self.fields['docker_insecure_registry'].initial = self.instance.docker_insecure_registry
-
- def save(self, commit=True):
- self.instance.bbs_api_hostname = self.cleaned_data.get("bbs_api_hostname")
- self.instance.bbs_api_port = self.cleaned_data.get("bbs_api_port")
- self.instance.bbs_server = self.cleaned_data.get("bbs_server")
- self.instance.backend_network_label = self.cleaned_data.get("backend_network_label")
- self.instance.bbs_slice = self.cleaned_data.get("bbs_slice")
- self.instance.dns_servers = self.cleaned_data.get("dns_servers")
- self.instance.url_filter_kind = self.cleaned_data.get("url_filter_kind")
- self.instance.node_label = self.cleaned_data.get("node_label")
- self.instance.docker_image_name = self.cleaned_data.get("docker_image_name")
- self.instance.docker_insecure_registry = self.cleaned_data.get("docker_insecure_registry")
- return super(VEGServiceForm, self).save(commit=commit)
-
- class Meta:
- model = VEGService
- fields = '__all__'
-
class VEGServiceAdmin(ReadOnlyAwareAdmin):
model = VEGService
verbose_name = "vEG Service"
@@ -73,13 +26,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': [ "backend_network_label", "url_filter_kind", "bbs_api_hostname", "bbs_api_port", "bbs_server", "bbs_slice"],
+ ("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]
- form = VEGServiceForm
extracontext_registered_admins = True
@@ -102,9 +54,6 @@
return VEGService.get_service_objects_by_user(request.user)
class VEGTenantForm(forms.ModelForm):
- bbs_account = forms.CharField(required=False)
- creator = forms.ModelChoiceField(queryset=User.objects.all())
- instance = forms.ModelChoiceField(queryset=Instance.objects.all(),required=False)
last_ansible_hash = forms.CharField(required=False)
wan_container_ip = forms.CharField(required=False)
wan_container_mac = forms.CharField(required=False)
@@ -112,12 +61,9 @@
def __init__(self,*args,**kwargs):
super (VEGTenantForm,self ).__init__(*args,**kwargs)
self.fields['kind'].widget.attrs['readonly'] = True
- self.fields['provider_service'].queryset = VEGService.get_service_objects().all()
+ self.fields['provider_service'].queryset = VEGService.objects.all()
if self.instance:
# fields for the attributes
- self.fields['bbs_account'].initial = self.instance.bbs_account
- self.fields['creator'].initial = self.instance.creator
- self.fields['instance'].initial = self.instance.instance
self.fields['last_ansible_hash'].initial = self.instance.last_ansible_hash
self.fields['wan_container_ip'].initial = self.instance.wan_container_ip
self.fields['wan_container_mac'].initial = self.instance.wan_container_mac
@@ -125,8 +71,8 @@
# default fields for an 'add' form
self.fields['kind'].initial = VEG_KIND
self.fields['creator'].initial = get_request().user
- if VEGService.get_service_objects().exists():
- self.fields["provider_service"].initial = VEGService.get_service_objects().all()[0]
+ if VEGService.objects.exists():
+ self.fields["provider_service"].initial = VEGService.objects.all()[0]
def save(self, commit=True):
self.instance.creator = self.cleaned_data.get("creator")
@@ -141,10 +87,10 @@
class VEGTenantAdmin(ReadOnlyAwareAdmin):
list_display = ('backend_status_icon', 'id', 'subscriber_tenant' )
list_display_links = ('backend_status_icon', 'id')
- fieldsets = [ (None, {'fields': ['backend_status_text', 'kind', 'provider_service', 'subscriber_tenant', 'service_specific_id', # 'service_specific_attribute',
- 'wan_container_ip', 'wan_container_mac', 'bbs_account', 'creator', 'instance', 'last_ansible_hash'],
+ fieldsets = [ (None, {'fields': ['backend_status_text', 'kind', 'provider_service', 'subscriber_tenant', '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', 'bbs_account', 'wan_container_ip', 'wan_container_mac')
+ readonly_fields = ('backend_status_text', 'service_specific_attribute', 'wan_container_ip', 'wan_container_mac')
form = VEGTenantForm
suit_form_tabs = (('general','Details'),)