Blueprint Generator Refactored Code Issue-ID: DCAEGEN2-2472

Change-Id: I2ade7fb3b4196554eb4ecadd918fd45cb6ba8a52
Signed-off-by: Ravi Mantena <rx908f@att.com>

4 files changed, 0 insertions, 791 deletions

diff --git a/mod/bpgenerator/TestCases/ves/blueprints/vesK8sWithDmaap.yaml b/mod/bpgenerator/TestCases/ves/blueprints/vesK8sWithDmaap.yaml
deleted file mode 100644
index 601690e..0000000
--- a/mod/bpgenerator/TestCases/ves/blueprints/vesK8sWithDmaap.yaml
+++ /dev/null
@@ -1,319 +0,0 @@
-#  ============LICENSE_START=======================================================
-#    org.onap.dcae
-#    ================================================================================
-#    Copyright (c) 2019-2020 AT&T Intellectual Property. All rights reserved.
-#    ================================================================================
-#    Licensed under the Apache License, Version 2.0 (the "License");
-#    you may not use this file except in compliance with the License.
-#    You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
-#    ============LICENSE_END=========================================================
-#
-#description: Collector for receiving VES events through restful interface
-#blueprint_version: 1.5.0
----
-tosca_definitions_version: cloudify_dsl_1_3
-description: Collector for receiving VES events through restful interface
-imports:
-- http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
-- https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R6/k8splugin/1.7.2/k8splugin_types.yaml
-inputs:
-  collector.dmaap.streamid:
-    type: string
-    default: "fault=ves-fault,ves-fault-secondary|syslog=ves-syslog,ves-syslog-secondary|heartbeat=ves-heartbeat,ves-heartbeat-secondary|measurementsForVfScaling=ves-measurement,ves-measurement-secondary|mobileFlow=ves-mobileflow,ves-mobileflow-secondary|other=ves-other,ves-other-secondary|stateChange=ves-statechange,ves-statechange-secondary|thresholdCrossingAlert=ves-thresholdCrossingAlert,ves-thresholdCrossingAlert-secondary|voiceQuality=ves-voicequality,ves-voicequality-secondary|sipSignaling=ves-sipsignaling,ves-sipsignaling-secondary|notification=ves-notification,ves-notification-secondary|pnfRegistration=ves-pnfRegistration,ves-pnfRegistration-secondary"
-  dcae-ves-collector_cpu_limit:
-    type: string
-    default: "250m"
-  dcae-ves-collector_cpu_request:
-    type: string
-    default: "250m"
-  dcae-ves-collector_memory_limit:
-    type: string
-    default: "128Mi"
-  dcae-ves-collector_memory_request:
-    type: string
-    default: "128Mi"
-  envs:
-    default: {}
-  external_port_0:
-    type: string
-    default: "8080"
-  external_port_1:
-    type: string
-    default: "8443"
-  header.authlist:
-    type: string
-    default: "sample1,$2a$10$pgjaxDzSuc6XVFEeqvxQ5u90DKJnM/u7TJTcinAlFJVaavXMWf/Zi|userid1,$2a$10$61gNubgJJl9lh3nvQvY9X.x4e5ETWJJ7ao7ZhJEvmfJigov26Z6uq|userid2,$2a$10$G52y/3uhuhWAMy.bx9Se8uzWinmbJa.dlm1LW6bYPdPkkywLDPLiy"
-  location_id:
-    type: string
-    default: ""
-  replicas:
-    type: integer
-    description: number of instances
-    default: 1
-  service_component_name_override:
-    type: string
-    default: ""
-  tag_version:
-    type: string
-    default: "nexus.onap.org:10001/onap/org.onap.dcaegen2.collectors.ves.vescollector:latest"
-  ves-fault_topic_name:
-    type: string
-  ves-fault_ves-fault_topic_aaf_password:
-    type: string
-  ves-fault_ves-fault_topic_aaf_username:
-    type: string
-  ves-fault_ves-fault_topic_client_role:
-    type: string
-  ves-fault_ves-fault_topic_location:
-    type: string
-  ves-heartbeat-secondary_topic_name:
-    type: string
-  ves-heartbeat-secondary_ves-heartbeat-secondary_topic_aaf_password:
-    type: string
-  ves-heartbeat-secondary_ves-heartbeat-secondary_topic_aaf_username:
-    type: string
-  ves-heartbeat-secondary_ves-heartbeat-secondary_topic_client_role:
-    type: string
-  ves-heartbeat-secondary_ves-heartbeat-secondary_topic_location:
-    type: string
-  ves-measurement_topic_name:
-    type: string
-  ves-measurement_ves-measurement_topic_aaf_password:
-    type: string
-  ves-measurement_ves-measurement_topic_aaf_username:
-    type: string
-  ves-measurement_ves-measurement_topic_client_role:
-    type: string
-  ves-measurement_ves-measurement_topic_location:
-    type: string
-  ves-notification_topic_name:
-    type: string
-  ves-notification_ves-notification_topic_aaf_password:
-    type: string
-  ves-notification_ves-notification_topic_aaf_username:
-    type: string
-  ves-notification_ves-notification_topic_client_role:
-    type: string
-  ves-notification_ves-notification_topic_location:
-    type: string
-  ves-other_topic_name:
-    type: string
-  ves-other_ves-other_topic_aaf_password:
-    type: string
-  ves-other_ves-other_topic_aaf_username:
-    type: string
-  ves-other_ves-other_topic_client_role:
-    type: string
-  ves-other_ves-other_topic_location:
-    type: string
-  ves-pnfRegistration_topic_name:
-    type: string
-  ves-pnfRegistration_ves-pnfRegistration_topic_aaf_password:
-    type: string
-  ves-pnfRegistration_ves-pnfRegistration_topic_aaf_username:
-    type: string
-  ves-pnfRegistration_ves-pnfRegistration_topic_client_role:
-    type: string
-  ves-pnfRegistration_ves-pnfRegistration_topic_location:
-    type: string
-node_templates:
-  dcae-ves-collector:
-    type: dcae.nodes.ContainerizedServiceComponentUsingDmaap
-    interfaces:
-      cloudify.interfaces.lifecycle:
-        start:
-          inputs:
-            ports:
-            - concat: ["8080:", {get_input: external_port_0}]
-            - concat: ["8443:", {get_input: external_port_1}]
-            envs:
-              get_input: envs
-    properties:
-      application_config:
-        service_calls: []
-        streams_publishes:
-          ves-fault:
-            dmaap_info: <<ves-fault_topic>>
-            type: message router
-            pass:
-              get_input: ves-fault_ves-fault_topic_aaf_password
-            user:
-              get_input: ves-fault_ves-fault_topic_aaf_username
-          ves-heartbeat-secondary:
-            dmaap_info: <<ves-heartbeat-secondary_topic>>
-            type: message router
-            pass:
-              get_input: ves-heartbeat-secondary_ves-heartbeat-secondary_topic_aaf_password
-            user:
-              get_input: ves-heartbeat-secondary_ves-heartbeat-secondary_topic_aaf_username
-          ves-measurement:
-            dmaap_info: <<ves-measurement_topic>>
-            type: message router
-            pass:
-              get_input: ves-measurement_ves-measurement_topic_aaf_password
-            user:
-              get_input: ves-measurement_ves-measurement_topic_aaf_username
-          ves-notification:
-            dmaap_info: <<ves-notification_topic>>
-            type: message router
-            pass:
-              get_input: ves-notification_ves-notification_topic_aaf_password
-            user:
-              get_input: ves-notification_ves-notification_topic_aaf_username
-          ves-other:
-            dmaap_info: <<ves-other_topic>>
-            type: message router
-            pass:
-              get_input: ves-other_ves-other_topic_aaf_password
-            user:
-              get_input: ves-other_ves-other_topic_aaf_username
-          ves-pnfRegistration:
-            dmaap_info: <<ves-pnfRegistration_topic>>
-            type: message router
-            pass:
-              get_input: ves-pnfRegistration_ves-pnfRegistration_topic_aaf_password
-            user:
-              get_input: ves-pnfRegistration_ves-pnfRegistration_topic_aaf_username
-        streams_subscribes: {}
-        auth.method: noAuth
-        collector.dmaap.streamid:
-          get_input: collector.dmaap.streamid
-        collector.keystore.file.location: /opt/app/dcae-certificate/keystore.jks
-        collector.keystore.passwordfile: /opt/app/dcae-certificate/.password
-        collector.schema.checkflag: 1
-        collector.schema.file: {"v1":"./etc/CommonEventFormat_27.2.json","v2":"./etc/CommonEventFormat_27.2.json","v3":"./etc/CommonEventFormat_27.2.json","v4":"./etc/CommonEventFormat_27.2.json","v5":"./etc/CommonEventFormat_28.4.1.json","v7":"./etc/CommonEventFormat_30.json"}
-        collector.service.port: 8080
-        collector.service.secure.port: 8443
-        collector.truststore.file.location: /opt/app/dcae-certificate/truststore.jks
-        collector.truststore.passwordfile: /opt/app/dcae-certificate/.trustpassword
-        event.transform.flag: 1
-        header.authlist:
-          get_input: header.authlist
-        service_component_name_override:
-          get_input: service_component_name_override
-        tomcat.maxthreads: 200
-      docker_config:
-        healthcheck:
-          interval: 15s
-          timeout: 1s
-          type: http
-          endpoint: /healthcheck
-        volumes:
-        - container:
-            bind: /opt/app/dcae-certificate
-          host:
-            path: /opt/app/dcae-certificate
-        - container:
-            bind: /opt/app/VESCollector/logs
-          host:
-            path: /opt/logs/DCAE/VESCollector/logs
-        - container:
-            bind: /opt/app/VESCollector/etc
-          host:
-            path: /opt/logs/DCAE/VESCollector/etc
-      image:
-        get_input: tag_version
-      location_id:
-        get_input: location_id
-      service_component_type: dcae-ves-collector
-      replicas:
-        get_input: replicas
-      streams_publishes:
-      - name: ves-fault_topic
-        location:
-          get_input: ves-fault_ves-fault_topic_location
-        client_role:
-          get_input: ves-fault_ves-fault_topic_client_role
-        type: message router
-      - name: ves-measurement_topic
-        location:
-          get_input: ves-measurement_ves-measurement_topic_location
-        client_role:
-          get_input: ves-measurement_ves-measurement_topic_client_role
-        type: message router
-      - name: ves-other_topic
-        location:
-          get_input: ves-other_ves-other_topic_location
-        client_role:
-          get_input: ves-other_ves-other_topic_client_role
-        type: message router
-      - name: ves-heartbeat-secondary_topic
-        location:
-          get_input: ves-heartbeat-secondary_ves-heartbeat-secondary_topic_location
-        client_role:
-          get_input: ves-heartbeat-secondary_ves-heartbeat-secondary_topic_client_role
-        type: message router
-      - name: ves-pnfRegistration_topic
-        location:
-          get_input: ves-pnfRegistration_ves-pnfRegistration_topic_location
-        client_role:
-          get_input: ves-pnfRegistration_ves-pnfRegistration_topic_client_role
-        type: message router
-      - name: ves-notification_topic
-        location:
-          get_input: ves-notification_ves-notification_topic_location
-        client_role:
-          get_input: ves-notification_ves-notification_topic_client_role
-        type: message router
-      resource_config:
-        limits:
-          cpu:
-            get_input: dcae-ves-collector_cpu_limit
-          memory:
-            get_input: dcae-ves-collector_memory_limit
-        requests:
-          cpu:
-            get_input: dcae-ves-collector_cpu_request
-          memory:
-            get_input: dcae-ves-collector_memory_request
-    relationships:
-    - type: ccsdk.relationships.publish_events
-      target: ves-fault_topic
-    - type: ccsdk.relationships.publish_events
-      target: ves-measurement_topic
-    - type: ccsdk.relationships.publish_events
-      target: ves-other_topic
-    - type: ccsdk.relationships.publish_events
-      target: ves-heartbeat-secondary_topic
-    - type: ccsdk.relationships.publish_events
-      target: ves-pnfRegistration_topic
-    - type: ccsdk.relationships.publish_events
-      target: ves-notification_topic
-  ves-fault_topic:
-    type: ccsdk.nodes.Topic
-    properties:
-      topic_name:
-        get_input: ves-fault_topic_name
-  ves-heartbeat-secondary_topic:
-    type: ccsdk.nodes.Topic
-    properties:
-      topic_name:
-        get_input: ves-heartbeat-secondary_topic_name
-  ves-measurement_topic:
-    type: ccsdk.nodes.Topic
-    properties:
-      topic_name:
-        get_input: ves-measurement_topic_name
-  ves-notification_topic:
-    type: ccsdk.nodes.Topic
-    properties:
-      topic_name:
-        get_input: ves-notification_topic_name
-  ves-other_topic:
-    type: ccsdk.nodes.Topic
-    properties:
-      topic_name:
-        get_input: ves-other_topic_name
-  ves-pnfRegistration_topic:
-    type: ccsdk.nodes.Topic
-    properties:
-      topic_name:
-        get_input: ves-pnfRegistration_topic_name
\ No newline at end of file
diff --git a/mod/bpgenerator/TestCases/ves/blueprints/vesK8sWithoutDmaap.yaml b/mod/bpgenerator/TestCases/ves/blueprints/vesK8sWithoutDmaap.yaml
deleted file mode 100644
index 9786fff..0000000
--- a/mod/bpgenerator/TestCases/ves/blueprints/vesK8sWithoutDmaap.yaml
+++ /dev/null
@@ -1,185 +0,0 @@
-#  ============LICENSE_START=======================================================
-#    org.onap.dcae
-#    ================================================================================
-#    Copyright (c) 2019-2020 AT&T Intellectual Property. All rights reserved.
-#    ================================================================================
-#    Licensed under the Apache License, Version 2.0 (the "License");
-#    you may not use this file except in compliance with the License.
-#    You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
-#    ============LICENSE_END=========================================================
-#
-#description: Collector for receiving VES events through restful interface
-#blueprint_version: 1.5.0
----
-tosca_definitions_version: cloudify_dsl_1_3
-imports:
-- http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
-- https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R6/k8splugin/1.7.2/k8splugin_types.yaml
-inputs:
-  always_pull_image:
-    type: boolean
-    description: Set to true if the image should always be pulled
-    default: true
-  collector.dmaap.streamid:
-    type: string
-    default: "fault=ves-fault,ves-fault-secondary|syslog=ves-syslog,ves-syslog-secondary|heartbeat=ves-heartbeat,ves-heartbeat-secondary|measurementsForVfScaling=ves-measurement,ves-measurement-secondary|mobileFlow=ves-mobileflow,ves-mobileflow-secondary|other=ves-other,ves-other-secondary|stateChange=ves-statechange,ves-statechange-secondary|thresholdCrossingAlert=ves-thresholdCrossingAlert,ves-thresholdCrossingAlert-secondary|voiceQuality=ves-voicequality,ves-voicequality-secondary|sipSignaling=ves-sipsignaling,ves-sipsignaling-secondary|notification=ves-notification,ves-notification-secondary|pnfRegistration=ves-pnfRegistration,ves-pnfRegistration-secondary"
-  dcae-ves-collector_cpu_limit:
-    type: string
-    default: "250m"
-  dcae-ves-collector_cpu_request:
-    type: string
-    default: "250m"
-  dcae-ves-collector_memory_limit:
-    type: string
-    default: "128Mi"
-  dcae-ves-collector_memory_request:
-    type: string
-    default: "128Mi"
-  envs:
-    default: {}
-  external_port_0:
-    type: string
-    default: "8080"
-  external_port_1:
-    type: string
-    default: "8443"
-  header.authlist:
-    type: string
-    default: "sample1,$2a$10$pgjaxDzSuc6XVFEeqvxQ5u90DKJnM/u7TJTcinAlFJVaavXMWf/Zi|userid1,$2a$10$61gNubgJJl9lh3nvQvY9X.x4e5ETWJJ7ao7ZhJEvmfJigov26Z6uq|userid2,$2a$10$G52y/3uhuhWAMy.bx9Se8uzWinmbJa.dlm1LW6bYPdPkkywLDPLiy"
-  image:
-    type: string
-    default: "nexus.onap.org:10001/onap/org.onap.dcaegen2.collectors.ves.vescollector:latest"
-  location_id:
-    type: string
-    default: ""
-  replicas:
-    type: integer
-    description: number of instances
-    default: 1
-  service_component_name_override:
-    type: string
-    default: ""
-  ves_fault_publish_url:
-    type: string
-  ves_heartbeat_secondary_publish_url:
-    type: string
-  ves_measurement_publish_url:
-    type: string
-  ves_notification_publish_url:
-    type: string
-  ves_other_publish_url:
-    type: string
-  ves_pnfRegistration_publish_url:
-    type: string
-node_templates:
-  dcae-ves-collector:
-    type: dcae.nodes.ContainerizedServiceComponent
-    interfaces:
-      cloudify.interfaces.lifecycle:
-        start:
-          inputs:
-            ports:
-            - concat: ["8080:", {get_input: external_port_0}]
-            - concat: ["8443:", {get_input: external_port_1}]
-            envs:
-              get_input: envs
-    properties:
-      application_config:
-        service_calls: []
-        streams_publishes:
-          ves-fault:
-            dmaap_info:
-              topic_url:
-                get_input: ves_fault_publish_url
-            type: message router
-          ves-heartbeat-secondary:
-            dmaap_info:
-              topic_url:
-                get_input: ves_heartbeat_secondary_publish_url
-            type: message router
-          ves-measurement:
-            dmaap_info:
-              topic_url:
-                get_input: ves_measurement_publish_url
-            type: message router
-          ves-notification:
-            dmaap_info:
-              topic_url:
-                get_input: ves_notification_publish_url
-            type: message router
-          ves-other:
-            dmaap_info:
-              topic_url:
-                get_input: ves_other_publish_url
-            type: message router
-          ves-pnfRegistration:
-            dmaap_info:
-              topic_url:
-                get_input: ves_pnfRegistration_publish_url
-            type: message router
-        streams_subscribes: {}
-        auth.method: noAuth
-        collector.dmaap.streamid:
-          get_input: collector.dmaap.streamid
-        collector.keystore.file.location: /opt/app/dcae-certificate/keystore.jks
-        collector.keystore.passwordfile: /opt/app/dcae-certificate/.password
-        collector.schema.checkflag: 1
-        collector.schema.file: {"v1":"./etc/CommonEventFormat_27.2.json","v2":"./etc/CommonEventFormat_27.2.json","v3":"./etc/CommonEventFormat_27.2.json","v4":"./etc/CommonEventFormat_27.2.json","v5":"./etc/CommonEventFormat_28.4.1.json","v7":"./etc/CommonEventFormat_30.json"}
-        collector.service.port: 8080
-        collector.service.secure.port: 8443
-        collector.truststore.file.location: /opt/app/dcae-certificate/truststore.jks
-        collector.truststore.passwordfile: /opt/app/dcae-certificate/.trustpassword
-        event.transform.flag: 1
-        header.authlist:
-          get_input: header.authlist
-        service_component_name_override:
-          get_input: service_component_name_override
-        tomcat.maxthreads: 200
-      docker_config:
-        healthcheck:
-          interval: 15s
-          timeout: 1s
-          type: http
-          endpoint: /healthcheck
-        volumes:
-        - container:
-            bind: /opt/app/dcae-certificate
-          host:
-            path: /opt/app/dcae-certificate
-        - container:
-            bind: /opt/app/VESCollector/logs
-          host:
-            path: /opt/logs/DCAE/VESCollector/logs
-        - container:
-            bind: /opt/app/VESCollector/etc
-          host:
-            path: /opt/logs/DCAE/VESCollector/etc
-      image:
-        get_input: image
-      location_id:
-        get_input: location_id
-      service_component_type: dcae-ves-collector
-      replicas:
-        get_input: replicas
-      resource_config:
-        limits:
-          cpu:
-            get_input: dcae-ves-collector_cpu_limit
-          memory:
-            get_input: dcae-ves-collector_memory_limit
-        requests:
-          cpu:
-            get_input: dcae-ves-collector_cpu_request
-          memory:
-            get_input: dcae-ves-collector_memory_request
-      always_pull_image:
-        get_input: always_pull_image
-    relationships: []
\ No newline at end of file
diff --git a/mod/bpgenerator/TestCases/ves/componentSpecs/ves.json b/mod/bpgenerator/TestCases/ves/componentSpecs/ves.json
deleted file mode 100644
index 6812347..0000000
--- a/mod/bpgenerator/TestCases/ves/componentSpecs/ves.json
+++ /dev/null
@@ -1,276 +0,0 @@
-{
-  "self": {
-    "version": "1.5.0",
-    "name": "dcae-ves-collector",
-    "description": "Collector for receiving VES events through restful interface",
-    "component_type": "docker"
-  },
-  "streams": {
-    "subscribes": [],
-    "publishes": [
-      {
-        "format": "VES_specification",
-        "version": "5.28.4",
-        "type": "message router",
-        "config_key": "ves-fault" 
-      },
-      {
-        "format": "VES_specification",
-        "version": "5.28.4",
-        "type": "message router",
-        "config_key": "ves-measurement" 
-      },
-      {
-        "format": "VES_specification",
-        "version": "5.28.4",
-        "type": "message router",
-        "config_key": "ves-other"  
-      },
-      {
-        "format": "VES_specification",
-        "version": "5.28.4",
-        "type": "message router",
-        "config_key": "ves-heartbeat-secondary" 
-      },
-      {
-        "format": "VES_specification",
-        "version": "7.30.0",
-        "type": "message router",
-        "config_key": "ves-pnfRegistration" 
-      },
-      {
-        "format": "VES_specification",
-        "version": "7.30.0",
-        "type": "message router",
-        "config_key": "ves-notification" 
-      }
-    ]
-  },
-  "services": {
-    "calls": [],
-    "provides": [
-      {
-        "route": "/eventListener/v1",
-        "verb": "POST",
-        "request": {
-          "format": "VES_specification",
-          "version": "4.27.2"
-        },
-        "response": {
-          "format": "ves.coll.response",
-          "version": "1.0.0"
-        }
-      },
-      {
-        "route": "/eventListener/v2",
-        "verb": "POST",
-        "request": {
-          "format": "VES_specification",
-          "version": "4.27.2"
-        },
-        "response": {
-          "format": "ves.coll.response",
-          "version": "1.0.0"
-        }
-      },
-      {
-        "route": "/eventListener/v3",
-        "verb": "POST",
-        "request": {
-          "format": "VES_specification",
-          "version": "4.27.2"
-        },
-        "response": {
-          "format": "ves.coll.response",
-          "version": "1.0.0"
-        }
-      },
-      {
-        "route": "/eventListener/v4",
-        "verb": "POST",
-        "request": {
-          "format": "VES_specification",
-          "version": "4.27.2"
-        },
-        "response": {
-          "format": "ves.coll.response",
-          "version": "1.0.0"
-        }
-      },
-      {
-        "route": "/eventListener/v5",
-        "verb": "POST",
-        "request": {
-          "format": "VES_specification",
-          "version": "5.28.4"
-        },
-        "response": {
-          "format": "ves.coll.response",
-          "version": "1.0.0"
-        }
-      },
-      {
-        "route": "/eventListener/v7",
-        "verb": "POST",
-        "request": {
-          "format": "VES_specification",
-          "version": "7.30.0"
-        },
-        "response": {
-          "format": "ves.coll.response",
-          "version": "1.0.0"
-        }
-      }
-    ]
-  },
-  "parameters": [
-    {
-      "name": "collector.service.port",
-      "value": 8080,
-      "description": "standard http port collector will open for listening;",
-      "sourced_at_deployment": false,
-      "policy_editable": false,
-      "designer_editable": false
-    },
-    {
-      "name": "collector.service.secure.port",
-      "value": 8443,
-      "description": "secure http port collector will open for listening ",
-      "sourced_at_deployment": false,
-      "policy_editable": false,
-      "designer_editable": true
-    },
-    {
-      "name": "collector.keystore.file.location",
-      "value": "/opt/app/dcae-certificate/keystore.jks",
-      "description": "fs location of keystore file in vm",
-      "sourced_at_deployment": false,
-      "policy_editable": false,
-      "designer_editable": false
-    },
-    {
-      "name": "collector.keystore.passwordfile",
-      "value": "/opt/app/dcae-certificate/.password",
-      "description": "location of keystore password file in vm",
-      "sourced_at_deployment": false,
-      "policy_editable": false,
-      "designer_editable": false
-    },
-    {
-      "name": "collector.truststore.file.location",
-      "value": "/opt/app/dcae-certificate/truststore.jks",
-      "description": "fs location of truststore file in vm",
-      "sourced_at_deployment": false,
-      "policy_editable": false,
-      "designer_editable": false
-    },
-    {
-      "name": "collector.truststore.passwordfile",
-      "value": "/opt/app/dcae-certificate/.trustpassword",
-      "description": "location of truststore password file in vm",
-      "sourced_at_deployment": false,
-      "policy_editable": false,
-      "designer_editable": false
-    },
-    {
-      "name": "collector.dmaap.streamid",
-      "value": "fault=ves-fault,ves-fault-secondary|syslog=ves-syslog,ves-syslog-secondary|heartbeat=ves-heartbeat,ves-heartbeat-secondary|measurementsForVfScaling=ves-measurement,ves-measurement-secondary|mobileFlow=ves-mobileflow,ves-mobileflow-secondary|other=ves-other,ves-other-secondary|stateChange=ves-statechange,ves-statechange-secondary|thresholdCrossingAlert=ves-thresholdCrossingAlert,ves-thresholdCrossingAlert-secondary|voiceQuality=ves-voicequality,ves-voicequality-secondary|sipSignaling=ves-sipsignaling,ves-sipsignaling-secondary|notification=ves-notification,ves-notification-secondary|pnfRegistration=ves-pnfRegistration,ves-pnfRegistration-secondary",
-      "description": "domain-to-streamid mapping used by VESCollector to distributes events based on domain. Both primary and secondary config_key are included for resilency (multiple streamid can be included commma separated). The streamids MUST match to topic config_keys. For single site without resiliency deployment - configkeys with -secondary suffix can be removed",
-      "sourced_at_deployment": true,
-      "policy_editable": false,
-      "designer_editable": false
-    },
-    {
-      "name": "auth.method",
-      "value": "noAuth",
-      "description": "Property to manage application mode, possible configurations: noAuth - default option - no security (http) , certOnly - auth by certificate (https), basicAuth - auth by basic auth username and password (https),certBasicAuth - auth by certificate and basic auth username / password (https),",
-      "sourced_at_deployment": false,
-      "policy_editable": false,
-      "designer_editable": false
-    },
-    {
-      "name": "header.authlist",
-      "value": "sample1,$2a$10$pgjaxDzSuc6XVFEeqvxQ5u90DKJnM/u7TJTcinAlFJVaavXMWf/Zi|userid1,$2a$10$61gNubgJJl9lh3nvQvY9X.x4e5ETWJJ7ao7ZhJEvmfJigov26Z6uq|userid2,$2a$10$G52y/3uhuhWAMy.bx9Se8uzWinmbJa.dlm1LW6bYPdPkkywLDPLiy",
-      "description": "List of id and base 64 encoded password.For each onboarding VNF - unique userid and password should be assigned and communicated to VNF owner. Password value should be base64 encoded in config here",
-      "policy_editable": false,
-      "sourced_at_deployment": true,
-      "designer_editable": true
-    },
-    {
-      "name": "collector.schema.checkflag",
-      "value": 1,
-      "description": "Schema check validation flag. When enabled, collector will validate input VES events against VES Schema defined on collector.schema.file ",
-      "sourced_at_deployment": false,
-      "policy_editable": false,
-      "designer_editable": false
-    },
-    {
-      "name": "collector.schema.file",
-      "value": "{\"v1\":\"./etc/CommonEventFormat_27.2.json\",\"v2\":\"./etc/CommonEventFormat_27.2.json\",\"v3\":\"./etc/CommonEventFormat_27.2.json\",\"v4\":\"./etc/CommonEventFormat_27.2.json\",\"v5\":\"./etc/CommonEventFormat_28.4.1.json\",\"v7\":\"./etc/CommonEventFormat_30.json\"}",
-      "description": "VES schema file name per version used for validation",
-      "designer_editable": true,
-      "sourced_at_deployment": false,
-      "policy_editable": false
-    },
-    {
-      "name": "event.transform.flag",
-      "value": 1,
-      "description": "flag to enable tranformation rules defined under eventTransform.json; this is applicable when event tranformation rules preset should be activated for transforming <VES5.4 events to 5.4",
-      "sourced_at_deployment": false,
-      "policy_editable": false,
-      "designer_editable": false
-    },
-    {
-      "name": "tomcat.maxthreads",
-      "value": "200",
-      "description": "Tomcat control for concurrent request",
-      "sourced_at_deployment": false,
-      "policy_editable": false,
-      "designer_editable": false
-    }
-  ],
-  "auxilary": {
-    "healthcheck": {
-      "type": "http",
-      "interval": "15s",
-      "timeout": "1s",
-      "endpoint": "/healthcheck"
-    },
-    "volumes": [
-      {
-        "container": {
-          "bind": "/opt/app/dcae-certificate"
-        },
-        "host": {
-          "path": "/opt/app/dcae-certificate"
-        }
-      },
-      {
-        "container": {
-          "bind": "/opt/app/VESCollector/logs"
-        },
-        "host": {
-          "path": "/opt/logs/DCAE/VESCollector/logs"
-        }
-      },
-      {
-        "container": {
-          "bind": "/opt/app/VESCollector/etc"
-        },
-        "host": {
-          "path": "/opt/logs/DCAE/VESCollector/etc"
-        }
-      }
-    ],
-    "ports": [
-      "8080:8080",
-      "8443:8443"
-    ]
-  },
-  "artifacts": [
-    {
-      "type": "docker image",
-      "uri": "nexus.onap.org:10001/onap/org.onap.dcaegen2.collectors.ves.vescollector:latest"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/mod/bpgenerator/TestCases/ves/inputFiles/ves_nodmaap.json b/mod/bpgenerator/TestCases/ves/inputFiles/ves_nodmaap.json
deleted file mode 100644
index 720ce5f..0000000
--- a/mod/bpgenerator/TestCases/ves/inputFiles/ves_nodmaap.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "ves_other_publish_url":"http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.SEC_OTHER_OUTPUT",
-  "ves_heartbeat_publish_url":"http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.SEC_HEARTBEAT_OUTPUT",
-  "ves_fault_publish_url":"http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.SEC_FAULT_OUTPUT",
-  "ves_measurement_publish_url":"http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.VES_MEASUREMENT_OUTPUT",
-  "ves_notification_publish_url":"http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.VES_NOTIFICATION_OUTPUT",
-  "ves_pnfRegistration_publish_url":"http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.VES_PNFREG_OUTPUT",
-  "external_port_0":"30235",
-  "external_port_1": "30417",
-  "image": "nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.ves.vescollector:1.3.1"
-}
\ No newline at end of file