commit 647a6928f28bd70da07cc8cb612b3d22e73356c0
author Woojoong Kim <woojoong@opennetworking.org> Mon Jan 29 15:04:50 2018 -0800
committer Woojoong Kim <woojoong@opennetworking.org> Tue Jan 30 10:21:59 2018 -0800
tree a5edb08a39b156825b9f245907f82562715bd4b9
parent bd37c5537e6a317bc35d98a991fca2421a8f1e96

[CORD-2575] add new blueprint to support second service graph for MWC

Change-Id: I61c004c779f7189116bf3720951950c9015d21a1

xos/synchronizer/vepc_config.yaml

diff --git a/xos/synchronizer/vepc_config.yaml b/xos/synchronizer/vepc_config.yaml
index 156429c..b9d74ac 100644
--- a/xos/synchronizer/vepc_config.yaml
+++ b/xos/synchronizer/vepc_config.yaml
@@ -135,6 +135,60 @@
         networks:
           - management
           - db_network
+  - name: mcord_5_p4
+    networks:
+      - name: flat_network_s1mme
+        subnet: 118.0.0.0/24
+        permit_all_slices: True
+        template: flat_template
+        owner: vmme
+      - name: s11_network
+        subnet: 112.0.0.0/24
+        permit_all_slices: True
+        template: private_template
+        owner: vspgwc
+      - name: s6a_network
+        subnet: 120.0.0.0/24
+        permit_all_slices: True
+        template: private_template
+        owner: vhss
+      - name: db_network
+        subnet: 121.0.0.0/24
+        permit_all_slices: True
+        template: private_template
+        owner: vhss
+    graph:
+      - name: VMMETenant
+        networks:
+          - management
+          - flat_network_s1mme
+          - s11_network
+          - s6a_network
+        links:
+          - name: VHSSTenant
+            networks:
+              - s6a_network
+      - name: VSPGWCTenant
+        networks:
+          - management
+          - s11_network
+        links:
+          - name: VMMETenant
+            networks:
+              - s11_network
+      - name: VHSSTenant
+        networks:
+          - management
+          - s6a_network
+          - db_network
+        links:
+          - name: HSSDBServiceInstance
+            networks:
+              - db_network
+      - name: HSSDBServiceInstance
+        networks:
+          - management
+          - db_network
 
 dependency_graph: "/opt/xos/synchronizers/epc-service/model-deps"
 #steps_dir: "/opt/xos/synchronizers/epc-service/steps"

xos/vepc.xproto

diff --git a/xos/vepc.xproto b/xos/vepc.xproto
index 451c9a4..0e65138 100644
--- a/xos/vepc.xproto
+++ b/xos/vepc.xproto
@@ -9,7 +9,7 @@
     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'),('mcord_5', 'MCORD 5'))"];
+    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'),('mcord_5_p4', 'MCORD 5 - P4'))"];
 
     optional string enodeb_ip_addr_s1mme = 4 [help_text = "external eNodeB IP address of S1-MME (for 5.0)", default = "118.0.0.10", max_length = 32, null = True, db_index = False, blank = True];
     optional string enodeb_ip_addr_s1u = 5 [help_text = "external eNodeB IP address of S1U (for 5.0)", default = "119.0.0.10", max_length = 32, null = True, db_index = False, blank = True];