Merge "[CORD-3022] Adding M-CORD images to example files"
diff --git a/examples/filter-images.yaml b/examples/filter-images.yaml
index 43bd5e4..fb00f79 100644
--- a/examples/filter-images.yaml
+++ b/examples/filter-images.yaml
@@ -16,6 +16,11 @@
 # Whitelist for use with imagebuilder
 
 docker_image_whitelist:
+- nginx
+- node
+- postgres
+- redis
+# xos-core images
 - xosproject/chameleon
 - xosproject/xos-base
 - xosproject/xos-client
@@ -26,19 +31,33 @@
 - xosproject/xos-tosca
 - xosproject/xos-ws
 - xosproject/xos-synchronizer-base
-- xosproject/openstack-synchronizer
+
+# rcord images
 - xosproject/rcord-synchronizer
 - xosproject/volt-synchronizer
 - xosproject/vrouter-synchronizer
-- xosproject/vtn-synchronizer
 - xosproject/onos-synchronizer
 - xosproject/addressmanager-synchronizer
 - xosproject/vsg-hw-synchronizer
+- xosproject/fabric-synchronizer
+
+# base-openstack images
+- xosproject/openstack-synchronizer
+- xosproject/vtn-synchronizer
+
+# mcord images
+- "xosproject/vmme-synchronizer"
+- "xosproject/vspgwc-synchronizer"
+- "xosproject/vspgwu-synchronizer"
+- "xosproject/vhss-synchronizer"
+- "xosproject/hssdb-synchronizer"
+- "xosproject/internetemulator-synchronizer"
+- "xosproject/sdncontroller-synchronizer"
+- "xosproject/vepc-synchronizer"
+- "xosproject/mcord-synchronizer"
+- "xosproject/progran-synchronizer"
+
+# others
 - xosproject/kubernetes-synchronizer
 - xosproject/simpleexampleservice-synchronizer
-- xosproject/fabric-synchronizer
 - xosproject/xos-api-tester
-- nginx
-- node
-- postgres
-- redis
diff --git a/examples/image-tag-candidate.yaml b/examples/image-tag-candidate.yaml
index 1572a8d..79441b6 100644
--- a/examples/image-tag-candidate.yaml
+++ b/examples/image-tag-candidate.yaml
@@ -26,7 +26,7 @@
   xos_guiImage: 'xosproject/xos-gui:candidate'
   xos_wsImage: 'xosproject/xos-ws:candidate'
 
-# in service charts
+# in RCORD service chart
 addressmanager:
   addressmanager_synchronizerImage: 'xosproject/addressmanager-synchronizer:candidate'
 fabric:
@@ -39,16 +39,42 @@
   vsg_hw_synchronizerImage: 'xosproject/vsg-hw-synchronizer:candidate'
 vrouter:
   vrouter_synchronizerImage: 'xosproject/vrouter-synchronizer:candidate'
-kubernetes:
-  kubernetes_synchronizerImage: 'xosproject/kubernetes-synchronizer:candidate'
 rcord:
   rcord_synchronizerImage: 'xosproject/rcord-synchronizer:candidate'
-simpleexampleservice:
-  simpleexampleservice_synchronizerImage: 'xosproject/simpleexampleservice-synchronizer:candidate'
-hippieOSS:
-  hippieOSS_synchronizerImage: 'xosproject/hippie-oss-synchronizer:candidate'
+
+# in BASE-OPENSTACK chart
 openstack:
   openstack_synchronizerImage: 'xosproject/openstack-synchronizer:candidate'
 vtn-service:
   vtn_synchronizerImage: 'xosproject/vtn-synchronizer:candidate'
 
+# in MCORD
+vmme:
+  synchronizerImage: "xosproject/vmme-synchronizer:candidate"
+vspgwc:
+  synchronizerImage: "xosproject/vspgwc-synchronizer:candidate"
+vspgwu:
+  synchronizerImage: "xosproject/vspgwu-synchronizer:candidate"
+vhss:
+  synchronizerImage: "xosproject/vhss-synchronizer:candidate"
+hssdb:
+  synchronizerImage: "xosproject/hssdb-synchronizer:candidate"
+internetemulator:
+  synchronizerImage: "xosproject/internetemulator-synchronizer:candidate"
+sdncontroller:
+  synchronizerImage: "xosproject/sdncontroller-synchronizer:candidate"
+epc-service:
+  synchronizerImage: "xosproject/vepc-synchronizer:candidate"
+mcord-subscriber:
+  synchronizerImage: "xosproject/mcord-synchronizer:candidate"
+progran:
+  synchronizerImage: "xosproject/progran-synchronizer:candidate"
+
+# others  
+kubernetes:
+  kubernetes_synchronizerImage: 'xosproject/kubernetes-synchronizer:candidate'
+simpleexampleservice:
+  simpleexampleservice_synchronizerImage: 'xosproject/simpleexampleservice-synchronizer:candidate'
+hippieOSS:
+  hippieOSS_synchronizerImage: 'xosproject/hippie-oss-synchronizer:candidate'
+
diff --git a/examples/imagePullPolicy-IfNotPresent.yaml b/examples/imagePullPolicy-IfNotPresent.yaml
index bfab79b..713d0f4 100644
--- a/examples/imagePullPolicy-IfNotPresent.yaml
+++ b/examples/imagePullPolicy-IfNotPresent.yaml
@@ -17,8 +17,10 @@
 
 # in xos-core, rcord-lite, onos and voltha charts
 imagePullPolicy: 'IfNotPresent'
+xos-gui:
+  imagePullPolicy: 'IfNotPresent'
 
-# in service charts
+# in RCORD service chart
 addressmanager:
   imagePullPolicy: 'IfNotPresent'
 fabric:
@@ -29,17 +31,43 @@
   imagePullPolicy: 'IfNotPresent'
 vsg-hw:
   imagePullPolicy: 'IfNotPresent'
-kubernetes:
-  imagePullPolicy: 'IfNotPresent'
 rcord:
   imagePullPolicy: 'IfNotPresent'
 vrouter:
   imagePullPolicy: 'IfNotPresent'
-xos-gui:
-  imagePullPolicy: 'IfNotPresent'
-simpleexampleservice:
-  imagePullPolicy: 'IfNotPresent'
+
+# in BASE-OPENSTACK chart
 openstack:
   imagePullPolicy: 'IfNotPresent'
 vtn-service:
+  imagePullPolicy: 'IfNotPresent'
+
+# in MCORD
+vmme:
+  imagePullPolicy: 'IfNotPresent'
+vspgwc:
+  imagePullPolicy: 'IfNotPresent'
+vspgwu:
+  imagePullPolicy: 'IfNotPresent'
+vhss:
+  imagePullPolicy: 'IfNotPresent'
+hssdb:
+  imagePullPolicy: 'IfNotPresent'
+internetemulator:
+  imagePullPolicy: 'IfNotPresent'
+sdncontroller:
+  imagePullPolicy: 'IfNotPresent'
+epc-service:
+  imagePullPolicy: 'IfNotPresent'
+mcord-subscriber:
+  imagePullPolicy: 'IfNotPresent'
+progran:
+  imagePullPolicy: 'IfNotPresent'
+
+# others
+kubernetes:
+  imagePullPolicy: 'IfNotPresent'
+simpleexampleservice:
+  imagePullPolicy: 'IfNotPresent'
+hippieOSS:
   imagePullPolicy: 'IfNotPresent'
\ No newline at end of file
diff --git a/xos-profiles/base-openstack/templates/_tosca.tpl b/xos-profiles/base-openstack/templates/_tosca.tpl
index 098dcd5..28ec7de 100644
--- a/xos-profiles/base-openstack/templates/_tosca.tpl
+++ b/xos-profiles/base-openstack/templates/_tosca.tpl
@@ -51,6 +51,7 @@
    - custom_types/onosservice.yaml
    - custom_types/servicedependency.yaml
    - custom_types/servicegraphconstraint.yaml
+   - custom_types/servicedependency.yaml
    - custom_types/serviceinstance.yaml
    - custom_types/serviceinstancelink.yaml
    - custom_types/vtnservice.yaml
diff --git a/xos-services/progran/templates/deployment.yaml b/xos-services/progran/templates/deployment.yaml
index 416b9df..1e6096c 100644
--- a/xos-services/progran/templates/deployment.yaml
+++ b/xos-services/progran/templates/deployment.yaml
@@ -44,8 +44,8 @@
 {{ toYaml .Values.resources | indent 12 }}
           volumeMounts:
             - name: progran-config
-              mountPath: /opt/xos/synchronizers/progran/mounted_config.yml
-              subPath: mounted_config.yml
+              mountPath: /opt/xos/synchronizers/progran/mounted_config.yaml
+              subPath: mounted_config.yaml
             - name: certchain-volume
               mountPath: /usr/local/share/ca-certificates/local_certs.crt
               subPath: config/ca_cert_chain.pem
@@ -55,7 +55,7 @@
             name: progran
             items:
               - key: serviceConfig
-                path: mounted_config.yml
+                path: mounted_config.yaml
         - name: certchain-volume
           configMap:
             name: ca-certificates