Changing the dcae dt main code

Updating DCAE-dt-main code for Dockerizing the DCAE-CI code

Change-Id: Ia50d24e60e9ddc9bbc58dd8651d7a4f7e0dc8270
Issue-ID: SDC-1605
Signed-off-by: Eran (ev672n), Vosk <ev672n@att.com>

2 files changed, 209 insertions, 166 deletions

diff --git a/docker/docker_tools/chef-solo/cookbooks/Deploy-DCAE/files/default/config.json b/docker/docker_tools/chef-solo/cookbooks/Deploy-DCAE/files/default/config.json
index a243dc7..202ee54 100644
--- a/docker/docker_tools/chef-solo/cookbooks/Deploy-DCAE/files/default/config.json
+++ b/docker/docker_tools/chef-solo/cookbooks/Deploy-DCAE/files/default/config.json
@@ -1,6 +1,7 @@
+
 {
   "templateInfo": [{
-    "name": "Syslog Collector Template",
+    "name": "Syslog Collector",
     "flowType": "Syslog Collector",
     "description": "Syslog Collector",
     "category": "Template",
@@ -8,24 +9,10 @@
     "updateIfExist": "false",
     "composition": [{
       "type": "SyslogCollector",
-      "alias": "Syslog"
-    }, {
-      "type": "Existing Topic",
-      "alias": "eTopic"
-    }],
-    "relations": [{
-      "fromComponent": "Syslog.SyslogCollector",
-      "fromRequirement": "stream_publish_0",
-      "toComponent": "eTopic.topic",
-      "toCapability": "topic"
-    }],
-    "nodesToDelete": [
-      {
-        "type": "SyslogCollector",
-        "nodeName": "topic0"
-      }]
+      "alias": ""
+    }]
   },{
-    "name": "Syslog MSEA Template",
+    "name": "Syslog MSEA",
     "flowType": "Syslog MSEA",
     "description": "Syslog MSEA",
     "category": "Template",
@@ -33,175 +20,231 @@
     "updateIfExist": "false",
     "composition": [{
       "type": "Map",
-      "alias": "Map"
+      "alias": ""
     }, {
       "type": "Supplement",
-      "alias": "Sup"
+      "alias": ""
     }, {
       "type": "Enrich",
-      "alias": "Enr"
+      "alias": ""
     }, {
       "type": "Alert",
-      "alias": "Ale"
+      "alias": ""
     }],
     "relations": [{
-      "fromComponent": "Sup.Supplement",
+      "fromComponent": "Supplement",
       "fromRequirement": "dependency",
-      "toComponent": "Map.Map",
+      "toComponent": "Map",
       "toCapability": "feature"
     },{
-      "fromComponent": "Enr.Enrich",
+      "fromComponent": "Enrich",
       "fromRequirement": "dependency",
-      "toComponent": "Sup.Supplement",
+      "toComponent": "Supplement",
       "toCapability": "feature"
     },{
-      "fromComponent": "Ale.Alert",
+      "fromComponent": "Alert",
       "fromRequirement": "dependency",
-      "toComponent": "Enr.Enrich",
+      "toComponent": "Enrich",
       "toCapability": "feature"
     }]
-  },{
-    "name": "Status Poller Collector Template",
-    "flowType": "Status Poller Collector",
-    "description": "Status Poller Collector",
-    "category": "Template",
-    "subCategory":"Base Monitoring Template",
-    "updateIfExist": "false",
-    "composition": [{
-      "type": "StatusPoller",
-      "alias": "sPoller"
-    }, {
-      "type": "Existing Topic",
-      "alias": "eTopic0"
-    }],
-    "relations": [{
-      "fromComponent": "sPoller.StatusPoller",
-      "fromRequirement": "stream_publish_0",
-      "toComponent": "eTopic0.topic",
-      "toCapability": "topic"
-    }],
-    "nodesToDelete": [
-      {
-        "type": "StatusPoller",
-        "nodeName": "topic0"
+  },
+
+    {
+      "name": "Status Poller MSE",
+      "flowType": "Status Poller MSE",
+      "description": "Status Poller MSE",
+      "category": "Template",
+      "subCategory":"Base Monitoring Template",
+      "updateIfExist": "false",
+      "composition": [{
+        "type": "Map",
+        "alias": ""
+      }, {
+        "type": "Supplement",
+        "alias": ""
+      }, {
+        "type": "Enrich",
+        "alias": ""
+      }],
+      "relations": [{
+        "fromComponent": "Supplement",
+        "fromRequirement": "dependency",
+        "toComponent": "Map",
+        "toCapability": "feature"
+      },{
+        "fromComponent": "Enrich",
+        "fromRequirement": "dependency",
+        "toComponent": "Supplement",
+        "toCapability": "feature"
       }]
-  }, {
-    "name": "Status Poller MSE Template",
-    "flowType": "Status Poller MSE",
-    "description": "Status Poller MSE",
-    "category": "Template",
-    "subCategory":"Base Monitoring Template",
-    "updateIfExist": "false",
-    "composition": [{
-      "type": "Map",
-      "alias": "Map"
-    }, {
-      "type": "Supplement",
-      "alias": "Sup"
     }, {
-      "type": "Enrich",
-      "alias": "Enr"
-    }],
-    "relations": [{
-      "fromComponent": "Sup.Supplement",
-      "fromRequirement": "dependency",
-      "toComponent": "Map.Map",
-      "toCapability": "feature"
-    },{
-      "fromComponent": "Enr.Enrich",
-      "fromRequirement": "dependency",
-      "toComponent": "Sup.Supplement",
-      "toCapability": "feature"
-    }]
-  }, {
-    "name": "FOI Collector Template",
-    "flowType": "FOI Collector",
-    "description": "FOI Collector",
-    "category": "Template",
-    "subCategory":"Base Monitoring Template",
-    "updateIfExist": "false",
-    "composition": [{
-      "type": "FOICollector",
-      "alias": "fCollector"
-    }, {
-      "type": "Existing Feed",
-      "alias": "eFeed"
-    }],
-    "relations": [{
-      "fromComponent": "fCollector.FoiSftp",
-      "fromRequirement": "stream_publish_0",
-      "toComponent": "eFeed.feed",
-      "toCapability": "feed"
-    }],
-    "nodesToDelete": [
-      {
+      "name": "FOI Collector",
+      "flowType": "FOI Collector",
+      "description": "FOI Collector",
+      "category": "Template",
+      "subCategory":"Base Monitoring Template",
+      "updateIfExist": "false",
+      "composition": [{
         "type": "FOICollector",
-        "nodeName": "feed0"
+        "alias": ""
       }]
-  }, {
-    "name": "SNMP MSE Template",
-    "flowType": "SNMP MSE",
-    "description": "SNMP MSE",
-    "category": "Template",
-    "subCategory":"Base Monitoring Template",
-    "updateIfExist": "false",
-    "composition": [{
-      "type": "Map",
-      "alias": "Map"
-    }, {
-      "type": "Supplement",
-      "alias": "Sup"
+
     }, {
-      "type": "Enrich",
-      "alias": "Enr"
-    }],
-    "relations": [{
-      "fromComponent": "Sup.Supplement",
-      "fromRequirement": "dependency",
-      "toComponent": "Map.Map",
-      "toCapability": "feature"
-    },{
-      "fromComponent": "Enr.Enrich",
-      "fromRequirement": "dependency",
-      "toComponent": "Sup.Supplement",
-      "toCapability": "feature"
-    }]
-  }, {
-    "name": "Docker Map Template",
-    "flowType": "Docker Map",
-    "description": "Docker Map",
-    "category": "Template",
-    "subCategory":"Base Monitoring Template",
-    "updateIfExist": "false",
-    "composition": [{
-      "type": "DockerMap",
-      "alias": "dMp"
-    }, {
-      "type": "Existing Feed",
-      "alias": "eFeed"
-    }, {
-      "type": "Existing Topic",
-      "alias": "eTopic"
-    }],
-    "relations": [{
-      "fromComponent": "dMp.DockerMap",
-      "fromRequirement": "stream_subscribe_0",
-      "toComponent": "eFeed.feed",
-      "toCapability": "feed"
+      "name": "SNMP MSE",
+      "flowType": "SNMP MSE",
+      "description": "SNMP MSE",
+      "category": "Template",
+      "subCategory":"Base Monitoring Template",
+      "updateIfExist": "false",
+      "composition": [{
+        "type": "Map",
+        "alias": ""
+      }, {
+        "type": "Supplement",
+        "alias": ""
+      }, {
+        "type": "Enrich",
+        "alias": ""
+      }],
+      "relations": [{
+        "fromComponent": "Supplement",
+        "fromRequirement": "dependency",
+        "toComponent": "Map",
+        "toCapability": "feature"
+      },{
+        "fromComponent": "Enrich",
+        "fromRequirement": "dependency",
+        "toComponent": "Supplement",
+        "toCapability": "feature"
+      }]
     }, {
-      "fromComponent": "dMp.DockerMap",
-      "fromRequirement": "stream_publish_0",
-      "toComponent": "eTopic.topic",
-      "toCapability": "topic"
-    }],
-    "nodesToDelete": [
-      {
-        "type": "DockerMap",
-        "nodeName": "feed0"
-      },
-      {
+      "name": "Docker Map",
+      "flowType": "Docker Map",
+      "description": "Docker Map",
+      "category": "Template",
+      "subCategory":"Base Monitoring Template",
+      "updateIfExist": "false",
+      "composition": [{
         "type": "DockerMap",
-        "nodeName": "topic0"
+        "alias": ""
       }]
-  }]
+    },
+    {
+      "name": "SAM Collector",
+      "flowType": "SAM Collector",
+      "description": "SAM Collector",
+      "category": "Template",
+      "subCategory":"Base Monitoring Template",
+      "updateIfExist": "false",
+      "composition": [{
+        "type": "SAMCollector1806",
+        "alias": ""
+      }]
+    },
+    {
+      "name": "SNMP PM Poller",
+      "flowType": "SNMP PM Poller",
+      "description": "SNMP PM Poller",
+      "category": "Template",
+      "subCategory":"Base Monitoring Template",
+      "updateIfExist": "false",
+      "composition": [{
+        "type": "PM Poller",
+        "alias": ""
+      }]
+    },
+    {
+      "name": "Status Poller Collector",
+      "flowType": "Status Poller Collector",
+      "description": "Status Poller Collector",
+      "category": "Template",
+      "subCategory": "Base Monitoring Template",
+      "updateIfExist": "false",
+      "composition": [
+        {
+          "type": "StatusPoller",
+          "alias": ""
+        }]
+    },
+    {
+      "name": "VES Collector",
+      "flowType": "VES Collector",
+      "description": "VES Collector",
+      "category": "Template",
+      "subCategory":"Base Monitoring Template",
+      "updateIfExist": "false",
+      "composition": [{
+        "type": "VES Collector",
+        "alias": ""
+      }]
+    },
+    {
+      "name": "VES Fault SE",
+      "flowType": "VES Fault SE",
+      "description": "VES Fault SE",
+      "category": "Template",
+      "subCategory":"Base Monitoring Template",
+      "updateIfExist": "false",
+      "composition": [{
+        "type": "Supplement",
+        "alias": ""
+      }, {
+        "type": "Enrich",
+        "alias": ""
+      }],
+      "relations": [{
+        "fromComponent": "Enrich",
+        "fromRequirement": "dependency",
+        "toComponent": "Supplement",
+        "toCapability": "feature"
+      }]
+    },
+    {
+      "name": "Docker Supplement",
+      "flowType": "Docker Supplement",
+      "description": "Docker Supplement",
+      "category": "Template",
+      "subCategory":"Base Monitoring Template",
+      "updateIfExist": "false",
+      "composition": [{
+        "type": "Docker_Supplement",
+        "alias": ""
+      }]
+    },
+    {
+      "name": "Docker Enrich",
+      "flowType": "Docker Enrich",
+      "description": "Docker Enrich",
+      "category": "Template",
+      "subCategory":"Base Monitoring Template",
+      "updateIfExist": "false",
+      "composition": [{
+        "type": "DockerEnrich",
+        "alias": ""
+      }]
+    },
+    {
+      "name": "MIB Poller",
+      "flowType": "MIB Poller",
+      "description": "MIB Poller",
+      "category": "Template",
+      "subCategory":"Base Monitoring Template",
+      "updateIfExist": "false",
+      "composition": [{
+        "type": "MIBPoller",
+        "alias": ""
+      }]
+    },
+    {
+      "name": "Discovery Poller",
+      "flowType": "Discovery Poller",
+      "description": "Discovery Poller",
+      "category": "Template",
+      "subCategory":"Base Monitoring Template",
+      "updateIfExist": "false",
+      "composition": [{
+        "type": "Discovery",
+        "alias": ""
+      }]
+    }]
 }
\ No newline at end of file
diff --git a/docker/docker_tools/chef-solo/cookbooks/Deploy-DCAE/templates/default/environment.json.erb b/docker/docker_tools/chef-solo/cookbooks/Deploy-DCAE/templates/default/environment.json.erb
index a792cf9..d30881c 100644
--- a/docker/docker_tools/chef-solo/cookbooks/Deploy-DCAE/templates/default/environment.json.erb
+++ b/docker/docker_tools/chef-solo/cookbooks/Deploy-DCAE/templates/default/environment.json.erb
@@ -3,8 +3,8 @@
   "dcaeBePort": "<%= @dcae_be_port %>",
   "apiPath": "/dcae",
   "credential" :{
-    "editor": "Carlos_Santana",
-    "username": "cs0008",
+    "editor": "",
+    "username": "jh0003",
     "password": "",
     "firstName": "",
     "lastName": ""