Merge "Modify some steps which have no result"
diff --git a/TestON/tests/FUNCvirNetNB/FUNCvirNetNB.params b/TestON/tests/FUNCvirNetNB/FUNCvirNetNB.params
index 7f0e058..8e7206e 100644
--- a/TestON/tests/FUNCvirNetNB/FUNCvirNetNB.params
+++ b/TestON/tests/FUNCvirNetNB/FUNCvirNetNB.params
@@ -11,7 +11,7 @@
# 9 - Update Virtualport northbound test
#10 - Delete Virtualport northbound test
- <testcases>1,2,3,4,5,6,7</testcases>
+ <testcases>1,2,3,4,5,6,7,8,9,10</testcases>
<SLEEP>
<startup>15</startup>
diff --git a/TestON/tests/FUNCvirNetNB/FUNCvirNetNB.py b/TestON/tests/FUNCvirNetNB/FUNCvirNetNB.py
index 4d65bc6..7577d49 100644
--- a/TestON/tests/FUNCvirNetNB/FUNCvirNetNB.py
+++ b/TestON/tests/FUNCvirNetNB/FUNCvirNetNB.py
@@ -57,16 +57,22 @@
cellName = main.params['ENV']['cellName']
ipList = os.getenv( main.params['CTRL']['ip1'] )
- main.step("Create cell file")
+ main.step("Create cell file and apply to environment")
cellAppString = main.params['ENV']['cellApps']
main.ONOSbench.createCellFile(main.ONOSbench.ip_address,cellName,
main.Mininet1.ip_address,
cellAppString,ipList )
- main.step( "Applying cell variable to environment" )
cellResult = main.ONOSbench.setCell(cellName)
verifyResult = main.ONOSbench.verifyCell()
+ stepResult = cellResult and verifyResult
+ utilities.assert_equals( expect=main.TRUE,
+ actual=stepResult,
+ onpass="Successfully applied cell to " + \
+ "environment",
+ onfail="Failed to apply cell to environment " )
+
#FIXME:this is short term fix
main.log.info( "Removing raft logs" )
main.ONOSbench.onosRemoveRaftLogs()
@@ -97,7 +103,7 @@
cleanInstallResult = main.TRUE
gitPullResult = main.TRUE
- main.step( "Git checkout and pull " + gitBranch )
+ main.log.info( "Git checkout and pull " + gitBranch )
if PULLCODE:
main.ONOSbench.gitCheckout ( gitBranch )
gitPullResult = main.ONOSbench.gitPull()
@@ -209,7 +215,7 @@
port = main.params['HTTP']['port']
path = main.params['HTTP']['path']
- main.step( "Generate Post Data" )
+ main.log.info( "Generate Post Data" )
network = NetworkData()
network.id = '030d6d3d-fa36-45bf-ae2b-4f4bc43a54dc'
network.tenant_id = '26cd996094344a0598b0a1af1d525cdc'
@@ -283,7 +289,7 @@
port = main.params['HTTP']['port']
path = main.params['HTTP']['path']
- main.step( "Generate Post Data" )
+ main.log.info( "Generate Post Data" )
network = NetworkData()
network.id = '030d6d3d-fa36-45bf-ae2b-4f4bc43a54dc'
network.tenant_id = '26cd996094344a0598b0a1af1d525cdc'
@@ -370,7 +376,7 @@
port = main.params['HTTP']['port']
path = main.params['HTTP']['path']
- main.step( "Generate Post Data" )
+ main.log.info( "Generate Post Data" )
network = NetworkData()
network.id = '030d6d3d-fa36-45bf-ae2b-4f4bc43a54dc'
network.tenant_id = '26cd996094344a0598b0a1af1d525cdc'
@@ -431,7 +437,7 @@
port = main.params['HTTP']['port']
path = main.params['HTTP']['path']
- main.step( "Generate Post Data" )
+ main.log.info( "Generate Post Data" )
network = NetworkData()
network.id = '030d6d3d-fa36-45bf-ae2b-4f4bc43a54dc'
network.tenant_id = '26cd996094344a0598b0a1af1d525cdc'
@@ -520,7 +526,7 @@
port = main.params['HTTP']['port']
path = main.params['HTTP']['path']
- main.step( "Generate Post Data" )
+ main.log.info( "Generate Post Data" )
network = NetworkData()
network.id = '030d6d3d-fa36-45bf-ae2b-4f4bc43a54dc'
network.tenant_id = '26cd996094344a0598b0a1af1d525cdc'
@@ -626,7 +632,7 @@
port = main.params['HTTP']['port']
path = main.params['HTTP']['path']
- main.step( "Generate Post Data" )
+ main.log.info( "Generate Post Data" )
network = NetworkData()
network.id = '030d6d3d-fa36-45bf-ae2b-4f4bc43a54dc'
network.tenant_id = '26cd996094344a0598b0a1af1d525cdc'
@@ -703,7 +709,7 @@
httpport = main.params['HTTP']['port']
path = main.params['HTTP']['path']
- main.step( "Generate Post Data" )
+ main.log.info( "Generate Post Data" )
network = NetworkData()
network.id = '030d6d3d-fa36-45bf-ae2b-4f4bc43a54dc'
network.tenant_id = '26cd996094344a0598b0a1af1d525cdc'
@@ -811,7 +817,7 @@
httpport = main.params['HTTP']['port']
path = main.params['HTTP']['path']
- main.step( "Generate Post Data" )
+ main.log.info( "Generate Post Data" )
network = NetworkData()
network.id = '030d6d3d-fa36-45bf-ae2b-4f4bc43a54dc'
network.tenant_id = '26cd996094344a0598b0a1af1d525cdc'
@@ -934,7 +940,7 @@
httpport = main.params['HTTP']['port']
path = main.params['HTTP']['path']
- main.step( "Generate Post Data" )
+ main.log.info( "Generate Post Data" )
network = NetworkData()
network.id = '030d6d3d-fa36-45bf-ae2b-4f4bc43a54dc'
network.tenant_id = '26cd996094344a0598b0a1af1d525cdc'
@@ -1007,4 +1013,4 @@
expect='200',
actual=deletestatus,
onpass="Delete Network Success",
- onfail="Delete Network Failed" )
\ No newline at end of file
+ onfail="Delete Network Failed" )
diff --git a/TestON/tests/FUNCvirNetNB/dependencies/Nbdata.py b/TestON/tests/FUNCvirNetNB/dependencies/Nbdata.py
index df2121e..9b3b978 100644
--- a/TestON/tests/FUNCvirNetNB/dependencies/Nbdata.py
+++ b/TestON/tests/FUNCvirNetNB/dependencies/Nbdata.py
@@ -184,7 +184,7 @@
if self.allowedAddressPairs != '':
Dicdata['allowed_address_pairs'] = self.allowedAddressPairs
if self.deviceOwner != '':
- Dicdata['device_owner'] = self.deviceOwner
+ Dicdata['device_owner'] = self.deviceOwner
if self.securityGroups != '':
Dicdata['security_groups'] = self.securityGroups
if self.adminStateUp != '':