onf pod 2 fixes
Change-Id: Ia7cb93294fa4e2adc194361ff72c73790795bab7
diff --git a/deployment-configs/onlab-pod1.yml b/deployment-configs/onlab-pod1.yml
index 14e1f7b..a939770 100644
--- a/deployment-configs/onlab-pod1.yml
+++ b/deployment-configs/onlab-pod1.yml
@@ -35,7 +35,7 @@
fabric_switches:
-
mac: 'cc:37:ab:61:80:ca'
- ip: '10.6.0.111'
+ ip: '10.90.0.111'
user: 'root'
pass: 'onl'
diff --git a/kubernetes-configs/onlab-pod2.conf b/kubernetes-configs/onlab-pod2.conf
index 786c1cb..69dec87 100644
--- a/kubernetes-configs/onlab-pod2.conf
+++ b/kubernetes-configs/onlab-pod2.conf
@@ -1,19 +1,31 @@
apiVersion: v1
-kind: Config
-current-context: admin-cluster.local
-preferences: {}
clusters:
- cluster:
certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUMrVENDQWVHZ0F3SUJBZ0lKQUw0R1NlQmpqK0ZETUEwR0NTcUdTSWIzRFFFQkN3VUFNQkl4RURBT0JnTlYKQkFNTUIydDFZbVV0WTJFd0lCY05NVGd4TURBMU1qSTBPVFV3V2hnUE1qRXhPREE1TVRFeU1qUTVOVEJhTUJJeApFREFPQmdOVkJBTU1CMnQxWW1VdFkyRXdnZ0VpTUEwR0NTcUdTSWIzRFFFQkFRVUFBNElCRHdBd2dnRUtBb0lCCkFRQ2FnNUUrUE96ODBmTnFtL0NxL3lGSlVrWUNJcEZlUW1nOU1reDRqU1JYbXB2bmxlNXRPbUZ3YmJOUnpIM24KUGFjL3Jva1ZONEtWd2VQMjNFSDdZSmRFNW9TMXhPTjM0UXY2NWkyL3QvekllYk9OcndiTElBdGN6dHVydnV1NgpFVi92SWNHMHdCWTkzeFEvNklWSXhIZkxibjNRSVg0Vy9sVU1IbjVtTkZMM0tZMmlaV2ozV1QxTmRNQkRhd29wCnNEMUdNYkpxM3FTZU84OEhKZE94T3paczFMV2JGbDZHVTNwaTV5TkZYYVhudEtDU0JDeUhBay9XUWZnbVNSMUoKSGRtczlrS1VpVklnREZtNE81UldmMXZUYXVnWTliRUdoaUk4Rm9ua3VoNHl1N21mVzZHMWNGcnFic01VQUtwbApOa0FBSWZNazV3eFpEcms5NTE3aTl1S0pBZ01CQUFHalVEQk9NQjBHQTFVZERnUVdCQlNHSzRyaENPczkvd2JnCnZoTG0wZmVWNVIyb3J6QWZCZ05WSFNNRUdEQVdnQlNHSzRyaENPczkvd2JndmhMbTBmZVY1UjJvcnpBTUJnTlYKSFJNRUJUQURBUUgvTUEwR0NTcUdTSWIzRFFFQkN3VUFBNElCQVFCQkNEQ093cDcwOXZwZFFCVytsSUFKVlRESwp6Wk51dFg1OEtzUWkreVpEUEFQaXNieU55NkFzKzFoWmJMR2Z3ZXFYZWowYUZPSG9CdUhIaGptVHlkSjFuaTFxCk90U3NZR1MxdGNEbzBFVkpwMEZTM3VyM2dDN29TajcyUTlvbk96VCt2dXpqU294Qk1uTXlERktiSHVyUzA1WVgKZk9PY3VZclJGVVJUMXZOTUZ3bVRDK2hiZEc5MzRHYlpxN1NaMzN3bXJXR0RKc2dTQ1dRNk8wdnhEUEtyUVBScQpCMGl1SmhtdkZUOU5QWEd5SkVFd204UFdOci9KQms3TFN3TUV3UjVBWUJFbWp1YkNxYXBMNDhUUW9UdktrTnRlCmQvSkVLVnAwVlpCZlBnNDJ5aWxma2tMR2VXNXcreFRVMG43NytRNGl3cUZMbC9NeVpnWTNwYTA0SGRWNAotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
server: https://10.90.0.120:6443
name: cluster.local
+- cluster:
+ certificate-authority: /Users/teone/.minikube/ca.crt
+ server: https://192.168.99.100:8443
+ name: minikube
contexts:
- context:
cluster: cluster.local
user: admin-cluster.local
name: admin-cluster.local
+- context:
+ cluster: minikube
+ user: minikube
+ name: minikube
+current-context: admin-cluster.local
+kind: Config
+preferences: {}
users:
- name: admin-cluster.local
user:
client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURsakNDQW42Z0F3SUJBZ0lKQU1lUG8wb1FiTVVjTUEwR0NTcUdTSWIzRFFFQkN3VUFNQkl4RURBT0JnTlYKQkFNTUIydDFZbVV0WTJFd0lCY05NVGd4TURBMU1qSTBPVFV5V2hnUE1qRXhPREE1TVRFeU1qUTVOVEphTURReApHVEFYQmdOVkJBTU1FR3QxWW1VdFlXUnRhVzR0Ym05a1pURXhGekFWQmdOVkJBb01Ebk41YzNSbGJUcHRZWE4wClpYSnpNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1JSUJDZ0tDQVFFQWt3czhqc1QzTS9WbDQxbFoKV2Y4UDNNdVhrMUF0ekNud0ppQlUyd0RBVUxvWGJwUGs0K0FvakNCOGVKbERrbm9wUi9tYXhhbzdIWjREWmMyMwpld0pFNllJbU5nUVIzU1JnUG9Jc21ad3NEYjlPWlR5REpRV0pVQy9GczNLQWVWWmFEMGtJdG9GS1BZOW5oYndVCkRTMjViVEdwZmh4RWlKaGlVSXlxdmZkQmdXZG9BK0psNnNYL1BDQlcxN3FFL0FYRGk2dUkzV0l0a0RDSDl6OGUKRW9BcjVyTDRFMjQxd3RVZ1lxeUkyOURlZTBQcHo1V0FyVitydHczSlZyMUxaNWRPTWJ6Y0QvSCt4T2hkdEJoQwpjdFpyY1VXVDRBeU9sSk43dUR0emt6S3pnOEJnckZnamVaZ3VNNlY2aVVsdlN5YUQwQ1FmcEROOUI4NktBMXNXCnRWNEozUUlEQVFBQm80SEtNSUhITUFrR0ExVWRFd1FDTUFBd0N3WURWUjBQQkFRREFnWGdNSUdzQmdOVkhSRUUKZ2FRd2dhR0NDbXQxWW1WeWJtVjBaWE9DRW10MVltVnlibVYwWlhNdVpHVm1ZWFZzZElJV2EzVmlaWEp1WlhSbApjeTVrWldaaGRXeDBMbk4yWTRJa2EzVmlaWEp1WlhSbGN5NWtaV1poZFd4MExuTjJZeTVqYkhWemRHVnlMbXh2ClkyRnNnZ2xzYjJOaGJHaHZjM1NDQlc1dlpHVXhnaDFzWWkxaGNHbHpaWEoyWlhJdWEzVmlaWEp1WlhSbGN5NXMKYjJOaGJJY0VDbG9BZUljRUN1a0FBWWNFZndBQUFUQU5CZ2txaGtpRzl3MEJBUXNGQUFPQ0FRRUFTMUQ4azA1UQpaZnY3b2xsVi9QSG5NZG1YZWRNRXZvemE1Nmlrd3I2VGMxWWhNemh5b3Rtc0hxZ1ZYVFcwTGJCcXorNVlMZHBWCkFVdmwrUDVBZFdSTzZPTHNPSHB6NXpQR1lmbm1FK0FTN1BGY20ycUo5SzlXdHhiUTk5aUVkVEdLamk1MW9TdEQKWlNMMFo2U3dBdDBrSVZnRUxYamdiOHQ4TVJ6aDNiRDRhSEJNeUdNS3lEYUo5cEV5WURnTW9HVE14MjU3azdTZApndjkxWFdiZkVSTmJLbnM4cVV6bFNESE1ET1YxdFZjYU1MNGgxNjh1eHlHeGw3YzVyU0Z6aTdNYmUwNEJXdzcrClNrYVVISWlXV2YzK0xuWXZ5Q05lM2RvSDg3dm8yN0tzaHNBNlVFQ0pFTWNMMGYzWUVHSFV4MVdjRERLOUo1QkcKc0g0aEdlS080U3RmR2c9PQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
client-key-data: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFcEFJQkFBS0NBUUVBa3dzOGpzVDNNL1ZsNDFsWldmOFAzTXVYazFBdHpDbndKaUJVMndEQVVMb1hicFBrCjQrQW9qQ0I4ZUpsRGtub3BSL21heGFvN0haNERaYzIzZXdKRTZZSW1OZ1FSM1NSZ1BvSXNtWndzRGI5T1pUeUQKSlFXSlVDL0ZzM0tBZVZaYUQwa0l0b0ZLUFk5bmhid1VEUzI1YlRHcGZoeEVpSmhpVUl5cXZmZEJnV2RvQStKbAo2c1gvUENCVzE3cUUvQVhEaTZ1STNXSXRrRENIOXo4ZUVvQXI1ckw0RTI0MXd0VWdZcXlJMjlEZWUwUHB6NVdBCnJWK3J0dzNKVnIxTFo1ZE9NYnpjRC9IK3hPaGR0QmhDY3RacmNVV1Q0QXlPbEpON3VEdHprekt6ZzhCZ3JGZ2oKZVpndU02VjZpVWx2U3lhRDBDUWZwRE45Qjg2S0Exc1d0VjRKM1FJREFRQUJBb0lCQUdRazhQZGpHZUVmTG1jcQpRUHBVQmgrZjRQbUpUOGVPZ0duVzl6TzRUVUl0bXl2S09jY2dzVHpPR3plZldpLzJWd3NYNmRyWlZ5MlNva25CClUwYkpndGx0dEV4eGRTRWhWeEw3WVJpMURpUEd1TU9sOU1OUUEvYkNzbWpHZ00waWpHK0FsQmlIOFdIL3VzZVEKRWkvdmhpdmgrTWRVeFRBcWFEcm5zcGx5UGdDOHZnbUNBWjRpekNubVVOaFpSVHpINXMyOUFqZXBqTExIY21ScgpDTnZrYnlOdlBuSW1PTHJ6TnI2aTNLZkl0QjlqR2FmbCtqdWEvSllnNUpzOHVOYzYrVitHZzFtWWZiVjZUV3orClBRMEZ4ODRmNE0wb1psNytqbUwyTUZwQmp3MEpNTW5YdXZ1RlArZE9iK1U4YUJBdWcwcTNhRTJWUTl3MXFZRkoKdnBCSUFGa0NnWUVBd2tBaGV1bi9xMHcxQTBRcEF4QWQwWmlIQno3a3RHVUZCTmJRMThvTzRQekFoQmJHYzIyQQovRnM4dllXZ0ZCdGI0bW4zZmxmZ2w0aVM1bVJMZ3RZT3ZYRzZ6eTBBUWYrcFFTcmMxR2g4WU1wSkg0VWZldElSCjJ0cmNoL3NnYzUxQytkSUxXM1lIOW5CSkx5Ykd1ZFh6aXBKNHpGZHNlZnJjNWdTdTNaOThYV2NDZ1lFQXdjbDkKSnVHWURVVjN3RWkxSGJpcmNBVGE0cDFiRjZtZ1U3SE9sdi9uVFJnWDBLZGRNU3Z1RE1jdGtIbVNNU1M3UmpUeQprcmtKRURUSDEzeVlNQ3p1NVR0TXZyWGpCaVBCdEZrcmxvbWVXTnpWVEdVK1A4ejhVS2xuVEZES1lEWUJodEVTCi95dlFZK3h2dmhZQ0hGREpYN2RvWXNUS1RxdkFrYWlaSE85d1VCc0NnWUVBbmIvQzhMU3pRb05DMGdJNlpCaGsKZnVBbFdBY0ZhRkpaZnhLTXk1RjEvOVNDNjBJcnEzV1VPRnhIdVltWTlIczdaV1cwN2MranZxdlUwSEZHdVZ2bwo0SVJKdHhIT2tjcHp3MDV4dzdXT3ZIUEthbVNMcWd5TEgzWjVmWnk5UCtiSWkyUytnR29jRVZBaXZyMzR5Tll0ClQ2MmZtQ0t2SDJoUW1DUFpkbldjWTZVQ2dZQThlODN6SDhCY2pBMFhWOW9udjZiS25NbFFwN3B4eFVERVBwL3oKWTBYbk94amJ5QkQvTXUzbTBSZjRtdWsxSzNqRUxleDBQUXFHSTJNb2I3djBkV0hPN0ZaRXcvSnF6U2c5U1FPZwp4YTFGb1E5MSs3ZVZKRDZ3VWw5cVkyRDI3SVJIZHVRTi9yZlpLRWVzTmFSTkFDNEtFTzJrdmpWQ25yckkrNjFtCmFabE5kd0tCZ1FDcm9TbXRSWjBBVEk0SVlLb0JzSlJBa2tkOG1Rd0RpRWkrS1U2L0d5QWlZN3dYQy9tK3RTRkUKbUdpZmFPZnlOZTZEMkFKamFZUk9rYi92UmtjQzBnVXZtaWRnUUF1Ykc1R1hoR3Vjbm0rSGl2V1YyMytOeVJXVgoveXhPN1huRURzQnVwSHkxTWN5Y0VlVG9ENkF4UXlrdmhXUTJ5aXdrd2R5MXVRMndhSnZhV3c9PQotLS0tLUVORCBSU0EgUFJJVkFURSBLRVktLS0tLQo=
+- name: minikube
+ user:
+ client-certificate: /Users/teone/.minikube/client.crt
+ client-key: /Users/teone/.minikube/client.key
diff --git a/tosca-configs/att-workflow/onlab-pod2-fabric.yaml b/tosca-configs/att-workflow/onlab-pod2-fabric.yaml
index 67b26ee..f9b0b5b 100755
--- a/tosca-configs/att-workflow/onlab-pod2-fabric.yaml
+++ b/tosca-configs/att-workflow/onlab-pod2-fabric.yaml
@@ -36,7 +36,7 @@
ipv4NodeSid: 17
isEdgeRouter: True
name: leaf_1
- ofId: of:0000000000000001
+ ofId: of:0000000000000002
routerMac: 00:00:02:01:06:01
# Setup the OLT switch port
diff --git a/tosca-configs/att-workflow/onlab-pod2-olt.yaml b/tosca-configs/att-workflow/onlab-pod2-olt.yaml
index b3ec987..8a2a55b 100755
--- a/tosca-configs/att-workflow/onlab-pod2-olt.yaml
+++ b/tosca-configs/att-workflow/onlab-pod2-olt.yaml
@@ -32,11 +32,11 @@
olt_device:
type: tosca.nodes.OLTDevice
properties:
- name: ONF OLT
+ name: SHAD OLT
device_type: openolt
host: 10.90.0.122
port: 9191
- switch_datapath_id: of:0000000000000001
+ switch_datapath_id: of:0000000000000002
switch_port: "1"
outer_tpid: "0x8100"
uplink: "65536"