[SEBA-126] Fixing TOSCA to pass stricter validation
Change-Id: I1a8dbdc8d3ab5c283d7c730e9565b5386674e845
diff --git a/xos-services/fabric-crossconnect/templates/_tosca.tpl b/xos-services/fabric-crossconnect/templates/_tosca.tpl
index 820af47..fcb3fd6 100644
--- a/xos-services/fabric-crossconnect/templates/_tosca.tpl
+++ b/xos-services/fabric-crossconnect/templates/_tosca.tpl
@@ -26,4 +26,5 @@
type: tosca.nodes.FabricCrossconnectService
properties:
name: fabric-crossconnect
+ kind: data
{{- end -}}
diff --git a/xos-services/fabric/templates/_tosca.tpl b/xos-services/fabric/templates/_tosca.tpl
index 09f3810..8a5e466 100644
--- a/xos-services/fabric/templates/_tosca.tpl
+++ b/xos-services/fabric/templates/_tosca.tpl
@@ -26,5 +26,5 @@
type: tosca.nodes.FabricService
properties:
name: fabric
- kind: platform
+ kind: data
{{- end -}}
diff --git a/xos-services/hippie-oss/templates/_tosca.tpl b/xos-services/hippie-oss/templates/_tosca.tpl
index 013ccdb..675bcc9 100644
--- a/xos-services/hippie-oss/templates/_tosca.tpl
+++ b/xos-services/hippie-oss/templates/_tosca.tpl
@@ -26,5 +26,5 @@
type: tosca.nodes.HippieOSSService
properties:
name: hippie-oss
- kind: OSS
+ kind: oss
{{- end -}}
diff --git a/xos-services/onos-service/Chart.yaml b/xos-services/onos-service/Chart.yaml
index 0a1c44c..248ffbf 100644
--- a/xos-services/onos-service/Chart.yaml
+++ b/xos-services/onos-service/Chart.yaml
@@ -15,4 +15,4 @@
description: A Helm chart for XOS's "onos-service" service, which configures ONOS
name: onos-service
-version: 2.0.1
+version: 2.0.2-dev
diff --git a/xos-services/onos-service/templates/_tosca.tpl b/xos-services/onos-service/templates/_tosca.tpl
index 17bd85a..b611e43 100644
--- a/xos-services/onos-service/templates/_tosca.tpl
+++ b/xos-services/onos-service/templates/_tosca.tpl
@@ -26,7 +26,7 @@
type: tosca.nodes.ONOSService
properties:
name: ONOS_Fabric
- kind: platform
+ kind: data
rest_hostname: {{ .onosFabricRestService | quote }}
rest_port: 8181
@@ -88,7 +88,7 @@
type: tosca.nodes.ONOSService
properties:
name: ONOS_CORD
- kind: platform
+ kind: data
rest_hostname: {{ .onosCordRestService | quote }}
rest_port: 8181
@@ -156,7 +156,7 @@
type: tosca.nodes.ONOSService
properties:
name: ONOS_VOLTHA
- kind: platform
+ kind: data
rest_hostname: {{ .onosVolthaRestService | quote }}
rest_port: 8181
diff --git a/xos-services/onos-service/values.yaml b/xos-services/onos-service/values.yaml
index 1d569ff..1800a3d 100644
--- a/xos-services/onos-service/values.yaml
+++ b/xos-services/onos-service/values.yaml
@@ -24,7 +24,7 @@
imagePullPolicy: 'Always'
-onos_synchronizerImage: "xosproject/onos-synchronizer:{{ .Chart.Version }}"
+onos_synchronizerImage: "xosproject/onos-synchronizer:master"
xosAdminUser: "admin@opencord.org"
xosAdminPassword: "letmein"
diff --git a/xos-services/rcord/templates/_tosca.tpl b/xos-services/rcord/templates/_tosca.tpl
index 846837b..030d410 100644
--- a/xos-services/rcord/templates/_tosca.tpl
+++ b/xos-services/rcord/templates/_tosca.tpl
@@ -25,4 +25,5 @@
type: tosca.nodes.RCORDService
properties:
name: rcord
+ kind: data
{{- end -}}
diff --git a/xos-services/volt/templates/_tosca.tpl b/xos-services/volt/templates/_tosca.tpl
index bbdef91..fd7e406 100644
--- a/xos-services/volt/templates/_tosca.tpl
+++ b/xos-services/volt/templates/_tosca.tpl
@@ -26,6 +26,7 @@
type: tosca.nodes.VOLTService
properties:
name: volt
+ kind: data
voltha_url: voltha.voltha.svc.cluster.local
voltha_port: 8882
onos_voltha_url: onos-voltha-ui.default.svc.cluster.local
diff --git a/xos-services/vrouter/templates/_tosca.tpl b/xos-services/vrouter/templates/_tosca.tpl
index 7dce612..e70c33d 100644
--- a/xos-services/vrouter/templates/_tosca.tpl
+++ b/xos-services/vrouter/templates/_tosca.tpl
@@ -26,5 +26,5 @@
type: tosca.nodes.VRouterService
properties:
name: vrouter
- kind: rcord
+ kind: data
{{- end -}}
diff --git a/xos-services/vsg-hw/templates/_tosca.tpl b/xos-services/vsg-hw/templates/_tosca.tpl
index d5d84be..14975f8 100644
--- a/xos-services/vsg-hw/templates/_tosca.tpl
+++ b/xos-services/vsg-hw/templates/_tosca.tpl
@@ -26,4 +26,5 @@
type: tosca.nodes.VSGHWService
properties:
name: vsg-hw
+ kind: data
{{- end -}}