[CORD-2563] Seperate S1MME and S1U address of eNB in UI
Change-Id: I6403be325a33c31bdc019e75cd85d7a6265c7cc8
diff --git a/xos/synchronizer/model_policies/model_policy_vepcserviceinstance.py b/xos/synchronizer/model_policies/model_policy_vepcserviceinstance.py
index 449ed74..5de3a45 100644
--- a/xos/synchronizer/model_policies/model_policy_vepcserviceinstance.py
+++ b/xos/synchronizer/model_policies/model_policy_vepcserviceinstance.py
@@ -53,8 +53,8 @@
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.enodeb_ip_addr = self.obj.enodeb_ip_addr_s1u
+ service_instance.enodeb_mac_addr = self.obj.enodeb_mac_addr_s1u
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
@@ -64,8 +64,8 @@
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.enodeb_ip_addr = self.obj.enodeb_ip_addr_s1u
+ service_instance.enodeb_mac_addr = self.obj.enodeb_mac_addr_s1u
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
@@ -75,7 +75,7 @@
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.enodeb_ip_addr = self.obj.enodeb_ip_addr_s1mme
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 d678975..451c9a4 100644
--- a/xos/vepc.xproto
+++ b/xos/vepc.xproto
@@ -11,8 +11,9 @@
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];
+ optional string enodeb_ip_addr_s1mme = 4 [help_text = "external eNodeB IP address of S1-MME (for 5.0)", default = "118.0.0.10", max_length = 32, null = True, db_index = False, blank = True];
+ optional string enodeb_ip_addr_s1u = 5 [help_text = "external eNodeB IP address of S1U (for 5.0)", default = "119.0.0.10", max_length = 32, null = True, db_index = False, blank = True];
+ optional string enodeb_mac_addr_s1u = 6 [help_text = "external eNodeB MAC address of S1U (for 5.0)", default = "00:ad:de:00:00:80", max_length = 32, null = True, db_index = False, blank = True];
+ optional string appserver_ip_addr = 7 [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 = 8 [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];
}