Changes to skip ceilometer test if mx_gw_test is not enabled

Change-Id: I39de19d5b443d9ae8187bc41c84525377c682fc1
(cherry picked from commit eab23c0)

scripts/ceilometer_tests/base.py

@@ -104,6 +104,8 @@ def setup_common_objects(self, inputs , connections):
         assert self.vm1_fixture.verify_on_setup()
 
         # Adding further projects to floating IP.
+        if not getattr(self.public_vn_obj, 'fip_fixture', None):
+            return
         self.logger.info('Adding project %s to FIP pool %s' %
                          (self.inputs.project_name, fip_pool_name))
         project_obj = self.public_vn_obj.fip_fixture.assoc_project\

scripts/ceilometer_tests/test_ceilometer.py

@@ -85,6 +85,12 @@ def test_sample_floating_ip_transmit_packets(self):
         Verifying ceilometer sample - ip.floating.transmit.bytes
         Verifying ceilometer sample - ip.floating.receive.bytes"""
 
+        if os.environ.get('MX_GW_TEST', 0) != '1':
+            self.logger.info(
+                "Skipping Test. Env variable MX_GW_TEST is not set. Skipping the test")
+            raise self.skipTest(
+                "Skipping Test. Env variable MX_GW_TEST is not set. Skipping the test")
+
         self.logger.info('Sleeping for 1 mins for sample to be collected...')
         time.sleep(60)
         self.logger.info('Starting verification...')