Refactoring the mcord-profile
Change-Id: I5e82e920c2720ff09366e7c6491b4ea969d45494
diff --git a/xos-profiles/mcord/templates/tosca-configmap.yaml b/xos-profiles/mcord/templates/tosca-configmap.yaml
index f47c2b3..0928483 100644
--- a/xos-profiles/mcord/templates/tosca-configmap.yaml
+++ b/xos-profiles/mcord/templates/tosca-configmap.yaml
@@ -19,31 +19,15 @@
metadata:
name: mcord-tosca
data:
- 010-fixtures.yaml: |
+ 010-onos-service.yaml: |
+{{ include "mcord.onosTosca" .Values | indent 4 }}
+ 020-fabric-service.yaml: |
+{{ include "fabric.serviceTosca" .Values.fabric | indent 4 }}
+ 030-fixtures.yaml: |
{{ include "mcord.fixtureTosca" . | indent 4 }}
- 020-vspgwu-service.yaml: |
-{{ include "vspgwu.serviceTosca" .Values.vspgwu | indent 4 }}
- 030-vspgwc-service.yaml: |
-{{ include "vspgwc.serviceTosca" .Values.vspgwc | indent 4 }}
- 040-vmme-service.yaml: |
-{{ include "vmme.serviceTosca" .Values.vmme | indent 4 }}
- 050-vhss-service.yaml: |
-{{ include "vhss.serviceTosca" .Values.vhss | indent 4 }}
- 060-hssdb-service.yaml: |
-{{ include "hssdb.serviceTosca" .Values.hssdb | indent 4 }}
- 070-internetemulator-service.yaml: |
-{{ include "internetemulator.serviceTosca" .Values.internetemulator | indent 4 }}
- 080-progran-service.yaml: |
+ 040-progran-service.yaml: |
{{ include "progran.serviceTosca" .Values.progran | indent 4 }}
- 090-sdncontroller-service.yaml: |
-{{ include "sdncontroller.serviceTosca" .Values.sdncontroller | indent 4 }}
100-mcord-subscriber-service.yaml: |
{{ include "mcord-subscriber.serviceTosca" (index .Values "mcord-subscriber") | indent 4 }}
- 110-epc-service.yaml: |
-{{ include "epc-service.serviceTosca" (index .Values "epc-service") | indent 4 }}
300-service-graph.yaml: |
{{ include "mcord.serviceGraphTosca" . | indent 4 }}
- 310-mcord-slices.yaml: |
-{{ include "mcord.sliceTosca" . | indent 4 }}
- 320-mcord-networks.yaml: |
-{{ include "mcord.networkTosca" . | indent 4 }}