fix some warnings

[transportpce.git] / tests / transportpce_tests / test_topology.py

diff --git a/tests/transportpce_tests/test_topology.py b/tests/transportpce_tests/test_topology.py
index 3407c504abc678467483c1f654ef09376b8fc58f..2906f071d263f11a39c76e5492c6922b4ef7b8ff 100644 (file)
--- a/tests/transportpce_tests/test_topology.py
+++ b/tests/transportpce_tests/test_topology.py
@@ -32,7 +32,7 @@ class TransportPCEtesting(unittest.TestCase):
     @classmethod
     def __start_testtools(cls):
         executable = ("./netconf/netconf/tools/netconf-testtool/target/"
-                      "netconf-testtool-1.3.1-executable.jar")
+                      "netconf-testtool-1.5.0-executable.jar")
         if os.path.isfile(executable):
             if not os.path.exists("transportpce_tests/log"):
                 os.makedirs("transportpce_tests/log")
@@ -292,16 +292,21 @@ class TransportPCEtesting(unittest.TestCase):
              nodeId=res['network'][0]['node'][i]['node-id']
              #Tests related to XPDRA nodes
              if(nodeId=='XPDRA-XPDR1'):
-                 self.assertEqual(nodeType,'XPONDER')
-                 self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']),2)
-                 self.assertEqual({'tp-id': 'XPDR1-CLIENT1', 'org-openroadm-network-topology:tp-type': 'XPONDER-CLIENT',
-                                   'org-openroadm-network-topology:xpdr-network-attributes': {'tail-equipment-id': 'XPDR1-NETWORK1'}},
-                                  res['network'][0]['node'][i]['ietf-network-topology:termination-point'][0])
-                 self.assertEqual({'tp-id': 'XPDR1-NETWORK1', 'org-openroadm-network-topology:tp-type': 'XPONDER-NETWORK',
-                                   'org-openroadm-network-topology:xpdr-client-attributes': {'tail-equipment-id': 'XPDR1-CLIENT1'}},
-                                  res['network'][0]['node'][i]['ietf-network-topology:termination-point'][1])
                  self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'XPDRA'},
                                res['network'][0]['node'][i]['supporting-node'])
+                 self.assertEqual(nodeType,'XPONDER')
+                 nbTps=len(res['network'][0]['node'][i]['ietf-network-topology:termination-point'])
+                 self.assertTrue(nbTps >= 2)
+                 client = 0
+                 network = 0
+                 for j in range(0,nbTps):
+                     tpType=res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j]['org-openroadm-network-topology:tp-type']
+                     if (tpType=='XPONDER-CLIENT'):
+                         client += 1
+                     elif (tpType=='XPONDER-NETWORK'):
+                         network += 1
+                 self.assertTrue(client > 0)
+                 self.assertTrue(network > 0)
                  listNode.remove(nodeId)
              elif(nodeId=='ROADMA-SRG1'):
                  #Test related to SRG1
@@ -341,7 +346,7 @@ class TransportPCEtesting(unittest.TestCase):
     #Connect the tail XPDRA to ROADMA and vice versa
     def test_10_connect_tail_xpdr_rdm(self):
          #Connect the tail: XPDRA to ROADMA
-        url = ("{}/operations/networkutils:init-xpdr-rdm-links"
+        url = ("{}/operations/transportpce-networkutils:init-xpdr-rdm-links"
                 .format(self.restconf_baseurl))
         data = {"networkutils:input": {
              "networkutils:links-input": {
@@ -363,7 +368,7 @@ class TransportPCEtesting(unittest.TestCase):
 
     def test_11_connect_tail_rdm_xpdr(self):
          #Connect the tail: ROADMA to XPDRA
-         url = ("{}/operations/networkutils:init-rdm-xpdr-links"
+         url = ("{}/operations/transportpce-networkutils:init-rdm-xpdr-links"
                  .format(self.restconf_baseurl))
          data = {"networkutils:input": {
               "networkutils:links-input": {
@@ -577,19 +582,24 @@ class TransportPCEtesting(unittest.TestCase):
                    'ROADMC-SRG1','ROADMC-DEG1','ROADMC-DEG2']
          #************************Tests related to XPDRA nodes
          for i in range(0,nbNode):
+             nodeType=res['network'][0]['node'][i]['org-openroadm-network-topology:node-type']
              nodeId=res['network'][0]['node'][i]['node-id']
              if(nodeId=='XPDRA-XPDR1'):
-                 #Test related to XPDR1
-                 self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']),2)
-                 self.assertEqual({'tp-id': 'XPDR1-CLIENT1', 'org-openroadm-network-topology:tp-type': 'XPONDER-CLIENT',
-                                   'org-openroadm-network-topology:xpdr-network-attributes': {'tail-equipment-id': 'XPDR1-NETWORK1'}},
-                                  res['network'][0]['node'][i]['ietf-network-topology:termination-point'][0])
-                 self.assertEqual({'tp-id': 'XPDR1-NETWORK1', 'org-openroadm-network-topology:tp-type': 'XPONDER-NETWORK',
-                                   'org-openroadm-network-topology:xpdr-client-attributes': {'tail-equipment-id': 'XPDR1-CLIENT1'}},
-                                  res['network'][0]['node'][i]['ietf-network-topology:termination-point'][1])
                  self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'XPDRA'},
                                res['network'][0]['node'][i]['supporting-node'])
-                 self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network-topology:node-type'],'XPONDER')
+                 self.assertEqual(nodeType,'XPONDER')
+                 nbTps=len(res['network'][0]['node'][i]['ietf-network-topology:termination-point'])
+                 self.assertTrue(nbTps >= 2)
+                 client = 0
+                 network = 0
+                 for j in range(0,nbTps):
+                     tpType=res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j]['org-openroadm-network-topology:tp-type']
+                     if (tpType=='XPONDER-CLIENT'):
+                         client += 1
+                     elif (tpType=='XPONDER-NETWORK'):
+                         network += 1
+                 self.assertTrue(client > 0)
+                 self.assertTrue(network > 0)
                  listNode.remove(nodeId)
              elif(nodeId=='ROADMA-SRG1'):
                  #Test related to SRG1