commit 3320906126d92460b3e2ddfbb0e63a8c14f4f941
author Woojoong Kim <woojoong@opennetworking.org> Tue Nov 21 15:46:09 2017 -0800
committer Andy Bavier <andy@opennetworking.org> Fri Dec 01 00:34:07 2017 +0000
tree f626fb73a211f51435c437eb7a2109080a59c058
parent d82c410a560944818b779b19b03d50c37cabceb0

[CORD-2138] Change Ansible Playbook for vSPGWC due to the new vSPGWC image

Change-Id: I28f1006c686c3788ea295104d3bb4d292de84683
(cherry picked from commit 226b133262fab6e813abacab0a9b83d2994b4ba1)

xos/synchronizer/steps/sync_vspgwctenant.py

diff --git a/xos/synchronizer/steps/sync_vspgwctenant.py b/xos/synchronizer/steps/sync_vspgwctenant.py
index cb2608e..ea8a79a 100644
--- a/xos/synchronizer/steps/sync_vspgwctenant.py
+++ b/xos/synchronizer/steps/sync_vspgwctenant.py
@@ -203,17 +203,17 @@
             "SDNControllerServiceInstance", o)
 
         if vmme_flag and venb_flag and sdncontroller_flag and vspgwu_flag and internetemulator_flag:
-            return 'ng4t_with_sdncontroller'
+            return 'normal_scenario'
 
         if vmme_flag and venb_flag and (not sdncontroller_flag) and vspgwu_flag and internetemulator_flag:
-            return 'ng4t_without_sdncontroller'
+            return 'normal_scenario_without_sdncontroller'
 
         if (not vmme_flag) and venb_flag and sdncontroller_flag and vspgwu_flag and (not internetemulator_flag):
-            return 'spirent_with_sdncontroller'
+            return 'emulator_scenario'
 
         if (not vmme_flag) and venb_flag and (not sdncontroller_flag) and vspgwu_flag and (
                 not internetemulator_flag):
-            return 'spirent_without_sdncontroller'
+            return 'emulator_scenario_without_sdncontroller'
 
         return 'manual'
 
@@ -253,7 +253,6 @@
                     'Could not find service type in service graph', service_type=sitype, object=o)
                 raise Exception(
                     "Synchronization failed due to incomplete service graph")
-
         return peer_service
 
     # To get each network id