commit 1352b578bef9fdbc304e2031e364a7d2c07c0beb
author Woojoong Kim <woojoong@opennetworking.org> Tue Nov 28 13:50:55 2017 -0800
committer Woojoong Kim <woojoong@opennetworking.org> Tue Nov 28 13:59:39 2017 -0800
tree b9a7061a8d23c9f0ff4d86c1ec7e2e7aaa4a331f
parent 719de8a5fd13470bb8137d86f9e0af029a6b5a71

[CORD-2307] change typos in Synchronizer

Change-Id: Ib791451e4c7a8e568d7f10f3f485491d23d10191

xos/synchronizer/steps/sync_vspgwutenant.py

diff --git a/xos/synchronizer/steps/sync_vspgwutenant.py b/xos/synchronizer/steps/sync_vspgwutenant.py
index 877505d..f8a8326 100644
--- a/xos/synchronizer/steps/sync_vspgwutenant.py
+++ b/xos/synchronizer/steps/sync_vspgwutenant.py
@@ -91,8 +91,8 @@
         # 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(
-            'sgi_network', "VSPGWUTenant", o, 'sgi_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')
@@ -204,27 +204,27 @@
         vmme_flag = self.has_instance("VMMETenant", o)
         sdncontroller_flag = self.has_instance(
             "SDNControllerServiceInstance", o)
-        vspgwu_flag = self.has_instance("VSPGWUTenant", o)
+        vspgwc_flag = self.has_instance("VSPGWCTenant", o)
         internetemulator_flag = self.has_instance(
             "SDNControllerServiceInstance", o)
 
-        # wait until vspgwu and env are comming up
-        if (not vspgwu_flag):
-            self.defer_sync(o, "Waiting for vSPGWU to come up")
+        # wait until vspgwc and env are comming up
+        if (not vspgwc_flag):
+            self.defer_sync(o, "Waiting for vSPGWc to come up")
 
         if (not venb_flag):
             self.defer_sync(o, "Waiting for vENB to come up")
 
-        if vmme_flag and venb_flag and sdncontroller_flag and vspgwu_flag and internetemulator_flag:
+        if vmme_flag and venb_flag and sdncontroller_flag and vspgwc_flag and internetemulator_flag:
             return 'normal_scenario'
 
-        if vmme_flag and venb_flag and (not sdncontroller_flag) and vspgwu_flag and internetemulator_flag:
+        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 vspgwu_flag and (not internetemulator_flag):
+        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 vspgwu_flag and (not internetemulator_flag):
+        if (not vmme_flag) and venb_flag and (not sdncontroller_flag) and vspgwc_flag and (not internetemulator_flag):
             return 'emulator_scenario_without_sdncontroller'
 
         return 'manual'