8 files changed, 2 insertions, 126 deletions
diff --git a/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed1_PM_feed2_CTR.json b/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed1_PM_feed2_CTR.json
index 75637ce79..c320eda7a 100644
--- a/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed1_PM_feed2_CTR.json
+++ b/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed1_PM_feed2_CTR.json
@@ -18,7 +18,7 @@
       "password": "password",
       "publisher_id": "972.360gm"
     },
-    "CTR_FILES": {
+    "CTR_MEAS_FILES": {
       "type": "data_router",
       "dmaap_info": {
         "feed02": {
diff --git a/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed3_PM_CTR.json b/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed3_PM_CTR.json
index 2f5287bbc..489580a4f 100644
--- a/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed3_PM_CTR.json
+++ b/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed3_PM_CTR.json
@@ -20,7 +20,7 @@
         "publisher_id": "972.360gm"
       }
     },
-    "CTR_FILES":{
+    "CTR_MEAS_FILES":{
       "type":"data_router",
       "dmaap_info":{
         "username": "user",
diff --git a/test/mocks/datafilecollector-testharness/simulator-group/consul/dmaap_feed1.json b/test/mocks/datafilecollector-testharness/simulator-group/consul/dmaap_feed1.json
deleted file mode 100644
index e6769d877..000000000
--- a/test/mocks/datafilecollector-testharness/simulator-group/consul/dmaap_feed1.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "feed01": {
-    "username": "user",
-    "log_url": "https://drsim:3907/feedlog/1",
-    "publish_url": "https://drsim:3907/publish/1",
-    "location": "loc00",
-    "password": "password",
-    "publisher_id": "972.360gm"
-  }
-}
-\ No newline at end of file
diff --git a/test/mocks/datafilecollector-testharness/simulator-group/consul/dmaap_feed1_2_3_4.json b/test/mocks/datafilecollector-testharness/simulator-group/consul/dmaap_feed1_2_3_4.json
deleted file mode 100644
index aa2e6a056..000000000
--- a/test/mocks/datafilecollector-testharness/simulator-group/consul/dmaap_feed1_2_3_4.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "feed01": {
-    "username": "user",
-    "log_url": "https://drsim:3907/feedlog/1",
-    "publish_url": "https://drsim:3907/publish/1",
-    "location": "loc00",
-    "password": "password",
-    "publisher_id": "972.360gm"
-  },
-    "feed02": {
-    "username": "user",
-    "log_url": "https://drsim:3907/feedlog/2",
-    "publish_url": "https://drsim:3907/publish/2",
-    "location": "loc00",
-    "password": "password",
-    "publisher_id": "972.360gm"
-  },
-    "feed03": {
-    "username": "user",
-    "log_url": "https://drsim:3907/feedlog/3",
-    "publish_url": "https://drsim:3907/publish/3",
-    "location": "loc00",
-    "password": "password",
-    "publisher_id": "972.360gm"
-  },
-    "feed04": {
-    "username": "user",
-    "log_url": "https://drsim:3907/feedlog/4",
-    "publish_url": "https://drsim:3907/publish/4",
-    "location": "loc00",
-    "password": "password",
-    "publisher_id": "972.360gm"
-  }
-}
-\ No newline at end of file
diff --git a/test/mocks/datafilecollector-testharness/simulator-group/consul/dmaap_feed1_2_3_4_5.json b/test/mocks/datafilecollector-testharness/simulator-group/consul/dmaap_feed1_2_3_4_5.json
deleted file mode 100644
index 6f28f39c3..000000000
--- a/test/mocks/datafilecollector-testharness/simulator-group/consul/dmaap_feed1_2_3_4_5.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "feed01": {
-    "username": "user",
-    "log_url": "https://drsim:3907/feedlog/1",
-    "publish_url": "https://drsim:3907/publish/1",
-    "location": "loc00",
-    "password": "password",
-    "publisher_id": "972.360gm"
-  },
-    "feed02": {
-    "username": "user",
-    "log_url": "https://drsim:3907/feedlog/2",
-    "publish_url": "https://drsim:3907/publish/2",
-    "location": "loc00",
-    "password": "password",
-    "publisher_id": "972.360gm"
-  },
-    "feed03": {
-    "username": "user",
-    "log_url": "https://drsim:3907/feedlog/3",
-    "publish_url": "https://drsim:3907/publish/3",
-    "location": "loc00",
-    "password": "password",
-    "publisher_id": "972.360gm"
-  },
-    "feed04": {
-    "username": "user",
-    "log_url": "https://drsim:3907/feedlog/4",
-    "publish_url": "https://drsim:3907/publish/4",
-    "location": "loc00",
-    "password": "password",
-    "publisher_id": "972.360gm"
-  },
-    "feed05": {
-	 "username": "user",
-	 "log_url": "https://drsim:3907/feedlog/5",
-	 "publish_url": "https://drsim:3907/publish/4",
-	 "location": "loc00",
-	 "password": "password",
-	 "publisher_id": "972.360gm"
-	  }
-}
-\ No newline at end of file
diff --git a/test/mocks/datafilecollector-testharness/simulator-group/consul/dmaap_feed2.json b/test/mocks/datafilecollector-testharness/simulator-group/consul/dmaap_feed2.json
deleted file mode 100644
index bea360c44..000000000
--- a/test/mocks/datafilecollector-testharness/simulator-group/consul/dmaap_feed2.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "feed02": {
-    "username": "user",
-    "log_url": "https://drsim:3907/feedlog/2",
-    "publish_url": "https://drsim:3907/publish/2",
-    "location": "loc00",
-    "password": "password",
-    "publisher_id": "972.360gm"
-  }
-}
-\ No newline at end of file
diff --git a/test/mocks/datafilecollector-testharness/simulator-group/consul/dmaap_feed2_3.json b/test/mocks/datafilecollector-testharness/simulator-group/consul/dmaap_feed2_3.json
deleted file mode 100644
index a84bf3391..000000000
--- a/test/mocks/datafilecollector-testharness/simulator-group/consul/dmaap_feed2_3.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "feed02": {
-    "username": "user",
-    "log_url": "https://drsim:3907/feedlog/2",
-    "publish_url": "https://drsim:3907/publish/2",
-    "location": "loc00",
-    "password": "password",
-    "publisher_id": "972.360gm"
-  },
-  "feed03": {
-    "username": "user",
-    "log_url": "https://drsim:3907/feedlog/3",
-    "publish_url": "https://drsim:3907/publish/3",
-    "location": "loc00",
-    "password": "password",
-    "publisher_id": "972.360gm"
-  }
-}
-\ No newline at end of file
diff --git a/test/mocks/datafilecollector-testharness/simulator-group/consul/dmaap_feed3.json b/test/mocks/datafilecollector-testharness/simulator-group/consul/dmaap_feed3.json
deleted file mode 100644
index 11138e354..000000000
--- a/test/mocks/datafilecollector-testharness/simulator-group/consul/dmaap_feed3.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "feed03": {
-    "username": "user",
-    "log_url": "https://drsim:3907/feedlog/3",
-    "publish_url": "https://drsim:3907/publish/3",
-    "location": "loc00",
-    "password": "password",
-    "publisher_id": "972.360gm"
-  }
-}
-\ No newline at end of file