diff options
| -rw-r--r-- | mod/bpgenerator/TestCases/ves/blueprints/vesK8sWithDmaap.yaml (renamed from mod/bpgenerator/TestCases/ves/blueprints/ves-with-dmaap_yaml.yaml) | 179 | ||||
| -rw-r--r-- | mod/bpgenerator/TestCases/ves/blueprints/vesK8sWithoutDmaap.yaml (renamed from mod/bpgenerator/TestCases/ves/blueprints/ves-no-change_yaml.yaml) | 12 | ||||
| -rw-r--r-- | mod/bpgenerator/pom.xml | 2 | ||||
| -rw-r--r-- | mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/blueprint/Properties.java | 20 | ||||
| -rw-r--r-- | mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/onapbp/OnapNode.java | 2 | ||||
| -rw-r--r-- | mod/bpgenerator/src/test/java/org/onap/blueprintgenerator/core/BlueprintGeneratorTest.java | 2 | ||||
| -rw-r--r-- | mod/bpgenerator/version.properties | 2 |
7 files changed, 119 insertions, 100 deletions
diff --git a/mod/bpgenerator/TestCases/ves/blueprints/ves-with-dmaap_yaml.yaml b/mod/bpgenerator/TestCases/ves/blueprints/vesK8sWithDmaap.yaml index 915411e..601690e 100644 --- a/mod/bpgenerator/TestCases/ves/blueprints/ves-with-dmaap_yaml.yaml +++ b/mod/bpgenerator/TestCases/ves/blueprints/vesK8sWithDmaap.yaml @@ -15,15 +15,15 @@ # 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: -- https://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.1/k8splugin_types.yaml -- https://nexus.onap.org/service/local/repositories/raw/content/org.onap.ccsdk.platform.plugins/type_files/dmaap/dmaap.yaml +- 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 @@ -51,6 +51,9 @@ inputs: 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 @@ -61,65 +64,65 @@ inputs: tag_version: type: string default: "nexus.onap.org:10001/onap/org.onap.dcaegen2.collectors.ves.vescollector:latest" - topic0_name: + ves-fault_topic_name: type: string - topic1_name: + ves-fault_ves-fault_topic_aaf_password: type: string - topic2_name: + ves-fault_ves-fault_topic_aaf_username: type: string - topic3_name: + ves-fault_ves-fault_topic_client_role: type: string - topic4_name: + ves-fault_ves-fault_topic_location: type: string - topic5_name: + ves-heartbeat-secondary_topic_name: type: string - ves-fault_topic0_aaf_password: + ves-heartbeat-secondary_ves-heartbeat-secondary_topic_aaf_password: type: string - ves-fault_topic0_aaf_username: + ves-heartbeat-secondary_ves-heartbeat-secondary_topic_aaf_username: type: string - ves-fault_topic0_client_role: + ves-heartbeat-secondary_ves-heartbeat-secondary_topic_client_role: type: string - ves-fault_topic0_location: + ves-heartbeat-secondary_ves-heartbeat-secondary_topic_location: type: string - ves-heartbeat-secondary_topic3_aaf_password: + ves-measurement_topic_name: type: string - ves-heartbeat-secondary_topic3_aaf_username: + ves-measurement_ves-measurement_topic_aaf_password: type: string - ves-heartbeat-secondary_topic3_client_role: + ves-measurement_ves-measurement_topic_aaf_username: type: string - ves-heartbeat-secondary_topic3_location: + ves-measurement_ves-measurement_topic_client_role: type: string - ves-measurement_topic1_aaf_password: + ves-measurement_ves-measurement_topic_location: type: string - ves-measurement_topic1_aaf_username: + ves-notification_topic_name: type: string - ves-measurement_topic1_client_role: + ves-notification_ves-notification_topic_aaf_password: type: string - ves-measurement_topic1_location: + ves-notification_ves-notification_topic_aaf_username: type: string - ves-notification_topic5_aaf_password: + ves-notification_ves-notification_topic_client_role: type: string - ves-notification_topic5_aaf_username: + ves-notification_ves-notification_topic_location: type: string - ves-notification_topic5_client_role: + ves-other_topic_name: type: string - ves-notification_topic5_location: + ves-other_ves-other_topic_aaf_password: type: string - ves-other_topic2_aaf_password: + ves-other_ves-other_topic_aaf_username: type: string - ves-other_topic2_aaf_username: + ves-other_ves-other_topic_client_role: type: string - ves-other_topic2_client_role: + ves-other_ves-other_topic_location: type: string - ves-other_topic2_location: + ves-pnfRegistration_topic_name: type: string - ves-pnfRegistration_topic4_aaf_password: + ves-pnfRegistration_ves-pnfRegistration_topic_aaf_password: type: string - ves-pnfRegistration_topic4_aaf_username: + ves-pnfRegistration_ves-pnfRegistration_topic_aaf_username: type: string - ves-pnfRegistration_topic4_client_role: + ves-pnfRegistration_ves-pnfRegistration_topic_client_role: type: string - ves-pnfRegistration_topic4_location: + ves-pnfRegistration_ves-pnfRegistration_topic_location: type: string node_templates: dcae-ves-collector: @@ -138,47 +141,47 @@ node_templates: service_calls: [] streams_publishes: ves-fault: - dmaap_info: <<topic0>> + dmaap_info: <<ves-fault_topic>> type: message router pass: - get_input: ves-fault_topic0_aaf_password + get_input: ves-fault_ves-fault_topic_aaf_password user: - get_input: ves-fault_topic0_aaf_username + get_input: ves-fault_ves-fault_topic_aaf_username ves-heartbeat-secondary: - dmaap_info: <<topic3>> + dmaap_info: <<ves-heartbeat-secondary_topic>> type: message router pass: - get_input: ves-heartbeat-secondary_topic3_aaf_password + get_input: ves-heartbeat-secondary_ves-heartbeat-secondary_topic_aaf_password user: - get_input: ves-heartbeat-secondary_topic3_aaf_username + get_input: ves-heartbeat-secondary_ves-heartbeat-secondary_topic_aaf_username ves-measurement: - dmaap_info: <<topic1>> + dmaap_info: <<ves-measurement_topic>> type: message router pass: - get_input: ves-measurement_topic1_aaf_password + get_input: ves-measurement_ves-measurement_topic_aaf_password user: - get_input: ves-measurement_topic1_aaf_username + get_input: ves-measurement_ves-measurement_topic_aaf_username ves-notification: - dmaap_info: <<topic5>> + dmaap_info: <<ves-notification_topic>> type: message router pass: - get_input: ves-notification_topic5_aaf_password + get_input: ves-notification_ves-notification_topic_aaf_password user: - get_input: ves-notification_topic5_aaf_username + get_input: ves-notification_ves-notification_topic_aaf_username ves-other: - dmaap_info: <<topic2>> + dmaap_info: <<ves-other_topic>> type: message router pass: - get_input: ves-other_topic2_aaf_password + get_input: ves-other_ves-other_topic_aaf_password user: - get_input: ves-other_topic2_aaf_username + get_input: ves-other_ves-other_topic_aaf_username ves-pnfRegistration: - dmaap_info: <<topic4>> + dmaap_info: <<ves-pnfRegistration_topic>> type: message router pass: - get_input: ves-pnfRegistration_topic4_aaf_password + get_input: ves-pnfRegistration_ves-pnfRegistration_topic_aaf_password user: - get_input: ves-pnfRegistration_topic4_aaf_username + get_input: ves-pnfRegistration_ves-pnfRegistration_topic_aaf_username streams_subscribes: {} auth.method: noAuth collector.dmaap.streamid: @@ -218,45 +221,47 @@ node_templates: 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: topic0 + - name: ves-fault_topic location: - get_input: ves-fault_topic0_location + get_input: ves-fault_ves-fault_topic_location client_role: - get_input: ves-fault_topic0_client_role + get_input: ves-fault_ves-fault_topic_client_role type: message router - - name: topic1 + - name: ves-measurement_topic location: - get_input: ves-measurement_topic1_location + get_input: ves-measurement_ves-measurement_topic_location client_role: - get_input: ves-measurement_topic1_client_role + get_input: ves-measurement_ves-measurement_topic_client_role type: message router - - name: topic2 + - name: ves-other_topic location: - get_input: ves-other_topic2_location + get_input: ves-other_ves-other_topic_location client_role: - get_input: ves-other_topic2_client_role + get_input: ves-other_ves-other_topic_client_role type: message router - - name: topic3 + - name: ves-heartbeat-secondary_topic location: - get_input: ves-heartbeat-secondary_topic3_location + get_input: ves-heartbeat-secondary_ves-heartbeat-secondary_topic_location client_role: - get_input: ves-heartbeat-secondary_topic3_client_role + get_input: ves-heartbeat-secondary_ves-heartbeat-secondary_topic_client_role type: message router - - name: topic4 + - name: ves-pnfRegistration_topic location: - get_input: ves-pnfRegistration_topic4_location + get_input: ves-pnfRegistration_ves-pnfRegistration_topic_location client_role: - get_input: ves-pnfRegistration_topic4_client_role + get_input: ves-pnfRegistration_ves-pnfRegistration_topic_client_role type: message router - - name: topic5 + - name: ves-notification_topic location: - get_input: ves-notification_topic5_location + get_input: ves-notification_ves-notification_topic_location client_role: - get_input: ves-notification_topic5_client_role + get_input: ves-notification_ves-notification_topic_client_role type: message router resource_config: limits: @@ -271,44 +276,44 @@ node_templates: get_input: dcae-ves-collector_memory_request relationships: - type: ccsdk.relationships.publish_events - target: topic0 + target: ves-fault_topic - type: ccsdk.relationships.publish_events - target: topic1 + target: ves-measurement_topic - type: ccsdk.relationships.publish_events - target: topic2 + target: ves-other_topic - type: ccsdk.relationships.publish_events - target: topic3 + target: ves-heartbeat-secondary_topic - type: ccsdk.relationships.publish_events - target: topic4 + target: ves-pnfRegistration_topic - type: ccsdk.relationships.publish_events - target: topic5 - topic0: + target: ves-notification_topic + ves-fault_topic: type: ccsdk.nodes.Topic properties: topic_name: - get_input: topic0_name - topic1: + get_input: ves-fault_topic_name + ves-heartbeat-secondary_topic: type: ccsdk.nodes.Topic properties: topic_name: - get_input: topic1_name - topic2: + get_input: ves-heartbeat-secondary_topic_name + ves-measurement_topic: type: ccsdk.nodes.Topic properties: topic_name: - get_input: topic2_name - topic3: + get_input: ves-measurement_topic_name + ves-notification_topic: type: ccsdk.nodes.Topic properties: topic_name: - get_input: topic3_name - topic4: + get_input: ves-notification_topic_name + ves-other_topic: type: ccsdk.nodes.Topic properties: topic_name: - get_input: topic4_name - topic5: + get_input: ves-other_topic_name + ves-pnfRegistration_topic: type: ccsdk.nodes.Topic properties: topic_name: - get_input: topic5_name
\ No newline at end of file + get_input: ves-pnfRegistration_topic_name
\ No newline at end of file diff --git a/mod/bpgenerator/TestCases/ves/blueprints/ves-no-change_yaml.yaml b/mod/bpgenerator/TestCases/ves/blueprints/vesK8sWithoutDmaap.yaml index b93f9c1..9786fff 100644 --- a/mod/bpgenerator/TestCases/ves/blueprints/ves-no-change_yaml.yaml +++ b/mod/bpgenerator/TestCases/ves/blueprints/vesK8sWithoutDmaap.yaml @@ -16,14 +16,13 @@ # 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: -- https://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.1/k8splugin_types.yaml +- 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 @@ -82,7 +81,7 @@ inputs: type: string node_templates: dcae-ves-collector: - type: dcae.nodes.ContainerizedPlatformComponent + type: dcae.nodes.ContainerizedServiceComponent interfaces: cloudify.interfaces.lifecycle: start: @@ -148,7 +147,7 @@ node_templates: healthcheck: interval: 15s timeout: 1s - type: https + type: http endpoint: /healthcheck volumes: - container: @@ -167,10 +166,9 @@ node_templates: get_input: image location_id: get_input: location_id - dns_name: dcae-ves-collector + service_component_type: dcae-ves-collector replicas: get_input: replicas - name: dcae-ves-collector resource_config: limits: cpu: diff --git a/mod/bpgenerator/pom.xml b/mod/bpgenerator/pom.xml index f097457..b6a45d0 100644 --- a/mod/bpgenerator/pom.xml +++ b/mod/bpgenerator/pom.xml @@ -29,7 +29,7 @@ </parent> <groupId>org.onap.dcaegen2.platform.mod</groupId> <artifactId>blueprint-generator</artifactId> - <version>1.3.2-SNAPSHOT</version> + <version>1.3.3-SNAPSHOT</version> <properties> <maven.compiler.source>1.6</maven.compiler.source> <maven.compiler.target>1.6</maven.compiler.target> diff --git a/mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/blueprint/Properties.java b/mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/blueprint/Properties.java index 31df9c3..382964b 100644 --- a/mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/blueprint/Properties.java +++ b/mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/blueprint/Properties.java @@ -92,10 +92,10 @@ public class Properties { retInputs.put("replicas", rep); //set the dns name - this.setDns_name(cs.getSelf().getName()); + //this.setDns_name(cs.getSelf().getName()); //set the name - this.setName(cs.getSelf().getName()); + //this.setName(cs.getSelf().getName()); //set the docker config Auxilary aux = cs.getAuxilary(); @@ -118,6 +118,12 @@ public class Properties { inputAlwaysPullImage.put("default", true); retInputs.put("always_pull_image", inputAlwaysPullImage); + + //set service component type + String sType = cs.getSelf().getName(); + sType = sType.replace('.', '-'); + this.setService_component_type(sType); + //set the tls info if(cs.getAuxilary().getTls_info() != null){ addTlsInfo(cs,retInputs); @@ -144,6 +150,16 @@ public class Properties { img.put("default", cs.getArtifacts()[0].getUri()); retInputs.put("tag_version", img); + + //set the location id + GetInput location = new GetInput(); + location.setGet_input("location_id"); + this.setLocation_id(location); + LinkedHashMap<String, Object> locMap = new LinkedHashMap(); + locMap.put("type", "string"); + locMap.put("default", ""); + retInputs.put("location_id", locMap); + //set the log info this.setLog_info(cs.getAuxilary().getLog_info()); diff --git a/mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/onapbp/OnapNode.java b/mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/onapbp/OnapNode.java index a3d8e3e..dbff78c 100644 --- a/mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/onapbp/OnapNode.java +++ b/mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/onapbp/OnapNode.java @@ -64,7 +64,7 @@ public class OnapNode extends Node{ this.setInterfaces(interfaces); //set the type - this.setType("dcae.nodes.ContainerizedPlatformComponent"); + this.setType("dcae.nodes.ContainerizedServiceComponent"); //create and set the relationships ArrayList<LinkedHashMap<String, String>> rets = new ArrayList(); diff --git a/mod/bpgenerator/src/test/java/org/onap/blueprintgenerator/core/BlueprintGeneratorTest.java b/mod/bpgenerator/src/test/java/org/onap/blueprintgenerator/core/BlueprintGeneratorTest.java index 1827349..9c581cf 100644 --- a/mod/bpgenerator/src/test/java/org/onap/blueprintgenerator/core/BlueprintGeneratorTest.java +++ b/mod/bpgenerator/src/test/java/org/onap/blueprintgenerator/core/BlueprintGeneratorTest.java @@ -352,7 +352,7 @@ public class BlueprintGeneratorTest { OnapNode testNode = new OnapNode(); //set the type - testNode.setType("dcae.nodes.ContainerizedPlatformComponent"); + testNode.setType("dcae.nodes.ContainerizedServiceComponent"); ArrayList<String> ports = new ArrayList<String>(); ports.add("concat: [\"80:\", {get_input: external_port }]"); diff --git a/mod/bpgenerator/version.properties b/mod/bpgenerator/version.properties index ef20baa..fd60497 100644 --- a/mod/bpgenerator/version.properties +++ b/mod/bpgenerator/version.properties @@ -1,6 +1,6 @@ major=1 minor=3 -patch=2 +patch=3 base_version=${major}.${minor}.${patch} release_version=${base_version} snapshot_version=${base_version}-SNAPSHOT |