Corrects config test measurement table reference

Also removes superfluous file state & API state tests

clmctest/monitoring/StreamingSim.py

@@ -289,18 +289,6 @@ def reportMC_ServiceState(streaming_sim_config):
 
     idbc.write_points( lp.generate_mc_serviceConfig("apache",250, 250, 9500, 4750, 0) )
 
-@pytest.fixture(scope='module')
-def reportMC_ConfigFileState(streaming_sim_config):
-    """
-    Report to determine whether the simulated streaming servers configuration on the endpoints is correct
-    """
-
-@pytest.fixture(scope='module')
-def reportMC_APIStatus(streaming_sim_config):
-    """
-    Report to determine whether the simulated streaming servers API status call returns good
-    """
-
 
 ## ------------------------------------------------------------------------------------------------------
 ## PYTEST FIXTURES END
@@ -326,7 +314,6 @@ def run_simulation(generate=True):
     else:
         simulator.db_client.drop_database(simulator.influx_db_name)
 
-
 if __name__ == "__main__":
     """
     The main entry for this module. Code here is executed only if the StreamingSim.py file is executed, 

clmctest/monitoring/test_MC_Config.py

@@ -12,9 +12,9 @@ class TestMediaComponentConfig( object ):
     # For data sent to INFLUX, see reportMC_ServiceState function in StreamingSim.py
 
     @pytest.mark.parametrize( "query, expectedResult", [
-        ('SELECT "serviceStopped", "avgServiceStopped", "serviceStarted", "avgServiceStarted" FROM "CLMCMetrics"."autogen"."mediaComponentConfig" WHERE ipendpoint=\'adaptive_streaming_I1_apache1\'',
+        ('SELECT "serviceStopped", "avgServiceStopped", "serviceStarted", "avgServiceStarted" FROM "CLMCMetrics"."autogen"."apache" WHERE ipendpoint=\'adaptive_streaming_I1_apache1\'',
         {"time" : "1970-01-01T00:00:00Z", "serviceStopped" : 1500, "avgServiceStopped" : 750, "serviceStarted" : 8500, "avgServiceStarted" : 4250}),
-        ('SELECT "serviceStopped", "avgServiceStopped", "serviceStarted", "avgServiceStarted" FROM "CLMCMetrics"."autogen"."mediaComponentConfig" WHERE ipendpoint=\'adaptive_streaming_I1_apache2\'',
+        ('SELECT "serviceStopped", "avgServiceStopped", "serviceStarted", "avgServiceStarted" FROM "CLMCMetrics"."autogen"."apache" WHERE ipendpoint=\'adaptive_streaming_I1_apache2\'',
         {"time" : "1970-01-01T00:00:00Z", "serviceStopped" : 250, "avgServiceStopped" : 250, "serviceStarted" : 9500, "avgServiceStarted" : 4750})
     ])