Merge "add VLAN tests to FUNCintentRest fix SDNIP-ICMP intent tests in FUNCintentRest"
diff --git a/TestON/tests/MISC/SCPFbatchFlowResp/SCPFbatchFlowResp.py b/TestON/tests/MISC/SCPFbatchFlowResp/SCPFbatchFlowResp.py
index ca5e240..b767835 100755
--- a/TestON/tests/MISC/SCPFbatchFlowResp/SCPFbatchFlowResp.py
+++ b/TestON/tests/MISC/SCPFbatchFlowResp/SCPFbatchFlowResp.py
@@ -184,8 +184,8 @@
cliResult = main.TRUE
for i in range( i, main.numCtrls ):
cliResult = cliResult and \
- main.CLIs[ i ].startOnosCli( ONOSIp=main.ONOSip[ i ] )
- main.log.info("ONOSip is: " + main.ONOSip[i])
+ main.ONOScli1.startCellCli( )
+ main.log.info("ONOSip is: " + main.ONOScli1.ip_address)
stepResult = cliResult
utilities.assert_equals( expect=main.TRUE,
actual=stepResult,
@@ -204,8 +204,7 @@
main.step("Activate openflow-base App")
app = main.params['CASE10']['app']
- stepResult = main.ONOSbench.onosCli( ONOSIp = main.ONOSip[0],
- cmdstr = "app activate " + app )
+ stepResult = main.ONOScli1.activateApp( app )
time.sleep(main.cfgSleep)
main.log.info(stepResult)
utilities.assert_equals( expect=main.TRUE,
@@ -216,9 +215,9 @@
time.sleep(main.cfgSleep)
- main.step( "Disable AdaptiveFlowSampling ")
- stepResult = main.ONOSbench.onosCfgSet( main.ONOSip[0], "org.onosproject.provider.of.flow.impl.OpenFlowRuleProvider",
- "adaptiveFlowSampling " + main.params['CASE10']['adaptiveFlowenabled'])
+ main.step( "Configure AdaptiveFlowSampling ")
+ stepResult = main.ONOScli1.setCfg( component = "org.onosproject.provider.of.flow.impl.OpenFlowRuleProvider",
+ propName = "adaptiveFlowSampling ", value = main.params['CASE10']['adaptiveFlowenabled'])
utilities.assert_equals( expect=main.TRUE,
actual=stepResult,
onpass="App Configuration Succeeded! ",
diff --git a/TestON/tests/MISC/SCPFbatchFlowResp/SCPFbatchFlowResp.topo b/TestON/tests/MISC/SCPFbatchFlowResp/SCPFbatchFlowResp.topo
index 0e3543e..b37a17a 100755
--- a/TestON/tests/MISC/SCPFbatchFlowResp/SCPFbatchFlowResp.topo
+++ b/TestON/tests/MISC/SCPFbatchFlowResp/SCPFbatchFlowResp.topo
@@ -3,19 +3,18 @@
<ONOSbench>
<host>localhost</host>
- <user>admin</user>
- <password>onos_test</password>
+ <user>sdn</user>
+ <password>rocks</password>
<type>OnosDriver</type>
<connect_order>1</connect_order>
<COMPONENTS>
- <home>~/Projects/onos</home>
</COMPONENTS>
</ONOSbench>
<ONOScli1>
- <host>localhost</host>
- <user>admin</user>
- <password>onos_test</password>
+ <host>OC1</host>
+ <user>sdn</user>
+ <password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>2</connect_order>
<COMPONENTS>
@@ -24,8 +23,8 @@
<Mininet1>
<host>localhost</host>
- <user>admin</user>
- <password>onos_test</password>
+ <user>sdn</user>
+ <password>rocks</password>
<type>MininetCliDriver</type>
<connect_order>5</connect_order>
<COMPONENTS> </COMPONENTS>
diff --git a/TestON/tests/MISC/__init__.py b/TestON/tests/MISC/__init__.py
new file mode 100755
index 0000000..e69de29
--- /dev/null
+++ b/TestON/tests/MISC/__init__.py