[CORD-2574] add buleprint into SPGWC playbook
Change-Id: I43f0d47565e20eff7369fe901f61b8375cdcef6f
diff --git a/xos/synchronizer/steps/sync_vspgwctenant.py b/xos/synchronizer/steps/sync_vspgwctenant.py
index aa1e8b2..d48bea5 100644
--- a/xos/synchronizer/steps/sync_vspgwctenant.py
+++ b/xos/synchronizer/steps/sync_vspgwctenant.py
@@ -78,17 +78,19 @@
blueprint = self.get_blueprint_and_check_dependencies(o)
- if blueprint == 'cord_4_1_scenario':
+ if blueprint == 'cord_4_1_blueprint':
return self.get_values_for_CORD_4_1(o)
- elif blueprint == 'cord_5_0_scenario':
+ elif blueprint == 'cord_5_0_blueprint':
return self.get_values_for_CORD_5_0(o)
+ elif blueprint == 'cord_5_p4_blueprint':
+ return self.get_extra_attributes_for_manual(o) # should be changed to appropriate playbook
else:
return self.get_extra_attributes_for_manual(o)
# fields for manual case
def get_extra_attributes_for_manual(self, o):
fields = {}
- fields['scenario'] = "manual"
+ fields['blueprint'] = "manual"
fields['cord_version'] = "manual"
# for interface.cfg file
fields['zmq_sub_ip'] = "manual"
@@ -112,7 +114,7 @@
def get_values_for_CORD_4_1(self, o):
fields = {}
fields['cord_version'] = "4.1"
- fields['scenario'] = "cord_4_1_scenario"
+ fields['blueprint'] = "cord_4_1_blueprint"
# for interface.cfg file
fields['zmq_sub_ip'] = "127.0.0.1"
fields['zmq_pub_ip'] = "127.0.0.1"
@@ -142,7 +144,7 @@
def get_values_for_CORD_5_0(self, o):
fields = {}
fields['cord_version'] = "5.0"
- fields['scenario'] = "cord_5_0_scenario"
+ fields['blueprint'] = "cord_5_0_blueprint"
# for interface.cfg file
fields['zmq_sub_ip'] = "127.0.0.1"
diff --git a/xos/synchronizer/steps/vspgwctenant_playbook.yaml b/xos/synchronizer/steps/vspgwctenant_playbook.yaml
index 82b35cc..2f932f8 100644
--- a/xos/synchronizer/steps/vspgwctenant_playbook.yaml
+++ b/xos/synchronizer/steps/vspgwctenant_playbook.yaml
@@ -54,4 +54,4 @@
- ip_pool_mask: "255.0.0.0"
- ip_pool_mask_int: "8"
roles:
- - onos_rule_setup
\ No newline at end of file
+ - { role: onos_rule_setup, when: scenario != "manual" }
\ No newline at end of file
diff --git a/xos/synchronizer/vspgwc_config.yaml b/xos/synchronizer/vspgwc_config.yaml
index a824b80..2260dd0 100644
--- a/xos/synchronizer/vspgwc_config.yaml
+++ b/xos/synchronizer/vspgwc_config.yaml
@@ -25,6 +25,7 @@
graph:
- name: VMMETenant
links:
+ - name: VHSSTenant
- name: VSPGWCTenant
links:
- name: VMMETenant
@@ -44,4 +45,16 @@
links:
- name: VENBServiceInstance
- name: VSPGWUTenant
+ - name: cord_5_p4_blueprint
+ graph:
+ - name: VMMETenant
+ links:
+ - name: VHSSTenant
+ - name: VSPGWCTenant
+ links:
+ - name: VMMETenant
+ - name: HSSTenant
+ links:
+ - name: HSSDBServiceInstance
+ - name: HSSDBServiceInstance