commit e675e9260c7b896cd2ffa1fbe93e048028418c7f
author lanqinglong <lanqinglong@huawei.com> Thu Aug 13 21:17:28 2015 +0800
committer lanqinglong <lanqinglong@huawei.com> Thu Aug 20 17:26:25 2015 +0800
tree be13607419070bb347548c32858cd3054d8101ca
parent 073a0c2ae258d561fc308a0ec0beb9a3b6a4e3dd

ONOS-2504 Subnet Post/update/delete

Change-Id: I9872c059abbb0b081808c197734e2179806acb0e

TestON/tests/FUNCvirNetNB/dependencies/Nbdata.py

diff --git a/TestON/tests/FUNCvirNetNB/dependencies/Nbdata.py b/TestON/tests/FUNCvirNetNB/dependencies/Nbdata.py
index c002c4a..dadf6b2 100644
--- a/TestON/tests/FUNCvirNetNB/dependencies/Nbdata.py
+++ b/TestON/tests/FUNCvirNetNB/dependencies/Nbdata.py
@@ -67,12 +67,17 @@
             print "SourceData or DestData is not JSON Type!"
             return False
 
-        Socom = SourceCompareDataDic[FirstPara][SecondPara]
-        Decom = DestiCompareDataDic[FirstPara][SecondPara]
-        if Socom == Decom:
+        try:
+            Socom = SourceCompareDataDic[FirstPara][SecondPara]
+            Decom = DestiCompareDataDic[FirstPara][SecondPara]
+        except KeyError,error:
+            print "Key error ,This key is not found:%s"%error
+            return False            
+
+        if str(Socom).lower()== str(Decom).lower():
             return True
         else:
-            print "Source Compare data:"+FirstPara+"."+SecondPara+"="+Socom
+            print "Source Compare data:"+FirstPara+"."+SecondPara+"="+str(Socom)
             print "Dest Compare data: "+FirstPara+"."+SecondPara+"="+str(Decom)
             return False
 
@@ -139,12 +144,6 @@
 
         return json.dumps(Dicdata,indent=4)
 
-    def Ordered(self,obj):
-        super(NetworkData,self).Ordered(obj)
-
-    def JsonCompare(self,SourceData,DestiData,FirstPara,SecondPara):
-        super(NetworkData,self).JsonCompare(SourceData,DestiData,FirstPara,SecondPara)
-
 class VirtualPortData(NetworkData):
 
     def __init__(self):
@@ -212,10 +211,4 @@
 
             Dicdata = {'virtualport': Dicdata}
 
-            return json.dumps(Dicdata,indent=4)
-
-    def Ordered(self,obj):
-        super(NetworkData,self).Ordered(obj)
-
-    def JsonCompare(self,SourceData,DestiData,FirstPara,SecondPara):
-        super(NetworkData,self).JsonCompare(SourceData,DestiData,FirstPara,SecondPara)
\ No newline at end of file
+            return json.dumps(Dicdata,indent=4)
\ No newline at end of file