Trying speed profiles on POD2
Change-Id: I638865f03c74d340a14dfc4fe436275d0f2e1590
diff --git a/kubernetes-configs/onlab-pod2.yml b/kubernetes-configs/onlab-pod2.yml
index 283aa22..43c32a9 100644
--- a/kubernetes-configs/onlab-pod2.yml
+++ b/kubernetes-configs/onlab-pod2.yml
@@ -1,105 +1,63 @@
---
-# SEBA Values
-# images:
-# vcore:
-# tag: 'voltha-1.6'
-
-# vcli:
-# tag: 'voltha-1.6'
-# pullPolicy: 'Always'
-
-# ofagent:
-# tag: 'voltha-1.6'
-# pullPolicy: 'Always'
-
-# netconf:
-# tag: 'voltha-1.6'
-# pullPolicy: 'Always'
-
-# envoy_for_etcd:
-# tag: 'voltha-1.6'
-# pullPolicy: 'Always'
-
-# alarm_generator:
-# tag: 'voltha-1.6'
-# pullPolicy: 'Always'
-
-#volt:
-# image:
-# repository: '10.90.0.120:30500/xosproject/volt-synchronizer'
-# tag: candidate
-
-
-# in xos-core
+# ONOS
images:
- xos_core:
- repository: 'smbaker/xos-core'
- tag: 'test'
- xos_tosca:
- repository: 'smbaker/xos-tosca'
- tag: 'test'
-# xos_core:
-# repository: '10.90.0.120:30500/xosproject/xos-core'
-# tag: '8035085'
-# xos_chameleon:
-# repository: '10.90.0.120:30500/xosproject/chameleon'
-# tag: '8035085'
-# xos_tosca:
-# repository: '10.90.0.120:30500/xosproject/xos-tosca'
-# tag: '8035085'
-# xos_api_tester:
-# repository: '10.90.0.120:30500/xosproject/xos-api-tester'
-# tag: '8035085'
-# tosca_loader:
-# repository: '10.90.0.120:30500/xosproject/tosca-loader'
-# tag: '8035085'
+ onos:
+ repository: '10.90.0.120:30500/onosproject/onos'
+ tag: '1.13.9-rc3'
+ pullPolicy: 'Always'
-# in xos-profiles/base-kubernetes
-kubernetes:
+# VOLTHA
+ vcore:
+ repository: 10.90.0.120:30500/voltha-voltha
+ tag: dev
+ vcli:
+ repository: 10.90.0.120:30500/voltha-cli
+ tag: dev
+ ofagent:
+ repository: 10.90.0.120:30500/voltha-ofagent
+ tag: dev
+ netconf:
+ repository: 10.90.0.120:30500/voltha-netconf
+ tag: dev
+ envoy_for_etcd:
+ repository: 10.90.0.120:30500/voltha-envoy
+ tag: dev
+ alarm_generator:
+ repository: 10.90.0.120:30500/voltha-alarm-generator
+ tag: dev
+
+# SEBA services
+sadis-server:
image:
- repository: '10.90.0.120:30500/xosproject/kubernetes-synchronizer'
- tag: '8035085'
-
-# in xos-profiles/seba-services
+ repository: 10.90.0.120:30500/opencord/sadis-server
+ tag: candidate
rcord:
image:
- repository: '10.90.0.120:30500/xosproject/rcord-synchronizer'
- tag: '8035085'
-onos-service:
- image:
- repository: '10.90.0.120:30500/xosproject/onos-synchronizer'
- tag: '8035085'
-fabric:
- image:
- repository: '10.90.0.120:30500/xosproject/fabric-synchronizer'
- tag: '8035085'
-volt:
- image:
- repository: 'smbaker/volt-synchronizer'
- tag: 'test'
-#volt:
-# image:
-# repository: '10.90.0.120:30500/xosproject/volt-synchronizer'
-# tag: '8035085'
-fabric-crossconnect:
- image:
- repository: '10.90.0.120:30500/xosproject/fabric-crossconnect-synchronizer'
- tag: '8035085'
-# sadis-server:
-# image:
-# tag: '8035085'
+ repository: 10.90.0.120:30500/xosproject/rcord-synchronizer
+ tag: candidate
-# in workflows/att-workflow
-att-workflow-driver:
- image:
- repository: '10.90.0.120:30500/xosproject/att-workflow-driver-synchronizer'
- tag: '8035085'
+# ONOS applications
+aaaAppUrl: "https://oss.sonatype.org/content/repositories/snapshots/org/opencord/aaa/1.9.0-SNAPSHOT/aaa-1.9.0-20190314.212208-1.oar"
+aaaAppVersion: "1.9.0.SNAPSHOT"
+
+sadisAppUrl: "https://oss.sonatype.org/content/repositories/snapshots/org/opencord/sadis-app/3.1.0-SNAPSHOT/sadis-app-3.1.0-20190314.213159-1.oar"
+sadisAppVersion: "3.1.0.SNAPSHOT"
+
+dhcpl2relayAppUrl: "https://oss.sonatype.org/content/repositories/snapshots/org/opencord/dhcpl2relay/1.6.0-SNAPSHOT/dhcpl2relay-1.6.0-20190314.213248-1.oar"
+dhcpl2relayAppVersion: "1.6.0.SNAPSHOT"
+
+oltAppUrl: "https://oss.sonatype.org/content/repositories/snapshots/org/opencord/olt-app/3.0.1-SNAPSHOT/olt-app-3.0.1-20190314.213139-1.oar"
+oltAppVersion: "3.0.1.SNAPSHOT"
+
+kafkaAppUrl: "https://oss.sonatype.org/content/repositories/snapshots/org/opencord/kafka/1.1.0-SNAPSHOT/kafka-1.1.0-20190314.213105-1.oar"
+kafkaAppVersion: "1.1.0.SNAPSHOT"
+
# ONOS config
application_logs: |
- log4j.logger.org.opencord.olt = TRACE
+ log4j.logger.org.opencord.olt = DEBUG
log4j.logger.org.opencord.kafka = DEBUG
log4j.logger.org.opencord.sadis = DEBUG
- log4j.logger.org.opencord.aaa = TRACE
- log4j.logger.org.opencord.dhcpl2relay = TRACE
+ # log4j.logger.org.opencord.aaa = TRACE
+ # log4j.logger.org.opencord.dhcpl2relay = TRACE
diff --git a/tosca-configs/att-workflow/onlab-pod2-subscriber.yaml b/tosca-configs/att-workflow/onlab-pod2-subscriber.yaml
index 512c2bc..8d10355 100755
--- a/tosca-configs/att-workflow/onlab-pod2-subscriber.yaml
+++ b/tosca-configs/att-workflow/onlab-pod2-subscriber.yaml
@@ -17,12 +17,19 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- custom_types/rcordsubscriber.yaml
+ - custom_types/bandwidthprofile.yaml
description: Pre-provsion a subscriber
topology_template:
node_templates:
+ default_bp:
+ type: tosca.nodes.BandwidthProfile
+ properties:
+ name: Default
+ must-exist: true
+
# Pre-provision the subscriber the subscriber
shad_1:
type: tosca.nodes.RCORDSubscriber
@@ -35,15 +42,86 @@
nas_port_id : "PON 1/1/03/1:1.1.1"
circuit_id: foo1
remote_id: bar1
+ requirements:
+ - upstream_bps:
+ node: default_bp
+ relationship: tosca.relationships.BelongsToOne
+ - downstream_bps:
+ node: default_bp
+ relationship: tosca.relationships.BelongsToOne
shad_2:
type: tosca.nodes.RCORDSubscriber
properties:
- name: Sub_ISKT71E80080
+ name: Sub_ALPHe3d1cf9d
status: pre-provisioned
- c_tag: 222
+ c_tag: 112
s_tag: 222
- onu_device: ISKT71e80080
- nas_port_id : "PON 1/1/04/1:1.1.1"
+ onu_device: ALPHe3d1cf9d
+ nas_port_id : "PON 1/1/03/1:1.1.2"
circuit_id: foo2
remote_id: bar2
+ requirements:
+ - upstream_bps:
+ node: default_bp
+ relationship: tosca.relationships.BelongsToOne
+ - downstream_bps:
+ node: default_bp
+ relationship: tosca.relationships.BelongsToOne
+
+ shad_3:
+ type: tosca.nodes.RCORDSubscriber
+ properties:
+ name: Sub_ALPHe3d1cf8e
+ status: pre-provisioned
+ c_tag: 113
+ s_tag: 222
+ onu_device: ALPHe3d1cf8e
+ nas_port_id : "PON 1/1/03/1:1.1.3"
+ circuit_id: foo3
+ remote_id: bar3
+ requirements:
+ - upstream_bps:
+ node: default_bp
+ relationship: tosca.relationships.BelongsToOne
+ - downstream_bps:
+ node: default_bp
+ relationship: tosca.relationships.BelongsToOne
+
+ shad_4:
+ type: tosca.nodes.RCORDSubscriber
+ properties:
+ name: Sub_ALPHe3d1cf70
+ status: pre-provisioned
+ c_tag: 114
+ s_tag: 222
+ onu_device: ALPHe3d1cf70
+ nas_port_id : "PON 1/1/03/1:1.1.4"
+ circuit_id: foo4
+ remote_id: bar4
+ requirements:
+ - upstream_bps:
+ node: default_bp
+ relationship: tosca.relationships.BelongsToOne
+ - downstream_bps:
+ node: default_bp
+ relationship: tosca.relationships.BelongsToOne
+
+ shad_5:
+ type: tosca.nodes.RCORDSubscriber
+ properties:
+ name: Sub_ALPHe3d1ced5
+ status: pre-provisioned
+ c_tag: 115
+ s_tag: 222
+ onu_device: ALPHe3d1ced5
+ nas_port_id : "PON 1/1/03/1:1.1.5"
+ circuit_id: foo5
+ remote_id: bar5
+ requirements:
+ - upstream_bps:
+ node: default_bp
+ relationship: tosca.relationships.BelongsToOne
+ - downstream_bps:
+ node: default_bp
+ relationship: tosca.relationships.BelongsToOne