[CORD-2563] Add parameters to assign IP/MAC address of eNB and InternetEmulator from epc-service's UI
Change-Id: Ia316704bcf793cd1dd74384dc93b1af49bb19157
diff --git a/xos/synchronizer/model_policies/model_policy_vepcserviceinstance.py b/xos/synchronizer/model_policies/model_policy_vepcserviceinstance.py
index 711a28b..449ed74 100644
--- a/xos/synchronizer/model_policies/model_policy_vepcserviceinstance.py
+++ b/xos/synchronizer/model_policies/model_policy_vepcserviceinstance.py
@@ -53,18 +53,29 @@
if not vendor:
raise Exception('No VSPGWU vendors')
service_instance.vspgwu_vendor = vendor
+ service_instance.enodeb_ip_addr = self.obj.enodeb_ip_addr
+ service_instance.enodeb_mac_addr = self.obj.enodeb_mac_addr
+ service_instance.appserver_ip_addr = self.obj.appserver_ip_addr
+ service_instance.appserver_mac_addr = self.obj.appserver_mac_addr
+ service_instance.blueprint = self.obj.blueprint
service_instance.invalidate_cache('vspgwu_vendor')
elif service_instance.leaf_model_name == 'VSPGWCTenant':
vendor = VSPGWCVendor.objects.first()
if not vendor:
raise Exception('No VSPGWC vendors')
service_instance.vspgwc_vendor = vendor
+ service_instance.enodeb_ip_addr = self.obj.enodeb_ip_addr
+ service_instance.enodeb_mac_addr = self.obj.enodeb_mac_addr
+ service_instance.appserver_ip_addr = self.obj.appserver_ip_addr
+ service_instance.appserver_mac_addr = self.obj.appserver_mac_addr
+ service_instance.blueprint = self.obj.blueprint
service_instance.invalidate_cache('vspgwc_vendor')
elif service_instance.leaf_model_name == 'VMMETenant':
vendor = VMMEVendor.objects.first()
if not vendor:
raise Exception('No VMME vendors')
service_instance.vmme_vendor = vendor
+ service_instance.enodeb_ip_addr = self.obj.enodeb_ip_addr
service_instance.invalidate_cache('vmme_vendor')
elif service_instance.leaf_model_name == 'VHSSTenant':
vendor = VHSSVendor.objects.first()
diff --git a/xos/vepc.xproto b/xos/vepc.xproto
index 1c64d63..d678975 100644
--- a/xos/vepc.xproto
+++ b/xos/vepc.xproto
@@ -10,4 +10,9 @@
optional string description = 1 [help_text = "service chain details", max_length = 128, null = True, db_index = False, blank = True];
required manytoone site->Site:+ = 2 [help_text = "Site of the EPC Service", null = False, db_index = True, blank = False];
required string blueprint = 3 [help_text = "Select the service graph blueprint", db_index = False, default = 1, choices = "(('build', 'MCORD 4.1'),('mcord_5', 'MCORD 5'))"];
+
+ optional string enodeb_ip_addr = 4 [help_text = "external eNodeB IP address (for 5.0)", default = "127.0.0.1", max_length = 32, null = True, db_index = False, blank = True];
+ optional string enodeb_mac_addr = 5 [help_text = "external eNodeB MAC address (for 5.0)", default = "11:11:11:11:11:11", max_length = 32, null = True, db_index = False, blank = True];
+ optional string appserver_ip_addr = 6 [help_text = "external app server IP address (for 5.0)", default = "127.0.0.1", max_length = 32, null = True, db_index = False, blank = True];
+ optional string appserver_mac_addr = 7 [help_text = "external app server MAC address (for 5.0)", default = "11:11:11:11:11:11", max_length = 32, null = True, db_index = False, blank = True];
}