X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=RO-VIM-openstack%2Fosm_rovim_openstack%2Ftests%2Ftest_vimconn_openstack.py;h=09991244a2e748571bb39bc7bbc33993fb8b6cae;hb=247cc43aff9f3a6fe2ec3f083eeb5ec8276c7774;hp=19c9d521dd302be9fe15794acf800000f07ae89b;hpb=80135b928ab442c38898750b4751480205b4affc;p=osm%2FRO.git

diff --git a/RO-VIM-openstack/osm_rovim_openstack/tests/test_vimconn_openstack.py b/RO-VIM-openstack/osm_rovim_openstack/tests/test_vimconn_openstack.py
index 19c9d521..09991244 100644
--- a/RO-VIM-openstack/osm_rovim_openstack/tests/test_vimconn_openstack.py
+++ b/RO-VIM-openstack/osm_rovim_openstack/tests/test_vimconn_openstack.py
@@ -25,22 +25,26 @@ Run this directly with python2 or python3.
 """
 
 import copy
+import logging
 import unittest
 
 import mock
 from neutronclient.v2_0.client import Client
-
 from osm_ro_plugin import vimconn
 from osm_rovim_openstack.vimconn_openstack import vimconnector
 
-
 __author__ = "Igor D.C."
 __date__ = "$23-aug-2017 23:59:59$"
 
 
 class TestSfcOperations(unittest.TestCase):
-    def setUp(self):
-        # instantiate dummy VIM connector so we can test it
+    @mock.patch("logging.getLogger", autospec=True)
+    def setUp(self, mock_logger):
+        # Instantiate dummy VIM connector so we can test it
+        # It throws exception because of dummy parameters,
+        # We are disabling the logging of exception not to print them to console.
+        mock_logger = logging.getLogger()
+        mock_logger.disabled = True
         self.vimconn = vimconnector(
             "123",
             "openstackvim",
@@ -212,10 +216,15 @@ class TestSfcOperations(unittest.TestCase):
 
         # call the VIM connector
         if sfc_encap is None:
+            dict_to_neutron["port_chain"]["chain_parameters"] = {"correlation": "mpls"}
             if spi is None:
-                result = self.vimconn.new_sfp(name, classifications, sfs)
+                result = self.vimconn.new_sfp(
+                    name, classifications, sfs, sfc_encap=False
+                )
             else:
-                result = self.vimconn.new_sfp(name, classifications, sfs, spi=spi)
+                result = self.vimconn.new_sfp(
+                    name, classifications, sfs, sfc_encap=False, spi=spi
+                )
         else:
             if spi is None:
                 result = self.vimconn.new_sfp(name, classifications, sfs, sfc_encap)
@@ -362,8 +371,8 @@ class TestSfcOperations(unittest.TestCase):
 
     @mock.patch.object(Client, "create_sfc_port_chain")
     def test_new_sfp_without_sfc_encap(self, create_sfc_port_chain):
-        self._test_new_sfp(create_sfc_port_chain, False, None)
-        self._test_new_sfp(create_sfc_port_chain, False, 25)
+        self._test_new_sfp(create_sfc_port_chain, None, None)
+        self._test_new_sfp(create_sfc_port_chain, None, 25)
 
     @mock.patch.object(Client, "create_sfc_port_chain")
     def test_new_sfp_default_sfc_encap(self, create_sfc_port_chain):