framework changes
Change-Id: I13484cd96fa33507baa44df327ea07233e851ed5
diff --git a/libraries/onos.robot b/libraries/onos.robot
index 39a10e1..113a65e 100644
--- a/libraries/onos.robot
+++ b/libraries/onos.robot
@@ -26,7 +26,7 @@
Library OperatingSystem
*** Keywords ***
-Execute ONOS Command
+Execute ONOS CLI Command
[Arguments] ${host} ${port} ${cmd}
[Documentation] Establishes an ssh connection to the onos contoller and executes a command
${conn_id}= SSHLibrary.Open Connection ${host} port=${port} prompt=onos> timeout=300s
@@ -46,27 +46,28 @@
@{serial_numbers}= Create List
: FOR ${INDEX} IN RANGE 0 ${length}
\ ${value}= Get From List ${jsondata['devices']} ${INDEX}
- \ ${sn}= Get From Dictionary ${value} serial
\ ${of_id}= Get From Dictionary ${value} id
+ \ ${sn}= Get From Dictionary ${value} serial
+ \ Run Keyword If '${sn}' == '${serial_number}' Exit For Loop
Should Be Equal As Strings ${sn} ${serial_number}
[Return] ${of_id}
Verify Eapol Flows Added
[Arguments] ${ip} ${port} ${expected_flows}
[Documentation] Matches for number of eapol flows based on number of onus
- ${eapol_flows_added}= Execute ONOS Command ${ip} ${port} flows -s -f ADDED | grep eapol | grep IN_PORT | wc -l
+ ${eapol_flows_added}= Execute ONOS CLI Command ${ip} ${port} flows -s -f ADDED | grep eapol | grep IN_PORT | wc -l
Should Contain ${eapol_flows_added} ${expected_flows}
Verify Number of AAA-Users
[Arguments] ${ip} ${port} ${expected_onus}
[Documentation] Matches for number of aaa-users authorized based on number of onus
##TODO: filter by onu serial number instead of count
- ${aaa_users}= Execute ONOS Command ${ip} ${port} aaa-users | grep AUTHORIZED | wc -l
+ ${aaa_users}= Execute ONOS CLI Command ${ip} ${port} aaa-users | grep AUTHORIZED | wc -l
Should Contain ${aaa_users} ${expected_onus}
Validate DHCP Allocations
[Arguments] ${ip} ${port} ${expected_onus}
[Documentation] Matches for number of dhcpacks based on number of onus
##TODO: filter by onu serial number instead of count
- ${allocations}= Execute ONOS Command ${ip} ${port} dhcpl2relay-allocations | grep DHCPACK | wc -l
+ ${allocations}= Execute ONOS CLI Command ${ip} ${port} dhcpl2relay-allocations | grep DHCPACK | wc -l
Should Contain ${allocations} ${expected_onus}
diff --git a/tests/sanity/sanity.robot b/tests/sanity/sanity.robot
index 9e5db76..1fcd30a 100644
--- a/tests/sanity/sanity.robot
+++ b/tests/sanity/sanity.robot
@@ -24,7 +24,7 @@
Resource ${CURDIR}/../../variables/variables.robot
Suite Setup Setup
Suite Teardown Teardown
-Test Teardown Execute ONOS Command ${server_ip} ${ONOS_SSH_PORT} flows -s
+Test Teardown Execute ONOS CLI Command ${server_ip} ${ONOS_SSH_PORT} flows -s
*** Variables ***
${server_ip} localhost
@@ -74,7 +74,7 @@
## TODO: this works fine with 1 onu, but with multiple onus, we need to ensure this is executes
... prior to to dhclient starting. possible start a process after first test case to just attempt
... "volt-add-subscriber-access" to all onus periodically?
- ${output}= Execute ONOS Command ${server_ip} ${ONOS_SSH_PORT} volt-add-subscriber-access ${of_id} 16
+ ${output}= Execute ONOS CLI Command ${server_ip} ${ONOS_SSH_PORT} volt-add-subscriber-access ${of_id} 16
Log ${output}
Validate DHCP Assignment in ONOS
diff --git a/variables/variables.robot b/variables/variables.robot
index 3afc614..cece945 100644
--- a/variables/variables.robot
+++ b/variables/variables.robot
@@ -18,7 +18,6 @@
${BBSIM_DEVICE_ID} of:0000626273696d76
${BBSIM_OLT_SN} BBSIMOLT000
${BBSIM_ONU_SN} BBSM00000001
-${ONOS_REST_PORT} 8181
-${ONOS_PORT} 30115
-${ONOS_SSH_PORT} 8101
+${ONOS_REST_PORT} 30120
+${ONOS_SSH_PORT} 30115
${OLT_PORT} 9191