Removing voltha namespace from bbsim address and skip timeouts
[Namespace]
As long as VOLTHA and BBSim are in the same namespace is not required
to specify it. This change allow different deployment setups.
[Timeouts]
BBSim runs much faster than real hardware so the timeout shouldn't be
required.
Change-Id: Id3d331ebd8b3587dc4b5483aa9e051ab78a277e7
diff --git a/libraries/utils.robot b/libraries/utils.robot
index 108efdf..b0e5548 100644
--- a/libraries/utils.robot
+++ b/libraries/utils.robot
@@ -264,7 +264,7 @@
Test Empty Device List
Run Keyword If ${has_dataplane} Wait Until Keyword Succeeds 120s 10s Openolt is Up
... ${olt_ip} ${olt_user} ${olt_pass}
- Sleep 60s
+ Run Keyword If ${has_dataplane} Sleep 60s
#create/preprovision device
${olt_device_id}= Create Device ${olt_ip} ${OLT_PORT}
Set Suite Variable ${olt_device_id}
@@ -307,7 +307,7 @@
Sleep 5s
Wait Until Keyword Succeeds ${timeout} 2s Test Devices Disabled In Voltha Root=true
Delete Devices In Voltha Root=true
- Sleep 30s
+ Run Keyword If ${has_dataplane} Sleep 30s
Wait Until Keyword Succeeds ${timeout} 2s Test Empty Device List
# Clear devices from ONOS
#Remove All Devices From ONOS
@@ -332,7 +332,7 @@
... Validate OLT Device DISABLED UNKNOWN REACHABLE ${olt_serial_number}
${rc} ${output}= Run and Return Rc and Output
... ${VOLTCTL_CONFIG}; voltctl device delete ${olt_device_id}
- Sleep 50s
+ Run Keyword If ${has_dataplane} Sleep 50s
Should Be Equal As Integers ${rc} 0
Wait Until Keyword Succeeds ${timeout} 5s Validate Device Removed ${olt_device_id}
diff --git a/tests/data/bbsim-kind-16.yaml b/tests/data/bbsim-kind-16.yaml
index bde8265..836e484 100644
--- a/tests/data/bbsim-kind-16.yaml
+++ b/tests/data/bbsim-kind-16.yaml
@@ -30,7 +30,7 @@
olts:
-
- ip: bbsim.voltha.svc
+ ip: bbsim
serial: BBSIM_OLT_0
hosts:
diff --git a/tests/data/bbsim-kind-2x2.yaml b/tests/data/bbsim-kind-2x2.yaml
index 4a61ab9..018aa78 100644
--- a/tests/data/bbsim-kind-2x2.yaml
+++ b/tests/data/bbsim-kind-2x2.yaml
@@ -29,7 +29,7 @@
olts:
-
- ip: bbsim.voltha.svc
+ ip: bbsim
serial: BBSIM_OLT_0
hosts:
diff --git a/tests/data/bbsim-kind-8x2.yaml b/tests/data/bbsim-kind-8x2.yaml
index 500f95d..baddfc9 100644
--- a/tests/data/bbsim-kind-8x2.yaml
+++ b/tests/data/bbsim-kind-8x2.yaml
@@ -30,7 +30,7 @@
olts:
-
- ip: bbsim.voltha.svc
+ ip: bbsim
serial: BBSIM_OLT_0
hosts:
diff --git a/tests/data/bbsim-kind-dt.yaml b/tests/data/bbsim-kind-dt.yaml
index 25b6799..1e9b2fe 100644
--- a/tests/data/bbsim-kind-dt.yaml
+++ b/tests/data/bbsim-kind-dt.yaml
@@ -30,7 +30,7 @@
olts:
-
- ip: bbsim.voltha.svc
+ ip: bbsim
serial: BBSIM_OLT_0
hosts:
diff --git a/tests/data/bbsim-kind.yaml b/tests/data/bbsim-kind.yaml
index 1ec3f72..a65d0fb 100644
--- a/tests/data/bbsim-kind.yaml
+++ b/tests/data/bbsim-kind.yaml
@@ -29,7 +29,7 @@
olts:
-
- ip: bbsim.voltha.svc
+ ip: bbsim
serial: BBSIM_OLT_0
hosts: