[CORD-2554] update playbook according to new spgwu image
Change-Id: I0333d966025213f3115a4b928daf11d8f80d427e
diff --git a/xos/synchronizer/steps/sync_vspgwutenant.py b/xos/synchronizer/steps/sync_vspgwutenant.py
index d912df0..33042e1 100644
--- a/xos/synchronizer/steps/sync_vspgwutenant.py
+++ b/xos/synchronizer/steps/sync_vspgwutenant.py
@@ -38,25 +38,18 @@
scenario = self.get_scenario(o)
- if scenario == 'normal_scenario':
- return self.get_values_for_normal_scenario(o)
- elif scenario == 'normal_scenario_without_sdncontroller':
- return self.get_values_for_normal_scenario_wo_sdncontroller(o)
- elif scenario == 'emulator_scenario':
- return self.get_values_for_emulator_scenario(o)
- elif scenario == 'emulator_scenario_without_sdncontroller':
- return self.get_values_for_emulator_scenario_wo_sdncontroller(o)
- elif scenario == 'hardware_scenario':
- return self.get_values_for_hardware_scenario(o)
- elif scenario == 'hardware_scenario_without_sdncontroller':
- return self.get_values_for_hardware_scenario_wo_sdncontroller(o)
+ if scenario == 'cord_4_1_scenario':
+ return self.get_values_for_CORD_4_1(o)
+ elif scenario == 'cord_5_0_scenario':
+ return self.get_values_for_CORD_5_0(o)
else:
return self.get_extra_attributes_for_manual(o)
# fields for manual case
def get_extra_attributes_for_manual(self, o):
fields = {}
- fields['scenario'] = self.get_scenario(o)
+ fields['scenario'] = "manual"
+ fields['cord_version'] = "manual"
# for interface.cfg file
fields['zmq_sub_ip'] = "manual"
fields['zmq_pub_ip'] = "manual"
@@ -77,110 +70,10 @@
return fields
- def get_values_for_normal_scenario(self, o):
+ def get_values_for_CORD_4_1(self, o):
fields = {}
- fields['scenario'] = "normal_scenario"
- # for interface.cfg file
- fields['zmq_sub_ip'] = self.get_ip_address_from_peer_service_instance(
- 'sbi_network', "SDNControllerServiceInstance", o, 'zmq_sub_ip')
- fields['zmq_pub_ip'] = self.get_ip_address_from_peer_service_instance(
- 'sbi_network', "SDNControllerServiceInstance", o, 'zmq_pub_ip')
- fields['dp_comm_ip'] = self.get_ip_address_from_peer_service_instance_instance(
- 'sbi_network', o, o, 'dp_comm_ip')
- fields['cp_comm_ip'] = self.get_ip_address_from_peer_service_instance(
- 'nbi_network', "VSPGWCTenant", o, 'cp_comm_ip')
- fields['fpc_ip'] = self.get_ip_address_from_peer_service_instance(
- 'nbi_network', "SDNControllerServiceInstance", o, 'fpc_ip')
- fields['cp_nb_server_ip'] = self.get_ip_address_from_peer_service_instance(
- 'nbi_network', "VSPGWCTenant", o, 'cp_nb_server_ip')
-
- # for dp_config.cfg file
- fields['s1u_ip'] = self.get_ip_address_from_peer_service_instance_instance(
- 's1u_network', o, o, 's1u_ip')
- fields['sgi_ip'] = self.get_ip_address_from_peer_service_instance_instance(
- 'sgi_network', o, o, 'sgi_ip')
-
- # for static_arp.cfg file
- fields['as_sgi_ip'] = self.get_ip_address_from_peer_service_instance(
- 'sgi_network', "InternetEmulatorServiceInstance", o, 'as_sgi_ip')
- fields['as_sgi_mac'] = self.get_mac_address_from_peer_service_instance(
- 'sgi_network', "InternetEmulatorServiceInstance", o, 'as_sgi_mac')
- fields['enb_s1u_ip'] = self.get_ip_address_from_peer_service_instance(
- 's1u_network', "VENBServiceInstance", o, 'enb_s1u_ip')
- fields['enb_s1u_mac'] = self.get_mac_address_from_peer_service_instance(
- 's1u_network', "VENBServiceInstance", o, 'enb_s1u_mac')
-
- return fields
-
- def get_values_for_normal_scenario_wo_sdncontroller(self, o):
- fields = {}
- fields['scenario'] = "normal_scenario_without_sdncontroller"
- # for interface.cfg file
- fields['zmq_sub_ip'] = "127.0.0.1"
- fields['zmq_pub_ip'] = "127.0.0.1"
- fields['dp_comm_ip'] = self.get_ip_address_from_peer_service_instance_instance(
- 'spgw_network', o, o, 'dp_comm_ip')
- fields['cp_comm_ip'] = self.get_ip_address_from_peer_service_instance(
- 'spgw_network', "VSPGWCTenant", o, 'cp_comm_ip')
- fields['fpc_ip'] = "127.0.0.1"
- fields['cp_nb_server_ip'] = "127.0.0.1"
-
- # for cp_config.cfg file
- fields['s1u_ip'] = self.get_ip_address_from_peer_service_instance_instance(
- 's1u_network', o, o, 's1u_ip')
- fields['sgi_ip'] = self.get_ip_address_from_peer_service_instance_instance(
- 'sgi_network', o, o, 'sgi_ip')
-
- # for static_arp.cfg file
- fields['as_sgi_ip'] = self.get_ip_address_from_peer_service_instance(
- 'sgi_network', "InternetEmulatorServiceInstance", o, 'as_sgi_ip')
- fields['as_sgi_mac'] = self.get_mac_address_from_peer_service_instance(
- 'sgi_network', "InternetEmulatorServiceInstance", o, 'as_sgi_mac')
- fields['enb_s1u_ip'] = self.get_ip_address_from_peer_service_instance(
- 's1u_network', "VENBServiceInstance", o, 'enb_s1u_ip')
- fields['enb_s1u_mac'] = self.get_mac_address_from_peer_service_instance(
- 's1u_network', "VENBServiceInstance", o, 'enb_s1u_mac')
-
- return fields
-
- def get_values_for_emulator_scenario(self, o):
- fields = {}
- fields['scenario'] = "emulator_scenario"
- # for interface.cfg file
- fields['zmq_sub_ip'] = self.get_ip_address_from_peer_service_instance(
- 'sbi_network', "SDNControllerServiceInstance", o, 'zmq_sub_ip')
- fields['zmq_pub_ip'] = self.get_ip_address_from_peer_service_instance(
- 'sbi_network', "SDNControllerServiceInstance", o, 'zmq_pub_ip')
- fields['dp_comm_ip'] = self.get_ip_address_from_peer_service_instance_instance(
- 'sbi_network', o, o, 'dp_comm_ip')
- fields['cp_comm_ip'] = self.get_ip_address_from_peer_service_instance(
- 'nbi_network', "VSPGWCTenant", o, 'cp_comm_ip')
- fields['fpc_ip'] = self.get_ip_address_from_peer_service_instance(
- 'nbi_network', "SDNControllerServiceInstance", o, 'fpc_ip')
- fields['cp_nb_server_ip'] = self.get_ip_address_from_peer_service_instance(
- 'nbi_network', "VSPGWCTenant", o, 'cp_nb_server_ip')
-
- # for dp_config.cfg file
- fields['s1u_ip'] = self.get_ip_address_from_peer_service_instance_instance(
- 's1u_network', o, o, 's1u_ip')
- fields['sgi_ip'] = self.get_ip_address_from_peer_service_instance_instance(
- 'sgi_network', o, o, 'sgi_ip')
-
- # for static_arp.cfg file
- fields['as_sgi_ip'] = self.get_ip_address_from_peer_service_instance(
- 'sgi_network', "VENBServiceInstance", o, 'as_sgi_ip')
- fields['as_sgi_mac'] = self.get_mac_address_from_peer_service_instance(
- 'sgi_network', "VENBServiceInstance", o, 'as_sgi_mac')
- fields['enb_s1u_ip'] = self.get_ip_address_from_peer_service_instance(
- 's1u_network', "VENBServiceInstance", o, 'enb_s1u_ip')
- fields['enb_s1u_mac'] = self.get_mac_address_from_peer_service_instance(
- 's1u_network', "VENBServiceInstance", o, 'enb_s1u_mac')
-
- return fields
-
- def get_values_for_emulator_scenario_wo_sdncontroller(self, o):
- fields = {}
- fields['scenario'] = "emulator_scenario_without_sdncontroller"
+ fields['cord_version'] = "4.1"
+ fields['scenario'] = "cord_4_1_scenario"
# for interface.cfg file
fields['zmq_sub_ip'] = "127.0.0.1"
fields['zmq_pub_ip'] = "127.0.0.1"
@@ -209,42 +102,11 @@
return fields
- def get_values_for_hardware_scenario(self, o):
+ def get_values_for_CORD_5_0(self, o):
fields = {}
- fields['scenario'] = "hardware_scenario"
- # for interface.cfg file
- fields['zmq_sub_ip'] = self.get_ip_address_from_peer_service_instance(
- 'sbi_network', "SDNControllerServiceInstance", o, 'zmq_sub_ip')
- fields['zmq_pub_ip'] = self.get_ip_address_from_peer_service_instance(
- 'sbi_network', "SDNControllerServiceInstance", o, 'zmq_pub_ip')
- fields['dp_comm_ip'] = self.get_ip_address_from_peer_service_instance_instance(
- 'sbi_network', o, o, 'dp_comm_ip')
- fields['cp_comm_ip'] = self.get_ip_address_from_peer_service_instance(
- 'nbi_network', "VSPGWCTenant", o, 'cp_comm_ip')
- fields['fpc_ip'] = self.get_ip_address_from_peer_service_instance(
- 'nbi_network', "SDNControllerServiceInstance", o, 'fpc_ip')
- fields['cp_nb_server_ip'] = self.get_ip_address_from_peer_service_instance(
- 'nbi_network', "VSPGWCTenant", o, 'cp_nb_server_ip')
+ fields['cord_version'] = "5.0"
+ fields['scenario'] = "cord_5_0_scenario"
- # for dp_config.cfg file
- fields['s1u_ip'] = self.get_ip_address_from_peer_service_instance_instance(
- 'flat_network_s1u', o, o, 's1u_ip')
- fields['sgi_ip'] = self.get_ip_address_from_peer_service_instance_instance(
- 'sgi_network', o, o, 'sgi_ip')
-
- # for static_arp.cfg file
- fields['as_sgi_ip'] = "manual"
- fields['as_sgi_mac'] = "manual"
- fields['enb_s1u_ip'] = self.get_ip_address_from_peer_service_instance(
- 'flat_network_s1u', "VMMETenant", o, 'enb_s1u_ip')
- fields['enb_s1u_mac'] = self.get_mac_address_from_peer_service_instance(
- 'flat_network_s1u', "VMMETenant", o, 'enb_s1u_mac')
-
- return fields
-
- def get_values_for_hardware_scenario_wo_sdncontroller(self, o):
- fields = {}
- fields['scenario'] = "hardware_scenario_without_sdncontroller"
# for interface.cfg file
fields['zmq_sub_ip'] = "127.0.0.1"
fields['zmq_pub_ip'] = "127.0.0.1"
@@ -255,19 +117,22 @@
fields['fpc_ip'] = "127.0.0.1"
fields['cp_nb_server_ip'] = "127.0.0.1"
- # for dp_config.cfg file
+ # for cp_config.cfg file
fields['s1u_ip'] = self.get_ip_address_from_peer_service_instance_instance(
- 'flat_network_s1u', o, o, 's1u_ip')
+ 's1u_network', o, o, 's1u_ip')
fields['sgi_ip'] = self.get_ip_address_from_peer_service_instance_instance(
'sgi_network', o, o, 'sgi_ip')
# for static_arp.cfg file
- fields['as_sgi_ip'] = "manual"
- fields['as_sgi_mac'] = "manual"
- fields['enb_s1u_ip'] = self.get_ip_address_from_peer_service_instance(
- 'flat_network_s1u', "VMMETenant", o, 'enb_s1u_ip')
- fields['enb_s1u_mac'] = self.get_mac_address_from_peer_service_instance(
- 'flat_network_s1u', "VMMETenant", o, 'enb_s1u_mac')
+ internetemulator_flag = self.has_instance("InternetEmulatorServiceInstance", o)
+ if (internetemulator_flag):
+ fields['as_sgi_ip'] = self.get_ip_address_from_peer_service_instance('sgi_network', "InternetEmulatorServiceInstance", o, 'as_sgi_ip')
+ fields['as_sgi_mac'] = self.get_mac_address_from_peer_service_instance('sgi_network', "InternetEmulatorServiceInstance", o, 'as_sgi_mac')
+ else:
+ fields['as_sgi_ip'] = o.appserver_ip_addr
+ fields['as_sgi_mac'] = o.appserver_mac_addr
+ fields['enb_s1u_ip'] = o.enodeb_ip_addr # write down eNB IP address manually (S1U)
+ fields['enb_s1u_mac'] = o.enodeb_mac_addr # write down eNB MAC address manually (S1U)
return fields
@@ -290,25 +155,27 @@
"SDNControllerServiceInstance", o)
vspgwc_flag = self.has_instance("VSPGWCTenant", o)
internetemulator_flag = self.has_instance(
- "SDNControllerServiceInstance", o)
+ "InternetEmulatorServiceInstance", o)
+ vhss_flag = self.has_instance("VHSSTenant", o)
+ hssdb_flag = self.has_instance("HSSDBServiceInstance", o)
- if vmme_flag and venb_flag and sdncontroller_flag and vspgwc_flag and internetemulator_flag:
- return 'normal_scenario'
+ if (o.blueprint == "build") or (o.blueprint == "MCORD 4.1"):
+ if not venb_flag:
+ self.defer_sync(o, "Waiting for eNB image to become available")
+ if not vspgwc_flag:
+ self.defer_sync(o, "Waiting for SPGWC image to become available")
+ return 'cord_4_1_scenario'
- if vmme_flag and venb_flag and (not sdncontroller_flag) and vspgwc_flag and internetemulator_flag:
- return 'normal_scenario_without_sdncontroller'
-
- if (not vmme_flag) and venb_flag and sdncontroller_flag and vspgwc_flag and (not internetemulator_flag):
- return 'emulator_scenario'
-
- if (not vmme_flag) and venb_flag and (not sdncontroller_flag) and vspgwc_flag and (not internetemulator_flag):
- return 'emulator_scenario_without_sdncontroller'
-
- if vmme_flag and sdncontroller_flag and vspgwc_flag and (not internetemulator_flag):
- return 'hardware_scenario'
-
- if vmme_flag and (not sdncontroller_flag) and vspgwc_flag and (not internetemulator_flag):
- return 'hardware_scenario_without_sdncontroller'
+ if (o.blueprint == "mcord_5") or (o.blueprint == "MCORD 5"):
+ if not hssdb_flag:
+ self.defer_sync(o, "Waiting for HSS_DB image to become available")
+ if not vhss_flag:
+ self.defer_sync(o, "Waiting for vHSS image to become available")
+ if not vmme_flag:
+ self.defer_sync(o, "Waiting for vMME image to become available")
+ if not vspgwc_flag:
+ self.defer_sync(o, "Waiting for vSPGWC image to become available")
+ return 'cord_5_0_scenario'
return 'manual'