Unifying ONOSes in rcord-lite
Change-Id: I871e3be6daded3adef0288e383183a28c6a29d38
diff --git a/xos-profiles/rcord-lite/requirements.yaml b/xos-profiles/rcord-lite/requirements.yaml
index 932ed45..33417bb 100644
--- a/xos-profiles/rcord-lite/requirements.yaml
+++ b/xos-profiles/rcord-lite/requirements.yaml
@@ -30,5 +30,8 @@
version: 1.0.0
repository: file://../../xos-services/vsg-hw
- name: vrouter
- version: 2.0.0
+ version: 2.0.1-dev
repository: file://../../xos-services/vrouter
+- name: sadis-server
+ version: 1.0.0-dev
+ repository: file://../../sadis-server
diff --git a/xos-profiles/rcord-lite/templates/_tosca.tpl b/xos-profiles/rcord-lite/templates/_tosca.tpl
index a555975..f1c9e10 100644
--- a/xos-profiles/rcord-lite/templates/_tosca.tpl
+++ b/xos-profiles/rcord-lite/templates/_tosca.tpl
@@ -15,20 +15,21 @@
limitations under the License.
*/}}
-{{- define "rcord-lite.fabricAppTosca" -}}
+{{- define "rcord-lite.onosTosca" -}}
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- custom_types/onosapp.yaml
- custom_types/onosservice.yaml
+ - custom_types/serviceinstanceattribute.yaml
description: ONOS service and app for fabric
topology_template:
node_templates:
- service#ONOS_Fabric:
+ service#ONOS:
type: tosca.nodes.ONOSService
properties:
- name: ONOS_Fabric
+ name: ONOS
kind: data
- rest_hostname: {{ .onosFabricRestService | quote }}
+ rest_hostname: {{ .onosRestService | quote }}
rest_port: 8181
onos_app#segmentrouting:
@@ -38,7 +39,7 @@
app_id: org.onosproject.segmentrouting
requirements:
- owner:
- node: service#ONOS_Fabric
+ node: service#ONOS
relationship: tosca.relationships.BelongsToOne
onos_app#vrouter:
@@ -48,7 +49,7 @@
app_id: org.onosproject.vrouter
requirements:
- owner:
- node: service#ONOS_Fabric
+ node: service#ONOS
relationship: tosca.relationships.BelongsToOne
onos_app#netcfghostprovider:
@@ -58,7 +59,7 @@
app_id: org.onosproject.netcfghostprovider
requirements:
- owner:
- node: service#ONOS_Fabric
+ node: service#ONOS
relationship: tosca.relationships.BelongsToOne
onos_app#openflow:
@@ -68,30 +69,8 @@
app_id: org.onosproject.openflow
requirements:
- owner:
- node: service#ONOS_Fabric
+ node: service#ONOS
relationship: tosca.relationships.BelongsToOne
-{{- end -}}
-
-{{- define "rcord-lite.volthaOnosTosca" -}}
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-imports:
- - custom_types/onosapp.yaml
- - custom_types/onosservice.yaml
- - custom_types/serviceinstanceattribute.yaml
-
-description: Configures the VOLTHA ONOS service
-
-topology_template:
- node_templates:
-
- service#ONOS_VOLTHA:
- type: tosca.nodes.ONOSService
- properties:
- name: ONOS_VOLTHA
- kind: data
- rest_hostname: {{ .onosVolthaRestService | quote }}
- rest_port: 8181
onos_app#openflow-base:
type: tosca.nodes.ONOSApp
@@ -100,7 +79,7 @@
app_id: org.onosproject.openflow-base
requirements:
- owner:
- node: service#ONOS_VOLTHA
+ node: service#ONOS
relationship: tosca.relationships.BelongsToOne
onos_app#hostprovider:
@@ -110,7 +89,7 @@
app_id: org.onosproject.hostprovider
requirements:
- owner:
- node: service#ONOS_VOLTHA
+ node: service#ONOS
relationship: tosca.relationships.BelongsToOne
onos_app#cord-config:
@@ -122,7 +101,7 @@
version: 1.4.0
requirements:
- owner:
- node: service#ONOS_VOLTHA
+ node: service#ONOS
relationship: tosca.relationships.BelongsToOne
onos_app#olt:
@@ -135,7 +114,7 @@
dependencies: org.opencord.config
requirements:
- owner:
- node: service#ONOS_VOLTHA
+ node: service#ONOS
relationship: tosca.relationships.BelongsToOne
onos_app#sadis:
@@ -147,7 +126,7 @@
version: 2.1.0
requirements:
- owner:
- node: service#ONOS_VOLTHA
+ node: service#ONOS
relationship: tosca.relationships.BelongsToOne
onos_app#dhcpl2relay:
@@ -160,7 +139,7 @@
dependencies: org.opencord.sadis
requirements:
- owner:
- node: service#ONOS_VOLTHA
+ node: service#ONOS
relationship: tosca.relationships.BelongsToOne
onos_app#aaa:
@@ -173,7 +152,7 @@
dependencies: org.opencord.sadis
requirements:
- owner:
- node: service#ONOS_VOLTHA
+ node: service#ONOS
relationship: tosca.relationships.BelongsToOne
onos_app#kafka:
@@ -186,7 +165,7 @@
dependencies: org.opencord.olt,org.opencord.aaa,org.opencord.dhcpl2relay
requirements:
- owner:
- node: service#ONOS_VOLTHA
+ node: service#ONOS
relationship: tosca.relationships.BelongsToOne
# CORD-Configuration
@@ -324,16 +303,10 @@
# These services must be defined before loading the graph
- service#ONOS_Fabric:
+ service#ONOS:
type: tosca.nodes.ONOSService
properties:
- name: ONOS_Fabric
- must-exist: true
-
- service#ONOS_VOLTHA:
- type: tosca.nodes.ONOSService
- properties:
- name: ONOS_VOLTHA
+ name: ONOS
must-exist: true
service#fabric:
@@ -377,7 +350,7 @@
node: service#fabric
relationship: tosca.relationships.BelongsToOne
- provider_service:
- node: service#ONOS_Fabric
+ node: service#ONOS
relationship: tosca.relationships.BelongsToOne
service_dependency#rcord_volt:
@@ -401,7 +374,7 @@
node: service#volt
relationship: tosca.relationships.BelongsToOne
- provider_service:
- node: service#ONOS_VOLTHA
+ node: service#ONOS
relationship: tosca.relationships.BelongsToOne
service_dependency#fabric_vrouter:
@@ -410,10 +383,10 @@
connect_method: none
requirements:
- subscriber_service:
- node: service#fabric
+ node: service#vrouter
relationship: tosca.relationships.BelongsToOne
- provider_service:
- node: service#vrouter
+ node: service#fabric
relationship: tosca.relationships.BelongsToOne
service_dependency#volt_vsg-hw:
@@ -437,11 +410,11 @@
node: service#vsg-hw
relationship: tosca.relationships.BelongsToOne
- provider_service:
- node: service#ONOS_Fabric
+ node: service#ONOS
relationship: tosca.relationships.BelongsToOne
constraints:
type: tosca.nodes.ServiceGraphConstraint
properties:
- constraints: '[[null, "rcord"], ["ONOS_VOLTHA", "volt"], ["ONOS_Fabric", "vsg-hw"], ["fabric", null], ["vrouter", null]]'
+ constraints: '[[null, "rcord"], [null, "volt"], ["ONOS", "vsg-hw"], ["fabric", null], ["vrouter", null]]'
{{- end -}}
diff --git a/xos-profiles/rcord-lite/templates/tosca-configmap.yaml b/xos-profiles/rcord-lite/templates/tosca-configmap.yaml
index 3649e49..032a055 100644
--- a/xos-profiles/rcord-lite/templates/tosca-configmap.yaml
+++ b/xos-profiles/rcord-lite/templates/tosca-configmap.yaml
@@ -30,9 +30,7 @@
050-vrouter-service.yaml: |
{{ include "vrouter.serviceTosca" .Values.vrouter | indent 4 }}
060-onos-service-fabric.yaml: |
-{{ include "rcord-lite.fabricAppTosca" .Values | indent 4 }}
- 061-onos-voltha-service-fabric.yaml: |
-{{ include "rcord-lite.volthaOnosTosca" .Values | indent 4 }}
+{{ include "rcord-lite.onosTosca" .Values | indent 4 }}
070-fabric-service.yaml: |
{{ include "fabric.serviceTosca" .Values.fabric | indent 4 }}
300-service-graph.yaml: |
diff --git a/xos-profiles/rcord-lite/values.yaml b/xos-profiles/rcord-lite/values.yaml
index 5d68541..1cb4941 100644
--- a/xos-profiles/rcord-lite/values.yaml
+++ b/xos-profiles/rcord-lite/values.yaml
@@ -41,7 +41,5 @@
aaaAppUrl: "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opencord&a=aaa&v=1.8.0-SNAPSHOT&e=oar"
kafkaAppUrl: "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opencord&a=kafka&v=1.0.0-SNAPSHOT&e=oar"
-onosCordRestService: "onos-cord-ui.default.svc.cluster.local"
-onosVolthaRestService: "onos-voltha-ui.default.svc.cluster.local"
-onosFabricRestService: "onos-fabric-ui.default.svc.cluster.local"
+onosRestService: "onos-ui.default.svc.cluster.local"
kafkaService: "cord-kafka.default.svc.cluster.local:9092"