Merge "Add only one ONU to whitelist in flex-pod1-olt tosca recipe"
diff --git a/kubernetes-configs/onlab-pod1.yml b/kubernetes-configs/onlab-pod1.yml
index e252a2a..2c7cc53 100644
--- a/kubernetes-configs/onlab-pod1.yml
+++ b/kubernetes-configs/onlab-pod1.yml
@@ -1,10 +1,16 @@
# SEBA Values
-envoyForEtcdImage: 'matteoscandolo/voltha-envoy:ams-1.0.0'
-netconfImage: 'matteoscandolo/voltha-netconf:ams-1.0.0'
-ofagentImage: 'matteoscandolo/voltha-ofagent:ams-1.0.0'
-vcliImage: 'matteoscandolo/voltha-cli:ams-1.0.0'
-vcoreImage: 'matteoscandolo/voltha-voltha:ams-1.0.0'
+envoyForEtcdImage: 'matteoscandolo/voltha-envoy:ams-1.0.1'
+netconfImage: 'matteoscandolo/voltha-netconf:ams-1.0.1'
+ofagentImage: 'matteoscandolo/voltha-ofagent:ams-1.0.1'
+vcliImage: 'matteoscandolo/voltha-cli:ams-1.0.1'
+vcoreImage: 'matteoscandolo/voltha-voltha:ams-1.0.1'
+
+# envoyForEtcdImage: '10.90.0.101:30500/voltha/voltha-envoy:ams-1.0.1'
+# netconfImage: '10.90.0.101:30500/voltha/voltha-netconf:ams-1.0.1'
+# ofagentImage: '10.90.0.101:30500/voltha/voltha-ofagent:ams-1.0.1'
+# vcliImage: '10.90.0.101:30500/voltha/voltha-cli:ams-1.0.1'
+# vcoreImage: '10.90.0.101:30500/voltha/voltha-voltha:ams-1.0.1'
onosImage: 'matteoscandolo/onos:ams-1.0.0'
@@ -17,6 +23,8 @@
xos_coreImage: 'xosproject/xos-core:2.1.0'
fabric:
fabric_synchronizerImage: 'xosproject/fabric-synchronizer:2.1.0'
+att-workflow-driver:
+ attWorkflowDriver_synchronizerImage: '10.90.0.101:30500/xosproject/att-workflow-driver-synchronizer:candidate'
application_logs: |
log4j.logger.org.opencord.olt = DEBUG
diff --git a/tosca-configs/att-workflow/flex-pod1-olt-subscriber.yaml b/tosca-configs/att-workflow/flex-pod1-olt-subscriber.yaml
index b17c451..4914bfd 100755
--- a/tosca-configs/att-workflow/flex-pod1-olt-subscriber.yaml
+++ b/tosca-configs/att-workflow/flex-pod1-olt-subscriber.yaml
@@ -29,6 +29,7 @@
properties:
name: My House-305
status: pre-provisioned
+ s_tag: 111
c_tag: 999
onu_device: ALPHe3d1cfa7
nas_port_id : "PON 1/1/03/1:1.1.1"
diff --git a/tosca-configs/att-workflow/onlab-pod1-olt.yaml b/tosca-configs/att-workflow/onlab-pod1-olt.yaml
index 1f3e820..bcfa161 100755
--- a/tosca-configs/att-workflow/onlab-pod1-olt.yaml
+++ b/tosca-configs/att-workflow/onlab-pod1-olt.yaml
@@ -39,7 +39,7 @@
switch_datapath_id: of:0000000000000001
switch_port: "1"
outer_tpid: "0x8100"
- uplink: "128"
+ uplink: "65536"
nas_id: "NAS_ID"
requirements:
- volt_service: