[CORD-2413] add new blueprint for CORD-5.0 with Cavium Hardware
Change-Id: I889534289f6a1ff010b9d5317f8c55946310c647
diff --git a/xos/synchronizer/model_policies/model_policy_vepcserviceinstance.py b/xos/synchronizer/model_policies/model_policy_vepcserviceinstance.py
index 7f04b86..aac6f7c 100644
--- a/xos/synchronizer/model_policies/model_policy_vepcserviceinstance.py
+++ b/xos/synchronizer/model_policies/model_policy_vepcserviceinstance.py
@@ -60,6 +60,12 @@
raise Exception('No VSPGWC vendors')
service_instance.vspgwc_vendor = vendor
service_instance.invalidate_cache('vspgwc_vendor')
+ elif service_instance.leaf_model_name == 'VMMETenant':
+ vendor = VMMEVendor.objects.first()
+ if not vendor:
+ raise Exception('No VMME vendors')
+ service_instance.vmme_vendor = vendor
+ service_instance.invalidate_cache('vmme_vendor')
def child_service_instance_from_name(self, name):
diff --git a/xos/synchronizer/vepc_config.yaml b/xos/synchronizer/vepc_config.yaml
index 43f8424..5a5fa70 100644
--- a/xos/synchronizer/vepc_config.yaml
+++ b/xos/synchronizer/vepc_config.yaml
@@ -60,7 +60,53 @@
- name: VSPGWUTenant
networks:
- spgw_network
-
+ - name: mcord_5
+ networks:
+ - name: flat_network_s1u
+ subnet: 119.0.0.0/24
+ permit_all_slices: True
+ template: s11_template
+ - name: flat_network_s1mme
+ subnet: 118.0.0.0/24
+ permit_all_slices: True
+ template: s11_template
+ - name: s11_network
+ subnet: 112.0.0.0/24
+ permit_all_slices: True
+ template: s11_template
+ - name: sgi_network
+ subnet: 115.0.0.0/24
+ permit_all_slices: True
+ template: sgi_template
+ - name: spgw_network
+ subnet: 117.0.0.0/24
+ permit_all_slices: True
+ template: spgw_template
+ graph:
+ - name: VMMETenant
+ networks:
+ - management
+ - flat_network_s1mme
+ - s11_network
+ - name: VSPGWCTenant
+ networks:
+ - management
+ - s11_network
+ - spgw_network
+ links:
+ - name: VMMETenant
+ networks:
+ - s11_network
+ - name: VSPGWUTenant
+ networks:
+ - spgw_network
+ - name: VSPGWUTenant
+ networks:
+ - management
+ - flat_network_s1u
+ - sgi_network
+ - spgw_network
+
dependency_graph: "/opt/xos/synchronizers/epc-service/model-deps"
#steps_dir: "/opt/xos/synchronizers/epc-service/steps"
sys_dir: "/opt/xos/synchronizers/epc-service/sys"
diff --git a/xos/vepc.xproto b/xos/vepc.xproto
index c67e991..1c64d63 100644
--- a/xos/vepc.xproto
+++ b/xos/vepc.xproto
@@ -9,5 +9,5 @@
option verbose_name = "Virtual Evolved Packet Core ServiceInstance";
optional string description = 1 [help_text = "service chain details", max_length = 128, null = True, db_index = False, blank = True];
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'),)"];
+ 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'))"];
}