pod2 fixes
Change-Id: Idda7ecccfe37dc0b8d0aba4617c204df208912ab
diff --git a/kubernetes-configs/onlab-pod1.yml b/kubernetes-configs/onlab-pod1.yml
index e86eaf9..5062830 100644
--- a/kubernetes-configs/onlab-pod1.yml
+++ b/kubernetes-configs/onlab-pod1.yml
@@ -1,19 +1,19 @@
# SEBA Values
-envoyForEtcdImage: 'voltha/voltha-envoy:latest'
+envoyForEtcdImage: '10.90.0.101:30500/voltha/voltha-envoy:cig'
#freeradiusImage: '10.90.0.101:30500/freeradius:tls'
-freeradiusImage: 'tpdock/freeradius:latest'
-netconfImage: 'voltha/voltha-netconf:latest'
-ofagentImage: 'voltha/voltha-ofagent:latest'
-vcliImage: 'voltha/voltha-cli:latest'
-vcoreImage: 'voltha/voltha-voltha:latest'
+# freeradiusImage: 'tpdock/freeradius:latest'
+netconfImage: '10.90.0.101:30500/voltha/voltha-netconf:cig'
+ofagentImage: '10.90.0.101:30500/voltha/voltha-ofagent:cig'
+vcliImage: '10.90.0.101:30500/voltha/voltha-cli:cig'
+vcoreImage: '10.90.0.101:30500/voltha/voltha-voltha:cig'
-onosImage: 'onosproject/onos:1.13.4'
+# onosImage: '10.90.0.101:30500/onosproject/onos:candidate'
#xos_coreImage: '10.90.0.101:30500/xosproject/xos-core:candidate'
-volt:
- volt_synchronizerImage: "10.90.0.101:30500/xosproject/volt-synchronizer:candidate"
+#xos-gui:
+# xos_wsImage: '10.90.0.101:30500/xosproject/xos-ws:candidate'
application_logs: |
log4j.logger.org.opencord.olt = TRACE
@@ -22,3 +22,4 @@
log4j.logger.org.opencord.aaa = TRACE
log4j.logger.org.opencord.dhcpl2relay = TRACE
log4j.logger.org.onosproject.drivers = DEBUG
+ log4j.logger.org.onosproject.segmentrouting = TRACE
diff --git a/kubernetes-configs/onlab-pod2.yml b/kubernetes-configs/onlab-pod2.yml
index 287d017..83b42ef 100644
--- a/kubernetes-configs/onlab-pod2.yml
+++ b/kubernetes-configs/onlab-pod2.yml
@@ -1,14 +1,14 @@
# SEBA Values
-envoyForEtcdImage: 'voltha/voltha-envoy:1.5.0'
+envoyForEtcdImage: 'voltha/voltha-envoy:latest'
#freeradiusImage: '10.90.0.120:30500/freeradius:tls'
freeradiusImage: 'tpdock/freeradius:latest'
-netconfImage: 'voltha/voltha-netconf:1.5.0'
-ofagentImage: 'voltha/voltha-ofagent:1.5.0'
-vcliImage: 'voltha/voltha-cli:1.5.0'
-vcoreImage: 'voltha/voltha-voltha:1.5.0'
+netconfImage: 'voltha/voltha-netconf:latest'
+ofagentImage: 'voltha/voltha-ofagent:latest'
+vcliImage: 'voltha/voltha-cli:latest'
+vcoreImage: 'voltha/voltha-voltha:latest'
-onosImage: 'onosproject/onos:1.13.4'
+onosImage: '10.90.0.101:30500/onosproject/onos:candidate'
xos_coreImage: '10.90.0.120:30500/xosproject/xos-core:candidate'
diff --git a/tosca-configs/att-workflow/onlab-pod1-cig.yaml b/tosca-configs/att-workflow/onlab-pod1-cig.yaml
index 2ae457f..faccdf3 100755
--- a/tosca-configs/att-workflow/onlab-pod1-cig.yaml
+++ b/tosca-configs/att-workflow/onlab-pod1-cig.yaml
@@ -74,7 +74,7 @@
properties:
name: Sub_CIGG70606829
status: pre-provisioned
- c_tag: 111
+ c_tag: 444
s_tag: 444
onu_device: CIGG70606829
nas_port_id : "PON 1/1/03/1:1.1.1"
diff --git a/tosca-configs/att-workflow/onlab-pod2-fabric.yaml b/tosca-configs/att-workflow/onlab-pod2-fabric.yaml
index f9b0b5b..5a51c20 100755
--- a/tosca-configs/att-workflow/onlab-pod2-fabric.yaml
+++ b/tosca-configs/att-workflow/onlab-pod2-fabric.yaml
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# curl -H "xos-username: admin@opencord.org" -H "xos-password: letmein" -X POST --data-binary @onlab-pod1-fabric.yaml http://10.90.0.101:30007/run
+# curl -H "xos-username: admin@opencord.org" -H "xos-password: letmein" -X POST --data-binary @onlab-pod2-fabric.yaml http://10.90.0.120:30007/run
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
@@ -81,7 +81,7 @@
properties:
serial_number: ALPHe3d1cfe3
pon_port_id: 536870912
- device_id: of:000000000a5a0097
+ device_id: of:000000000a5a007a
requirements:
- owner:
node: service#att
@@ -91,8 +91,8 @@
type: tosca.nodes.AttWorkflowDriverWhiteListEntry
properties:
serial_number: ISKT71e80080
- pon_port_id: 536870912
- device_id: of:000000000a5a0097
+ pon_port_id: 536870927
+ device_id: of:000000000a5a007a
requirements:
- owner:
node: service#att
diff --git a/tosca-configs/att-workflow/onlab-pod2-olt.yaml b/tosca-configs/att-workflow/onlab-pod2-olt.yaml
index 8a2a55b..f712a1a 100755
--- a/tosca-configs/att-workflow/onlab-pod2-olt.yaml
+++ b/tosca-configs/att-workflow/onlab-pod2-olt.yaml
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# curl -H "xos-username: admin@opencord.org" -H "xos-password: letmein" -X POST --data-binary @onlab-pod1-olt.yaml http://10.90.0.101:30007/run
+# curl -H "xos-username: admin@opencord.org" -H "xos-password: letmein" -X POST --data-binary @onlab-pod2-olt.yaml http://10.90.0.120:30007/run
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
diff --git a/tosca-configs/att-workflow/onlab-pod2-subscriber.yaml b/tosca-configs/att-workflow/onlab-pod2-subscriber.yaml
index 1170b31..512c2bc 100755
--- a/tosca-configs/att-workflow/onlab-pod2-subscriber.yaml
+++ b/tosca-configs/att-workflow/onlab-pod2-subscriber.yaml
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# curl -H "xos-username: admin@opencord.org" -H "xos-password: letmein" -X POST --data-binary @onlab-pod1-subscriber.yaml http://10.90.0.101:30007/run
+# curl -H "xos-username: admin@opencord.org" -H "xos-password: letmein" -X POST --data-binary @onlab-pod2-subscriber.yaml http://10.90.0.120:30007/run
tosca_definitions_version: tosca_simple_yaml_1_0
imports: