Fix Two Chains Test and Enabled all Testcases

- Method added to support Port Chain update
- Used the new method to modify the test as follows
  - Create two Port Chains (one VNF per chain)
  - Block ssh in one vnf and http in the other
  - Test communication
  - Swap the flow classifiers in the chains
    so that ssh packets are sent to vnf where
    http is blocked and vice versa
- Fix extracting odl username/password from ml2_conf
- Checking flow classifiers are implemented
- Fixed odl cleanup

Change-Id: I1f0f3a3b829d6c73d1bb1a774ebf3484912b84b7
Signed-off-by: gvrangan <venkatrangang@hcl.com>

3 files changed, 117 insertions, 5 deletions

diff --git a/sfc/unit_tests/unit/lib/test_cleanup.py b/sfc/unit_tests/unit/lib/test_cleanup.py
index 8e68ce5b..e6f59d23 100644
--- a/sfc/unit_tests/unit/lib/test_cleanup.py
+++ b/sfc/unit_tests/unit/lib/test_cleanup.py
@@ -275,10 +275,7 @@ class SfcCleanupTesting(unittest.TestCase):
     def test_cleanup_odl(self,
                          mock_del_odl_ietf,
                          mock_del_odl_res):
-        resources = ['service-function-forwarder',
-                     'service-function-chain',
-                     'service-function-path',
-                     'service-function']
+        resources = ['service-function-forwarder']
 
         odl_res_calls = [call(self.odl_ip, self.odl_port, item)
                          for item in resources]
diff --git a/sfc/unit_tests/unit/lib/test_odl_utils.py b/sfc/unit_tests/unit/lib/test_odl_utils.py
index 04eeeff2..1dfcf1ed 100644
--- a/sfc/unit_tests/unit/lib/test_odl_utils.py
+++ b/sfc/unit_tests/unit/lib/test_odl_utils.py
@@ -331,11 +331,35 @@ class SfcOdlUtilsTesting(unittest.TestCase):
                                             '/etc/ml2_conf.ini')
         mock_rawconfigparser.return_value.read.assert_called_once_with(
             '/etc/ml2_conf.ini')
-        mock_rawconfigparser.return_value.get.assert_called_once_with(
+        mock_rawconfigparser.return_value.get.assert_called_with(
             'ml2_odl', 'url')
         mock_search.assert_called_once_with(r'[0-9]+(?:\.[0-9]+){3}\:[0-9]+',
                                             'config')
 
+    @patch('re.search', autospec=True)
+    @patch('ConfigParser.RawConfigParser', autospec=True)
+    @patch('os.getcwd', autospec=True, return_value='/etc')
+    @patch('os.path.join', autospec=True, return_value='/etc/ml2_conf.ini')
+    def test_get_odl_username_password(self, mock_join,
+                                       mock_getcwd,
+                                       mock_rawconfigparser,
+                                       mock_search):
+        """
+        Check the proper functionality of get odl_username_password
+        function
+        """
+
+        mock_rawconfigparser.return_value.get.return_value = 'odl_username'
+        result = odl_utils.get_odl_username_password()
+        self.assertEqual(('odl_username'), result[0])
+        mock_getcwd.assert_called_once_with()
+        mock_join.assert_called_once_with('/etc', 'ml2_conf.ini')
+        mock_rawconfigparser.return_value.read.assert_called_once_with(
+            '/etc/ml2_conf.ini')
+        mock_rawconfigparser.return_value.get.return_value = 'odl_password'
+        result = odl_utils.get_odl_username_password()
+        self.assertEqual(('odl_password'), result[1])
+
     def test_pluralize(self):
         """
         Checks the proper functionality of pluralize
diff --git a/sfc/unit_tests/unit/lib/test_openstack_utils.py b/sfc/unit_tests/unit/lib/test_openstack_utils.py
index ffaace68..8915c45d 100644
--- a/sfc/unit_tests/unit/lib/test_openstack_utils.py
+++ b/sfc/unit_tests/unit/lib/test_openstack_utils.py
@@ -1034,6 +1034,64 @@ class SfcOpenStackUtilsTesting(unittest.TestCase):
         mock_log.info.assert_has_calls(log_calls_info)
 
     @patch('sfc.lib.openstack_utils.logger', autospec=True)
+    def test_create_classifier(self, mock_log):
+        """
+        Checks the create_classifier method
+        """
+
+        log_calls = [call('Creating the classifier...')]
+        neutron_port = 'neutron_port_id'
+        port = 80
+        protocol = 'tcp'
+        fc_name = 'red_http'
+        symmetrical = False
+        self.neutron_client.create_sfc_flow_classifier.return_value = \
+            {'flow_classifier': {'id': 'fc_id'}}
+
+        expected_sfc_classifier_params = {'name': fc_name,
+                                          'logical_source_port': neutron_port,
+                                          'destination_port_range_min': port,
+                                          'destination_port_range_max': port,
+                                          'protocol': protocol}
+        self.os_sfc.create_classifier(neutron_port, port,
+                                      protocol, fc_name, symmetrical)
+        self.neutron_client.create_sfc_flow_classifier.assert_has_calls(
+            [call({'flow_classifier': expected_sfc_classifier_params})])
+        mock_log.info.assert_has_calls(log_calls)
+
+    @patch('sfc.lib.openstack_utils.logger', autospec=True)
+    def test_create_classifier_symmetric(self, mock_log):
+        """
+        Checks the create_chain method
+        """
+
+        log_calls = [call('Creating the classifier...')]
+        neutron_port = 'neutron_port_id'
+        port = 80
+        protocol = 'tcp'
+        fc_name = 'red_http'
+        symmetrical = True
+        serv_p = '123'
+        server_ip = '1.1.1.2'
+        self.neutron_client.create_sfc_flow_classifier.return_value = \
+            {'flow_classifier': {'id': 'fc_id'}}
+
+        expected_sfc_classifier_params = {'name': fc_name,
+                                          'logical_source_port': neutron_port,
+                                          'destination_port_range_min': port,
+                                          'destination_port_range_max': port,
+                                          'destination_ip_prefix': server_ip,
+                                          'logical_destination_port': serv_p,
+                                          'protocol': protocol}
+        self.os_sfc.create_classifier(neutron_port, port,
+                                      protocol, fc_name, symmetrical,
+                                      server_port='123',
+                                      server_ip='1.1.1.2')
+        self.neutron_client.create_sfc_flow_classifier.assert_has_calls(
+            [call({'flow_classifier': expected_sfc_classifier_params})])
+        mock_log.info.assert_has_calls(log_calls)
+
+    @patch('sfc.lib.openstack_utils.logger', autospec=True)
     def test_create_chain(self, mock_log):
         """
         Checks the create_chain method
@@ -1116,6 +1174,39 @@ class SfcOpenStackUtilsTesting(unittest.TestCase):
         mock_log.info.assert_has_calls(log_calls)
 
     @patch('sfc.lib.openstack_utils.logger', autospec=True)
+    def test_update_chain_symmetric(self, mock_log):
+        """
+        Checks the update_chain method
+        """
+
+        log_calls = [call('Update the chain...')]
+        vnffg_name = 'red_http'
+        fc_name = 'blue_ssh'
+        symmetrical = True
+        self.neutron_client.find_resource.return_value = \
+            {'id': 'fc_id'}
+        expected_chain_config = {'name': vnffg_name + '-port-chain',
+                                 'flow_classifiers': ['fc_id'],
+                                 'chain_parameters': {'symmetric': True}}
+        self.os_sfc.update_chain(vnffg_name, fc_name, symmetrical)
+        self.neutron_client.update_sfc_port_chain.assert_has_calls(
+            [call('fc_id', {'port_chain': expected_chain_config})])
+        mock_log.info.assert_has_calls(log_calls)
+
+    @patch('sfc.lib.openstack_utils.logger', autospec=True)
+    def test_swap_classifiers(self, mock_log):
+        """
+        Checks the swap_classifiers method
+        """
+
+        log_calls = [call('Swap classifiers...')]
+        vnffg_1_name = 'red_http'
+        vnffg_2_name = 'blue_ssh'
+        symmetrical = False
+        self.os_sfc.swap_classifiers(vnffg_1_name, vnffg_2_name, symmetrical)
+        mock_log.info.assert_has_calls(log_calls)
+
+    @patch('sfc.lib.openstack_utils.logger', autospec=True)
     def test_delete_port_groups(self, mock_log):
         """
         Checks the delete_port_groups method