Adding EPC to M-CORD service graph
Change-Id: I5a2a2f5bbccbd926ea189806cd5cb4764f38e8ef
diff --git a/xos-profiles/mcord/Chart.yaml b/xos-profiles/mcord/Chart.yaml
index 6b1af77..e86fd78 100644
--- a/xos-profiles/mcord/Chart.yaml
+++ b/xos-profiles/mcord/Chart.yaml
@@ -17,7 +17,7 @@
description: A Helm chart for the "mcord" profile
icon: https://guide.opencord.org/logos/cord.svg
-version: 1.0.9
+version: 1.0.10
# xosproject/tosca-loader version
appVersion: 1.1.7
diff --git a/xos-profiles/mcord/requirements.yaml b/xos-profiles/mcord/requirements.yaml
index 281a740..2d55262 100644
--- a/xos-profiles/mcord/requirements.yaml
+++ b/xos-profiles/mcord/requirements.yaml
@@ -26,7 +26,7 @@
version: 2.0.5
repository: file://../../xos-services/mcord-subscriber
- name: progran
- version: 2.0.6
+ version: 2.0.7
repository: file://../../xos-services/progran
- name: vrouter
version: 2.0.5
diff --git a/xos-profiles/mcord/templates/_tosca.tpl b/xos-profiles/mcord/templates/_tosca.tpl
index 62fce70..eb7f151 100644
--- a/xos-profiles/mcord/templates/_tosca.tpl
+++ b/xos-profiles/mcord/templates/_tosca.tpl
@@ -149,7 +149,41 @@
properties:
name: epc-remote
- mcord_progran:
+ service#cdn-local:
+ type: tosca.nodes.Service
+ properties:
+ name: cdn-local
+
+ service#cdn-remote:
+ type: tosca.nodes.Service
+ properties:
+ name: cdn-remote
+
+ service_dependency#epc_local_cdn_local:
+ type: tosca.nodes.ServiceDependency
+ properties:
+ connect_method: none
+ requirements:
+ - subscriber_service:
+ node: service#epc-local
+ relationship: tosca.relationships.BelongsToOne
+ - provider_service:
+ node: service#cdn-local
+ relationship: tosca.relationships.BelongsToOne
+
+ service_dependency#cdn_local_cdn_remote:
+ type: tosca.nodes.ServiceDependency
+ properties:
+ connect_method: none
+ requirements:
+ - subscriber_service:
+ node: service#cdn-local
+ relationship: tosca.relationships.BelongsToOne
+ - provider_service:
+ node: service#cdn-remote
+ relationship: tosca.relationships.BelongsToOne
+
+ service_dependency#mcord_progran:
type: tosca.nodes.ServiceDependency
properties:
connect_method: none
@@ -161,7 +195,7 @@
node: service#mcord
relationship: tosca.relationships.BelongsToOne
- progran_epc_local:
+ service_dependency#progran_epc_local:
type: tosca.nodes.ServiceDependency
properties:
connect_method: none
@@ -173,7 +207,7 @@
node: service#progran
relationship: tosca.relationships.BelongsToOne
- epc_local_epc_remote:
+ service_dependency#epc_local_epc_remote:
type: tosca.nodes.ServiceDependency
properties:
connect_method: none
@@ -215,7 +249,6 @@
{{- if .Values.seba.enabled }}
constraints: '[ ["mcord", null, "onos"], ["progran", null, "fabric"], ["epc-local", null, null] ["epc-remote", null, null] ]'
{{ else }}
- constraints: '[ ["mcord", "rcord", null], ["progran", "volt", "att-workflow-driver"], ["epc-local", "fabric-crossconnect", "onos"], ["epc-remote", "vrouter", "fabric"] ]'
+ constraints: '[ ["mcord", null, "rcord", null], ["progran", null, "volt", "att-workflow-driver"], ["epc-local", "cdn-local", "fabric-crossconnect", "onos"], ["epc-remote", "cdn-remote", "vrouter", "fabric"] ]'
{{- end -}}
{{- end -}}
-
diff --git a/xos-services/progran/Chart.yaml b/xos-services/progran/Chart.yaml
index 6b2b51b..3c6a715 100644
--- a/xos-services/progran/Chart.yaml
+++ b/xos-services/progran/Chart.yaml
@@ -17,5 +17,5 @@
description: A Helm chart for XOS's "progran" service
icon: https://guide.opencord.org/logos/cord.svg
-version: 2.0.6
+version: 2.0.7
appVersion: 2.0.5
diff --git a/xos-services/progran/templates/_tosca.tpl b/xos-services/progran/templates/_tosca.tpl
index 27825a4..f952daa 100644
--- a/xos-services/progran/templates/_tosca.tpl
+++ b/xos-services/progran/templates/_tosca.tpl
@@ -30,5 +30,5 @@
properties:
name: progran
onos_address: onos-progran-ui
- onos_port: 8181
+ onos_port: "8181"
{{- end -}}