summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoeOLeary <joseph.o.leary@est.tech>2019-07-26 07:52:01 +0000
committerJoeOLeary <joseph.o.leary@est.tech>2019-07-26 07:52:01 +0000
commit1b442b06f95c3a5d0afa775b23a5e2bc4e00ccb8 (patch)
tree63cfcb306768deb7c6e4bf57423b19c7bfcb8bbc
parent17cc1d1a73006a5e3ac1ec3ffb7ab766ffada13e (diff)
Remove Bootstrapped PM DMaaP objects from MR & DR.
- Remove bootstrapped PM_MAPPER topic - Remove bootstrapped bulk_pm_feed - Remove references to PM in default feed Issue-ID: DCAEGEN2-1517 Change-Id: I1ddb83bc587f8392f22633cd637c9ac735b5042c Signed-off-by: JoeOLeary <joseph.o.leary@est.tech>
-rw-r--r--kubernetes/dmaap/components/dmaap-dr-node/resources/config/feeds/dedicatedFeed.json6
-rw-r--r--kubernetes/dmaap/components/dmaap-dr-prov/resources/feeds/DefaultPM.json31
-rw-r--r--kubernetes/dmaap/components/message-router/resources/topics/PM_MAPPER.json14
3 files changed, 3 insertions, 48 deletions
diff --git a/kubernetes/dmaap/components/dmaap-dr-node/resources/config/feeds/dedicatedFeed.json b/kubernetes/dmaap/components/dmaap-dr-node/resources/config/feeds/dedicatedFeed.json
index a96f46d528..9e596320f8 100644
--- a/kubernetes/dmaap/components/dmaap-dr-node/resources/config/feeds/dedicatedFeed.json
+++ b/kubernetes/dmaap/components/dmaap-dr-node/resources/config/feeds/dedicatedFeed.json
@@ -1,7 +1,7 @@
{
- "name": "Default PM Feed",
+ "name": "Default Feed",
"version": "m1.0",
- "description": "Default feed provisioned for PM File collector",
+ "description": "Default feed",
"business_description": "Default Feed",
"suspend": false,
"deleted": false,
@@ -15,4 +15,4 @@
"id": "dradmin"
}]
}
-} \ No newline at end of file
+}
diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/resources/feeds/DefaultPM.json b/kubernetes/dmaap/components/dmaap-dr-prov/resources/feeds/DefaultPM.json
deleted file mode 100644
index 994f9c9845..0000000000
--- a/kubernetes/dmaap/components/dmaap-dr-prov/resources/feeds/DefaultPM.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
- "feedName": "bulk_pm_feed",
- "feedVersion": "m1.1",
- "feedDescription": "Default feed provisioned for PM File collector",
- "asprClassification" : "unclassified",
- "owner": "onap",
- "pubs": [
- {
- "dcaeLocationName" : "san-francisco",
- "username": "dradmin",
- "userpwd": "dradmin"
- }
-
- ],
- "subs": [
- {
- "dcaeLocationName": "san-francisco",
- "deliveryURL": "https://dcae-pm-mapper:8443/delivery",
- "feedId": "1",
- "owner": "dcae-pm-mapper",
- "status": "VALID",
- "subId": "1",
- "suspended": false,
- "use100": true,
- "username": "pmmapper",
- "userpwd": "pmmapper",
- "decompressData": true,
- "privilegedSubscriber": true
- }
- ]
-} \ No newline at end of file
diff --git a/kubernetes/dmaap/components/message-router/resources/topics/PM_MAPPER.json b/kubernetes/dmaap/components/message-router/resources/topics/PM_MAPPER.json
deleted file mode 100644
index d2910b8398..0000000000
--- a/kubernetes/dmaap/components/message-router/resources/topics/PM_MAPPER.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "topicName": "PM_MAPPER",
- "topicDescription": "The PM Mapper will be publishing perf3gpp VES events to this topic",
- "owner": "pm-mapper",
- "txenabled": false,
- "clients": [{
- "dcaeLocationName": "san-francisco",
- "clientIdentity": "dcae@dcae.onap.org",
- "action": [
- "pub",
- "view"
- ]
- }]
-}