SEBA-116: Deploy standard ONOS to control VOLTHA.
Applications are pulled from repositories by XOS.
Change-Id: Ide99efeb3996cb3194f548135ae42a3336106146
diff --git a/configs/onos-voltha.yaml b/configs/onos-voltha.yaml
index 278439f..56699c6 100644
--- a/configs/onos-voltha.yaml
+++ b/configs/onos-voltha.yaml
@@ -21,7 +21,7 @@
nameOverride: "onosv"
fullnameOverride: "onos-voltha"
-onosImage: 'voltha/voltha-onos:latest'
+onosImage: 'onosproject/onos:1.13.2'
services:
openflowServiceType: ClusterIP
diff --git a/voltha/values.yaml b/voltha/values.yaml
index f91cf16..5785376 100644
--- a/voltha/values.yaml
+++ b/voltha/values.yaml
@@ -97,9 +97,6 @@
- "--consul=consul.$(NAMESPACE).svc.cluster.local:8500"
- "--controller=onos-voltha-openflow.default.svc.cluster.local:6653"
- "--grpc-endpoint=vcore.$(NAMESPACE).svc.cluster.local:50556"
-- "--enable-tls"
-- "--key-file=/ofagent/pki/voltha.key"
-- "--cert-file=/ofagent/pki/voltha.crt"
netconf_args:
- "/netconf/netconf/main.py"
diff --git a/xos-services/onos-service/templates/_tosca.tpl b/xos-services/onos-service/templates/_tosca.tpl
index 02cb557..2040e2c 100644
--- a/xos-services/onos-service/templates/_tosca.tpl
+++ b/xos-services/onos-service/templates/_tosca.tpl
@@ -160,12 +160,37 @@
rest_hostname: {{ .onosVolthaRestService | quote }}
rest_port: 8181
+ onos_app#cord-config:
+ type: tosca.nodes.ONOSApp
+ properties:
+ name: cord-config
+ app_id: org.opencord.config
+ url: {{ .cordConfigAppURL }}
+ version: 1.4.0
+ requirements:
+ - owner:
+ node: service#ONOS_VOLTHA
+ relationship: tosca.relationships.BelongsToOne
+
onos_app#olt:
type: tosca.nodes.ONOSApp
properties:
- name: org.opencord.olt
+ name: olt
app_id: org.opencord.olt
- version: 1.4.1
+ url: {{ .oltAppUrl }}
+ version: 2.0.0.SNAPSHOT
+ requirements:
+ - owner:
+ node: service#ONOS_VOLTHA
+ relationship: tosca.relationships.BelongsToOne
+
+ onos_app#sadis:
+ type: tosca.nodes.ONOSApp
+ properties:
+ name: sadis
+ app_id: org.opencord.sadis
+ url: {{ .sadisAppUrl }}
+ version: 2.1.0
requirements:
- owner:
node: service#ONOS_VOLTHA
@@ -174,9 +199,10 @@
onos_app#dhcpl2relay:
type: tosca.nodes.ONOSApp
properties:
- name: org.opencord.dhcpl2relay
+ name: dhcpl2relay
app_id: org.opencord.dhcpl2relay
- version: 1.4.0
+ url: {{ .dhcpl2relayAppUrl }}
+ version: 1.5.0.SNAPSHOT
requirements:
- owner:
node: service#ONOS_VOLTHA
@@ -185,9 +211,22 @@
onos_app#aaa:
type: tosca.nodes.ONOSApp
properties:
- name: org.opencord.aaa
+ name: aaa
app_id: org.opencord.aaa
- version: 1.6.0
+ url: {{ .aaaAppUrl }}
+ version: 1.8.0.SNAPSHOT
+ requirements:
+ - owner:
+ node: service#ONOS_VOLTHA
+ relationship: tosca.relationships.BelongsToOne
+
+ onos_app#kafka:
+ type: tosca.nodes.ONOSApp
+ properties:
+ name: kafka
+ app_id: org.opencord.kafka
+ url: {{ .kafkaAppUrl }}
+ version: 1.0.0.SNAPSHOT
requirements:
- owner:
node: service#ONOS_VOLTHA
diff --git a/xos-services/onos-service/values.yaml b/xos-services/onos-service/values.yaml
index 9a1e7dd..1d569ff 100644
--- a/xos-services/onos-service/values.yaml
+++ b/xos-services/onos-service/values.yaml
@@ -32,6 +32,13 @@
cordConfigAppURL: "https://oss.sonatype.org/service/local/repositories/releases/content/org/opencord/cord-config/1.4.0/cord-config-1.4.0.oar"
vtnAppURL: "https://oss.sonatype.org/service/local/repositories/releases/content/org/opencord/vtn/1.6.0/vtn-1.6.0.oar"
+# onos-voltha applications
+oltAppUrl: "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opencord&a=olt-app&v=2.0.0-SNAPSHOT&e=oar"
+sadisAppUrl: "https://oss.sonatype.org/service/local/repositories/releases/content/org/opencord/sadis-app/2.1.0/sadis-app-2.1.0.oar"
+dhcpl2relayAppUrl: "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opencord&a=dhcpl2relay&v=1.5.0-SNAPSHOT&e=oar"
+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"