aboutsummaryrefslogtreecommitdiffstats
path: root/asdc-controller/src/test/resources
diff options
context:
space:
mode:
Diffstat (limited to 'asdc-controller/src/test/resources')
-rw-r--r--asdc-controller/src/test/resources/application-test.yaml6
-rw-r--r--asdc-controller/src/test/resources/download/service-Testserviceforpnf-csar.csarbin0 -> 96641 bytes
-rw-r--r--asdc-controller/src/test/resources/resource-examples/service-BasicCnf/base_dummy.env7
-rw-r--r--asdc-controller/src/test/resources/resource-examples/service-BasicCnf/base_dummy.yaml49
-rw-r--r--asdc-controller/src/test/resources/resource-examples/service-BasicCnf/basic_cnf0_modules.json26
-rw-r--r--asdc-controller/src/test/resources/resource-examples/service-BasicCnf/nginx_cloudtech_k8s_charts.env1
-rw-r--r--asdc-controller/src/test/resources/resource-examples/service-BasicCnf/nginx_cloudtech_k8s_charts.tgzbin0 -> 2688 bytes
-rw-r--r--asdc-controller/src/test/resources/resource-examples/service-BasicCnf/service-BasicCnf-csar.csarbin0 -> 66792 bytes
-rw-r--r--asdc-controller/src/test/resources/resource-examples/service-BasicCnf/service-BasicCnf-notification.json127
-rw-r--r--asdc-controller/src/test/resources/resource-examples/service-BasicCnf/service-BasicCnf-template.yml352
-rw-r--r--asdc-controller/src/test/resources/resource-examples/service-BasicCnf/vendor-license-model.xml1
-rw-r--r--asdc-controller/src/test/resources/resource-examples/service-BasicCnf/vf-license-model.xml1
-rw-r--r--asdc-controller/src/test/resources/resource-examples/service-BasicNetwork/service-BasicNetwork-csar.csarbin0 -> 47931 bytes
-rw-r--r--asdc-controller/src/test/resources/resource-examples/service-BasicNetwork/service-BasicNetwork-notification.json47
-rw-r--r--asdc-controller/src/test/resources/resource-examples/service-BasicNetwork/service-BasicNetwork-template.yml112
-rw-r--r--asdc-controller/src/test/resources/resource-examples/service-ubuntu16test/base_ubuntu16.env10
-rw-r--r--asdc-controller/src/test/resources/resource-examples/service-ubuntu16test/base_ubuntu16.yaml106
-rw-r--r--asdc-controller/src/test/resources/resource-examples/service-ubuntu16test/service-Ubuntu16test-csar.csarbin0 -> 69016 bytes
-rw-r--r--asdc-controller/src/test/resources/resource-examples/service-ubuntu16test/service-Ubuntu16test-template.yml429
-rw-r--r--asdc-controller/src/test/resources/resource-examples/service-ubuntu16test/service-ubuntu16test-notification.json114
-rw-r--r--asdc-controller/src/test/resources/resource-examples/service-ubuntu16test/ubuntu16test0_modules.json25
-rw-r--r--asdc-controller/src/test/resources/resource-examples/service-ubuntu16test/vendor-license-model.xml1
-rw-r--r--asdc-controller/src/test/resources/resource-examples/vgw/ETSI_PACKAGE/VENDOR_LICENSE/vendor-license-model.xml1
-rw-r--r--asdc-controller/src/test/resources/resource-examples/vgw/ETSI_PACKAGE/VF_LICENSE/vf-license-model.xml1
-rw-r--r--asdc-controller/src/test/resources/resource-examples/vgw/ETSI_PACKAGE/vgw6.csarbin43363 -> 0 bytes
-rw-r--r--asdc-controller/src/test/resources/resource-examples/vgw/SDC_RESOURCE_CSAR/vgw_sdc_resource.csarbin117441 -> 0 bytes
-rw-r--r--asdc-controller/src/test/resources/resource-examples/vgw/VENDOR_LICENSE/vendor-license-model.xml1
-rw-r--r--asdc-controller/src/test/resources/resource-examples/vgw/VF_LICENSE/vf-license-model.xml1
-rw-r--r--asdc-controller/src/test/resources/resource-examples/vgw/dmaap-notification-message.json66
-rw-r--r--asdc-controller/src/test/resources/resource-examples/vgw/etsi-catalog-package-onboading-job-status-error-package-exists.json20
-rw-r--r--asdc-controller/src/test/resources/resource-examples/vgw/etsi-catalog-package-onboading-job-status-error.json20
-rw-r--r--asdc-controller/src/test/resources/resource-examples/vgw/etsi-catalog-package-onboading-job-status-successful.json27
-rw-r--r--asdc-controller/src/test/resources/resource-examples/vgw/service-Vgwservicev1-csar.csarbin121635 -> 0 bytes
-rw-r--r--asdc-controller/src/test/resources/schema.sql9
34 files changed, 1414 insertions, 146 deletions
diff --git a/asdc-controller/src/test/resources/application-test.yaml b/asdc-controller/src/test/resources/application-test.yaml
index 60cd2d9f2a..31ec987152 100644
--- a/asdc-controller/src/test/resources/application-test.yaml
+++ b/asdc-controller/src/test/resources/application-test.yaml
@@ -105,8 +105,4 @@ mso:
sdc:
endpoint: http://localhost:${wiremock.server.port}
-
-etsi-catalog-manager:
- endpoint: http://localhost:${wiremock.server.port}/api/catalog/v1
- rest:
- timeoutInSeconds: 5
+ \ No newline at end of file
diff --git a/asdc-controller/src/test/resources/download/service-Testserviceforpnf-csar.csar b/asdc-controller/src/test/resources/download/service-Testserviceforpnf-csar.csar
new file mode 100644
index 0000000000..d061012e62
--- /dev/null
+++ b/asdc-controller/src/test/resources/download/service-Testserviceforpnf-csar.csar
Binary files differ
diff --git a/asdc-controller/src/test/resources/resource-examples/service-BasicCnf/base_dummy.env b/asdc-controller/src/test/resources/resource-examples/service-BasicCnf/base_dummy.env
new file mode 100644
index 0000000000..df372ec349
--- /dev/null
+++ b/asdc-controller/src/test/resources/resource-examples/service-BasicCnf/base_dummy.env
@@ -0,0 +1,7 @@
+parameters:
+ dummy_flavor_name: "dummy.default"
+ dummy_image_name: "dummy"
+ dummy_name_0: "dummy_1_0"
+ vf_module_id: "PROVIDED_BY_ONAP"
+ vnf_id: "PROVIDED_BY_ONAP"
+ vnf_name: "PROVIDED_BY_ONAP"
diff --git a/asdc-controller/src/test/resources/resource-examples/service-BasicCnf/base_dummy.yaml b/asdc-controller/src/test/resources/resource-examples/service-BasicCnf/base_dummy.yaml
new file mode 100644
index 0000000000..8aeaf6f63d
--- /dev/null
+++ b/asdc-controller/src/test/resources/resource-examples/service-BasicCnf/base_dummy.yaml
@@ -0,0 +1,49 @@
+# #==================LICENSE_START==========================================
+# #
+# # Copyright (C) 2019 Intel Corporation
+# # SPDX-License-Identifier: Apache-2.0
+# #
+# #==================LICENSE_END============================================
+
+heat_template_version: 2016-10-14
+description: Heat template to deploy dummy VNF
+
+parameters:
+ dummy_name_0:
+ type: string
+ label: name of vm
+ description: Dummy name
+
+ vnf_id:
+ type: string
+ label: id of vnf
+ description: Provided by ONAP
+
+ vnf_name:
+ type: string
+ label: name of vnf
+ description: Provided by ONAP
+
+ vf_module_id:
+ type: string
+ label: vnf module id
+ description: Provided by ONAP
+
+ dummy_image_name:
+ type: string
+ label: Image name or ID
+ description: Dummy image name
+
+ dummy_flavor_name:
+ type: string
+ label: flavor
+ description: Dummy flavor
+
+resources:
+ dummy_0:
+ type: OS::Nova::Server
+ properties:
+ name: { get_param: dummy_name_0 }
+ image: { get_param: dummy_image_name }
+ flavor: { get_param: dummy_flavor_name }
+ metadata: { vnf_name: { get_param: vnf_name }, vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }} \ No newline at end of file
diff --git a/asdc-controller/src/test/resources/resource-examples/service-BasicCnf/basic_cnf0_modules.json b/asdc-controller/src/test/resources/resource-examples/service-BasicCnf/basic_cnf0_modules.json
new file mode 100644
index 0000000000..6789c2e72e
--- /dev/null
+++ b/asdc-controller/src/test/resources/resource-examples/service-BasicCnf/basic_cnf0_modules.json
@@ -0,0 +1,26 @@
+[
+ {
+ "vfModuleModelName": "BasicCnf..base_dummy..module-0",
+ "vfModuleModelInvariantUUID": "f7ed621b-54c7-4edd-978d-765a63de766e",
+ "vfModuleModelVersion": "1",
+ "vfModuleModelUUID": "32f3dd22-6eee-466a-87a5-0a8b6476c671",
+ "vfModuleModelCustomizationUUID": "164773f7-58a2-4e3b-b544-2348edbc7ddc",
+ "isBase": true,
+ "artifacts": [
+ "e11f9452-78b1-483e-9152-f516c712d04f",
+ "414774a4-e89e-4e14-bb6c-d9fd8755b9f4",
+ "98c46147-7d1e-48d6-8079-0e27df36d98d"
+ ],
+ "properties": {
+ "min_vf_module_instances": "1",
+ "vf_module_label": "base_dummy",
+ "max_vf_module_instances": "1",
+ "vfc_list": "",
+ "vf_module_type": "Base",
+ "vf_module_description": "",
+ "initial_count": "1",
+ "volume_group": "false",
+ "availability_zone_count": ""
+ }
+ }
+] \ No newline at end of file
diff --git a/asdc-controller/src/test/resources/resource-examples/service-BasicCnf/nginx_cloudtech_k8s_charts.env b/asdc-controller/src/test/resources/resource-examples/service-BasicCnf/nginx_cloudtech_k8s_charts.env
new file mode 100644
index 0000000000..9631d44c60
--- /dev/null
+++ b/asdc-controller/src/test/resources/resource-examples/service-BasicCnf/nginx_cloudtech_k8s_charts.env
@@ -0,0 +1 @@
+parameters:
diff --git a/asdc-controller/src/test/resources/resource-examples/service-BasicCnf/nginx_cloudtech_k8s_charts.tgz b/asdc-controller/src/test/resources/resource-examples/service-BasicCnf/nginx_cloudtech_k8s_charts.tgz
new file mode 100644
index 0000000000..2b274da294
--- /dev/null
+++ b/asdc-controller/src/test/resources/resource-examples/service-BasicCnf/nginx_cloudtech_k8s_charts.tgz
Binary files differ
diff --git a/asdc-controller/src/test/resources/resource-examples/service-BasicCnf/service-BasicCnf-csar.csar b/asdc-controller/src/test/resources/resource-examples/service-BasicCnf/service-BasicCnf-csar.csar
new file mode 100644
index 0000000000..c7388c9cc4
--- /dev/null
+++ b/asdc-controller/src/test/resources/resource-examples/service-BasicCnf/service-BasicCnf-csar.csar
Binary files differ
diff --git a/asdc-controller/src/test/resources/resource-examples/service-BasicCnf/service-BasicCnf-notification.json b/asdc-controller/src/test/resources/resource-examples/service-BasicCnf/service-BasicCnf-notification.json
new file mode 100644
index 0000000000..235eb03aec
--- /dev/null
+++ b/asdc-controller/src/test/resources/resource-examples/service-BasicCnf/service-BasicCnf-notification.json
@@ -0,0 +1,127 @@
+{
+ "distributionID": "2d6c5aa8-b644-4f30-a632-5577801ef955",
+ "serviceName": "basic_cnf",
+ "serviceVersion": "1.0",
+ "serviceUUID": "31e0cd50-0a84-42b4-a7a8-dd5d82e6907d",
+ "serviceDescription": "service",
+ "serviceInvariantUUID": "830857aa-604f-483b-a299-b63267698420",
+ "resources": [
+ {
+ "resourceInstanceName": "basic_cnf 0",
+ "resourceName": "basic_cnf",
+ "resourceVersion": "1.0",
+ "resoucreType": "VF",
+ "resourceUUID": "e41055ce-d879-44aa-b738-851be0dd9ca3",
+ "resourceInvariantUUID": "39ea5e7d-ce9c-4808-852c-7eee93016e4e",
+ "resourceCustomizationUUID": "bd0d1395-84c0-4bb3-956a-4b183f60754d",
+ "category": "Generic",
+ "subcategory": "Abstract",
+ "artifacts": [
+{
+ "artifactName": "basic_cnf0_modules.json",
+ "artifactType": "VF_MODULES_METADATA",
+ "artifactURL": "/basic_cnf0_modules.json",
+ "artifactChecksum": "MDJkYjNmNjEzM2Y1ZDgzNzZiZWUxMjZkMzA3YzkwZDI\u003d",
+ "artifactDescription": "Auto-generated VF Modules information artifact",
+ "artifactTimeout": 120,
+ "artifactUUID": "32f3dd22-6eee-466a-87a5-0a8b6476c671",
+ "artifactVersion": "1"
+ },
+
+
+{
+ "artifactName": "base_dummy.env",
+ "artifactType": "HEAT_ENV",
+ "artifactURL": "/base_dummy.env",
+ "artifactChecksum": "YzI4MjlkODk4YzcyOTgzZTg2YjAyM2ZiNWU1N2FmMjI\u003d",
+ "artifactDescription": "Auto-generated HEAT Environment deployment artifact",
+ "artifactTimeout": 120,
+ "artifactUUID": "e11f9452-78b1-483e-9152-f516c712d04f",
+ "artifactVersion": "2",
+ "generatedFromUUID": "12dcc618-20f2-4f15-ab00-c549b96b3910"
+ },
+{
+ "artifactName": "nginx_cloudtech_k8s_charts.env",
+ "artifactType": "HEAT_ENV",
+ "artifactURL": "/nginx_cloudtech_k8s_charts.env",
+ "artifactChecksum": "YzI4MjlkODk4YzcyOTgzZTg2YjAyM2ZiNWU1N2FmMjI\u003d",
+ "artifactDescription": "Auto-generated HEAT Environment deployment artifact",
+ "artifactTimeout": 120,
+ "artifactUUID": "414774a4-e89e-4e14-bb6c-d9fd8755b9f4",
+ "artifactVersion": "2",
+ "generatedFromUUID": "12dcc618-20f2-4f15-ab00-c549b96b3910"
+ },
+
+ {
+ "artifactName": "vf-license-model.xml",
+ "artifactType": "VF_LICENSE",
+ "artifactURL": "/vf-license-model.xml",
+ "artifactChecksum": "YjYyYWNiMzUxM2YzMWYxYWVhN2Y5MTM3N2E5YzNhNmU\u003d",
+ "artifactDescription": "VF license file",
+ "artifactTimeout": 120,
+ "artifactUUID": "5c29e823-7114-4988-824f-f670ba9d7b21",
+ "artifactVersion": "1"
+ },
+
+ {
+ "artifactName": "nginx_cloudtech_k8s_charts.tgz",
+ "artifactType": "CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACT",
+ "artifactURL": "/nginx_cloudtech_k8s_charts.tgz",
+ "artifactChecksum": "YjYyYWNiMzUxM2YzMWYxYWVhN2Y5MTM3N2E5YzNhNmU\u003d",
+ "artifactDescription": "VF license file",
+ "artifactTimeout": 120,
+ "artifactUUID": "98c46147-7d1e-48d6-8079-0e27df36d98d",
+ "artifactVersion": "1"
+ },
+{
+ "artifactName": "vendor-license-model.xml",
+ "artifactType": "VENDOR_LICENSE",
+ "artifactURL": "/vendor-license-model.xml",
+ "artifactChecksum": "OTRkOTY3YjdjM2ZlNDM3NjNlZjBjODU4YTJmNGZhNGE\u003d",
+ "artifactDescription": " Vendor license file",
+ "artifactTimeout": 120,
+ "artifactUUID": "74c4d1bd-1779-421f-8c9d-774ac4567031",
+ "artifactVersion": "1"
+ },
+ {
+ "artifactName": "base_dummy.yaml",
+ "artifactType": "HEAT",
+ "artifactURL": "/base_dummy.yaml",
+ "artifactChecksum": "NWU2NGUwNmNkMGEzYjAxMTAyODkzNTc5YzFmZDBmMzM\u003d",
+ "artifactDescription": "created from csar",
+ "artifactTimeout": 120,
+ "artifactUUID": "fdb0d678-10f5-4ff0-a1b4-36bc01a012d7",
+ "artifactVersion": "2"
+ }
+
+
+
+ ]
+ }
+
+
+ ],
+ "serviceArtifacts": [
+ {
+ "artifactName": "service-BasicCnf-template.yml",
+ "artifactType": "TOSCA_TEMPLATE",
+ "artifactURL": "/service-BasicCnf-template.yml",
+ "artifactChecksum": "NTUzMDU5YzM3MTk4OGNiNjQ2OGRlMWY2YjU3MjE2YjM\u003d",
+ "artifactDescription": "TOSCA representation of the asset",
+ "artifactTimeout": 0,
+ "artifactUUID": "2617d0ca-54f0-4222-b659-c12e292d94dd",
+ "artifactVersion": "1"
+ },
+ {
+ "artifactName": "service-BasicCnf-csar.csar",
+ "artifactType": "TOSCA_CSAR",
+ "artifactURL": "/service-BasicCnf-csar.csar",
+ "artifactChecksum": "ZTRhOGI0M2UxN2ZhYjQ0ODI5ZDZhZTExZTFkMGU3N2Y\u003d",
+ "artifactDescription": "TOSCA definition package of the asset",
+ "artifactTimeout": 0,
+ "artifactUUID": "31e0cd50-0a84-42b4-a7a8-dd5d82e6907d",
+ "artifactVersion": "1"
+ }
+ ],
+ "workloadContext": "Production"
+}
diff --git a/asdc-controller/src/test/resources/resource-examples/service-BasicCnf/service-BasicCnf-template.yml b/asdc-controller/src/test/resources/resource-examples/service-BasicCnf/service-BasicCnf-template.yml
new file mode 100644
index 0000000000..1c342ba7cb
--- /dev/null
+++ b/asdc-controller/src/test/resources/resource-examples/service-BasicCnf/service-BasicCnf-template.yml
@@ -0,0 +1,352 @@
+tosca_definitions_version: tosca_simple_yaml_1_1
+metadata:
+ invariantUUID: 830857aa-604f-483b-a299-b63267698420
+ UUID: 31e0cd50-0a84-42b4-a7a8-dd5d82e6907d
+ name: basic_cnf
+ description: service
+ type: Service
+ category: Network Service
+ serviceType: ''
+ serviceRole: ''
+ instantiationType: A-la-carte
+ serviceEcompNaming: 'true'
+ ecompGeneratedNaming: 'true'
+ namingPolicy: ''
+ environmentContext: General_Revenue-Bearing
+ serviceFunction: ''
+imports:
+- nodes:
+ file: nodes.yml
+- datatypes:
+ file: data.yml
+- capabilities:
+ file: capabilities.yml
+- relationships:
+ file: relationships.yml
+- groups:
+ file: groups.yml
+- policies:
+ file: policies.yml
+- annotations:
+ file: annotations.yml
+- service-basic_cnf-interface:
+ file: service-BasicCnf-template-interface.yml
+- resource-basic_cnf:
+ file: resource-BasicCnf-template.yml
+- resource-basic_cnf-interface:
+ file: resource-BasicCnf-template-interface.yml
+topology_template:
+ inputs:
+ skip_post_instantiation_configuration:
+ default: true
+ type: boolean
+ required: false
+ controller_actor:
+ default: SO-REF-DATA
+ type: string
+ required: false
+ cds_model_version:
+ type: string
+ required: false
+ cds_model_name:
+ type: string
+ required: false
+ default_software_version:
+ type: string
+ required: false
+ node_templates:
+ basic_cnf 0:
+ type: org.openecomp.resource.vf.BasicCnf
+ metadata:
+ invariantUUID: 39ea5e7d-ce9c-4808-852c-7eee93016e4e
+ UUID: e41055ce-d879-44aa-b738-851be0dd9ca3
+ customizationUUID: bd0d1395-84c0-4bb3-956a-4b183f60754d
+ version: '1.0'
+ name: basic_cnf
+ description: VF
+ type: VF
+ category: Generic
+ subcategory: Abstract
+ resourceVendor: basicnf_vendor
+ resourceVendorRelease: '1.0'
+ resourceVendorModelNumber: ''
+ properties:
+ vf_module_id: PROVIDED_BY_ONAP
+ skip_post_instantiation_configuration: true
+ nf_naming:
+ ecomp_generated_naming: true
+ multi_stage_design: false
+ controller_actor: SO-REF-DATA
+ availability_zone_max_count: 1
+ vnf_id: PROVIDED_BY_ONAP
+ dummy_image_name: dummy
+ vnf_name: PROVIDED_BY_ONAP
+ dummy_name_0: dummy_1_0
+ dummy_flavor_name: dummy.default
+ capabilities:
+ abstract_dummy.cpu_dummy:
+ properties:
+ name: cpu
+ abstract_dummy.disk.device.read.requests.rate_dummy:
+ properties:
+ name: disk.device.read.requests.rate
+ abstract_dummy.disk.capacity_dummy:
+ properties:
+ name: disk.capacity
+ abstract_dummy.disk.write.bytes.rate_dummy:
+ properties:
+ name: disk.write.bytes.rate
+ abstract_dummy.disk.usage_dummy:
+ properties:
+ name: disk.usage
+ abstract_dummy.disk.latency_dummy:
+ properties:
+ name: disk.latency
+ abstract_dummy.endpoint_dummy:
+ properties:
+ secure: true
+ abstract_dummy.disk.allocation_dummy:
+ properties:
+ name: disk.allocation
+ abstract_dummy.memory.usage_dummy:
+ properties:
+ name: memory.usage
+ abstract_dummy.disk.device.iops_dummy:
+ properties:
+ name: disk.device.iops
+ abstract_dummy.disk.root.size_dummy:
+ properties:
+ name: disk.root.size
+ abstract_dummy.disk.read.bytes_dummy:
+ properties:
+ name: disk.read.bytes
+ abstract_dummy.disk.device.latency_dummy:
+ properties:
+ name: disk.device.latency
+ abstract_dummy.disk.iops_dummy:
+ properties:
+ name: disk.iops
+ abstract_dummy.vcpus_dummy:
+ properties:
+ name: vcpus
+ abstract_dummy.disk.device.allocation_dummy:
+ properties:
+ name: disk.device.allocation
+ abstract_dummy.disk.device.read.requests_dummy:
+ properties:
+ name: disk.device.read.requests
+ abstract_dummy.disk.device.read.bytes.rate_dummy:
+ properties:
+ name: disk.device.read.bytes.rate
+ abstract_dummy.instance_dummy:
+ properties:
+ name: instance
+ abstract_dummy.cpu_util_dummy:
+ properties:
+ name: cpu_util
+ abstract_dummy.memory_dummy:
+ properties:
+ name: memory
+ abstract_dummy.disk.device.write.bytes.rate_dummy:
+ properties:
+ name: disk.device.write.bytes.rate
+ abstract_dummy.disk.device.write.requests_dummy:
+ properties:
+ name: disk.device.write.requests
+ abstract_dummy.disk.write.requests_dummy:
+ properties:
+ name: disk.write.requests
+ abstract_dummy.disk.device.write.requests.rate_dummy:
+ properties:
+ name: disk.device.write.requests.rate
+ abstract_dummy.disk.device.usage_dummy:
+ properties:
+ name: disk.device.usage
+ abstract_dummy.disk.device.read.bytes_dummy:
+ properties:
+ name: disk.device.read.bytes
+ abstract_dummy.disk.device.capacity_dummy:
+ properties:
+ name: disk.device.capacity
+ abstract_dummy.disk.read.bytes.rate_dummy:
+ properties:
+ name: disk.read.bytes.rate
+ abstract_dummy.disk.device.write.bytes_dummy:
+ properties:
+ name: disk.device.write.bytes
+ abstract_dummy.disk.read.requests_dummy:
+ properties:
+ name: disk.read.requests
+ abstract_dummy.disk.write.requests.rate_dummy:
+ properties:
+ name: disk.write.requests.rate
+ abstract_dummy.memory.resident_dummy:
+ properties:
+ name: memory.resident
+ abstract_dummy.disk.write.bytes_dummy:
+ properties:
+ name: disk.write.bytes
+ abstract_dummy.disk.ephemeral.size_dummy:
+ properties:
+ name: disk.ephemeral.size
+ abstract_dummy.cpu.delta_dummy:
+ properties:
+ name: cpu.delta
+ abstract_dummy.scalable_dummy:
+ properties:
+ min_instances: 1
+ max_instances: 1
+ groups:
+ basic_cnf0..BasicCnf..base_dummy..module-0:
+ type: org.openecomp.groups.VfModule
+ metadata:
+ vfModuleModelName: BasicCnf..base_dummy..module-0
+ vfModuleModelInvariantUUID: f7ed621b-54c7-4edd-978d-765a63de766e
+ vfModuleModelUUID: 32f3dd22-6eee-466a-87a5-0a8b6476c671
+ vfModuleModelVersion: '1'
+ vfModuleModelCustomizationUUID: 164773f7-58a2-4e3b-b544-2348edbc7ddc
+ properties:
+ min_vf_module_instances: 1
+ vf_module_label: base_dummy
+ max_vf_module_instances: 1
+ vf_module_type: Base
+ isBase: true
+ initial_count: 1
+ volume_group: false
+ substitution_mappings:
+ node_type: org.openecomp.service.BasicCnf
+ capabilities:
+ basic_cnf0.abstract_dummy.disk.device.read.requests.rate_dummy:
+ - basic_cnf 0
+ - abstract_dummy.disk.device.read.requests.rate_dummy
+ basic_cnf0.abstract_dummy.disk.latency_dummy:
+ - basic_cnf 0
+ - abstract_dummy.disk.latency_dummy
+ basic_cnf0.abstract_dummy.disk.device.latency_dummy:
+ - basic_cnf 0
+ - abstract_dummy.disk.device.latency_dummy
+ basic_cnf0.abstract_dummy.disk.write.requests.rate_dummy:
+ - basic_cnf 0
+ - abstract_dummy.disk.write.requests.rate_dummy
+ basic_cnf0.abstract_dummy.disk.ephemeral.size_dummy:
+ - basic_cnf 0
+ - abstract_dummy.disk.ephemeral.size_dummy
+ basic_cnf0.abstract_dummy.disk.device.write.requests.rate_dummy:
+ - basic_cnf 0
+ - abstract_dummy.disk.device.write.requests.rate_dummy
+ basic_cnf0.abstract_dummy.disk.iops_dummy:
+ - basic_cnf 0
+ - abstract_dummy.disk.iops_dummy
+ basic_cnf0.abstract_dummy.disk.read.requests_dummy:
+ - basic_cnf 0
+ - abstract_dummy.disk.read.requests_dummy
+ basic_cnf0.abstract_dummy.memory_dummy:
+ - basic_cnf 0
+ - abstract_dummy.memory_dummy
+ basic_cnf0.abstract_dummy.disk.device.read.requests_dummy:
+ - basic_cnf 0
+ - abstract_dummy.disk.device.read.requests_dummy
+ basic_cnf0.abstract_dummy.host_dummy:
+ - basic_cnf 0
+ - abstract_dummy.host_dummy
+ basic_cnf0.abstract_dummy.disk.read.bytes_dummy:
+ - basic_cnf 0
+ - abstract_dummy.disk.read.bytes_dummy
+ basic_cnf0.abstract_dummy.cpu_util_dummy:
+ - basic_cnf 0
+ - abstract_dummy.cpu_util_dummy
+ basic_cnf0.abstract_dummy.disk.write.bytes.rate_dummy:
+ - basic_cnf 0
+ - abstract_dummy.disk.write.bytes.rate_dummy
+ basic_cnf0.abstract_dummy.disk.allocation_dummy:
+ - basic_cnf 0
+ - abstract_dummy.disk.allocation_dummy
+ basic_cnf0.abstract_dummy.instance_dummy:
+ - basic_cnf 0
+ - abstract_dummy.instance_dummy
+ basic_cnf0.abstract_dummy.binding_dummy:
+ - basic_cnf 0
+ - abstract_dummy.binding_dummy
+ basic_cnf0.abstract_dummy.disk.root.size_dummy:
+ - basic_cnf 0
+ - abstract_dummy.disk.root.size_dummy
+ basic_cnf0.abstract_dummy.disk.write.requests_dummy:
+ - basic_cnf 0
+ - abstract_dummy.disk.write.requests_dummy
+ basic_cnf0.abstract_dummy.vcpus_dummy:
+ - basic_cnf 0
+ - abstract_dummy.vcpus_dummy
+ basic_cnf0.abstract_dummy.disk.read.bytes.rate_dummy:
+ - basic_cnf 0
+ - abstract_dummy.disk.read.bytes.rate_dummy
+ basic_cnf0.abstract_dummy.cpu_dummy:
+ - basic_cnf 0
+ - abstract_dummy.cpu_dummy
+ basic_cnf0.abstract_dummy.disk.device.allocation_dummy:
+ - basic_cnf 0
+ - abstract_dummy.disk.device.allocation_dummy
+ basic_cnf0.abstract_dummy.disk.device.usage_dummy:
+ - basic_cnf 0
+ - abstract_dummy.disk.device.usage_dummy
+ basic_cnf0.abstract_dummy.disk.device.read.bytes.rate_dummy:
+ - basic_cnf 0
+ - abstract_dummy.disk.device.read.bytes.rate_dummy
+ basic_cnf0.abstract_dummy.cpu.delta_dummy:
+ - basic_cnf 0
+ - abstract_dummy.cpu.delta_dummy
+ basic_cnf0.abstract_dummy.disk.usage_dummy:
+ - basic_cnf 0
+ - abstract_dummy.disk.usage_dummy
+ basic_cnf0.abstract_dummy.disk.capacity_dummy:
+ - basic_cnf 0
+ - abstract_dummy.disk.capacity_dummy
+ basic_cnf0.abstract_dummy.memory.usage_dummy:
+ - basic_cnf 0
+ - abstract_dummy.memory.usage_dummy
+ basic_cnf0.abstract_dummy.endpoint_dummy:
+ - basic_cnf 0
+ - abstract_dummy.endpoint_dummy
+ basic_cnf0.abstract_dummy.disk.device.capacity_dummy:
+ - basic_cnf 0
+ - abstract_dummy.disk.device.capacity_dummy
+ basic_cnf0.abstract_dummy.os_dummy:
+ - basic_cnf 0
+ - abstract_dummy.os_dummy
+ basic_cnf0.abstract_dummy.memory.resident_dummy:
+ - basic_cnf 0
+ - abstract_dummy.memory.resident_dummy
+ basic_cnf0.abstract_dummy.disk.write.bytes_dummy:
+ - basic_cnf 0
+ - abstract_dummy.disk.write.bytes_dummy
+ basic_cnf0.abstract_dummy.scalable_dummy:
+ - basic_cnf 0
+ - abstract_dummy.scalable_dummy
+ basic_cnf0.abstract_dummy.disk.device.read.bytes_dummy:
+ - basic_cnf 0
+ - abstract_dummy.disk.device.read.bytes_dummy
+ basic_cnf0.abstract_dummy.disk.device.write.requests_dummy:
+ - basic_cnf 0
+ - abstract_dummy.disk.device.write.requests_dummy
+ basic_cnf0.abstract_dummy.disk.device.write.bytes_dummy:
+ - basic_cnf 0
+ - abstract_dummy.disk.device.write.bytes_dummy
+ basic_cnf0.abstract_dummy.feature_dummy:
+ - basic_cnf 0
+ - abstract_dummy.feature_dummy
+ basic_cnf0.abstract_dummy.disk.device.iops_dummy:
+ - basic_cnf 0
+ - abstract_dummy.disk.device.iops_dummy
+ basic_cnf0.abstract_dummy.disk.device.write.bytes.rate_dummy:
+ - basic_cnf 0
+ - abstract_dummy.disk.device.write.bytes.rate_dummy
+ properties:
+ skip_post_instantiation_configuration:
+ - skip_post_instantiation_configuration
+ controller_actor:
+ - controller_actor
+ cds_model_version:
+ - cds_model_version
+ cds_model_name:
+ - cds_model_name
+ default_software_version:
+ - default_software_version
diff --git a/asdc-controller/src/test/resources/resource-examples/service-BasicCnf/vendor-license-model.xml b/asdc-controller/src/test/resources/resource-examples/service-BasicCnf/vendor-license-model.xml
new file mode 100644
index 0000000000..9fef0445ec
--- /dev/null
+++ b/asdc-controller/src/test/resources/resource-examples/service-BasicCnf/vendor-license-model.xml
@@ -0,0 +1 @@
+<vendor-license-model xmlns="http://xmlns.openecomp.org/asdc/license-model/1.0"><vendor-name>basicnf_vendor</vendor-name><entitlement-pool-list/><license-key-group-list/></vendor-license-model> \ No newline at end of file
diff --git a/asdc-controller/src/test/resources/resource-examples/service-BasicCnf/vf-license-model.xml b/asdc-controller/src/test/resources/resource-examples/service-BasicCnf/vf-license-model.xml
new file mode 100644
index 0000000000..7cd759344e
--- /dev/null
+++ b/asdc-controller/src/test/resources/resource-examples/service-BasicCnf/vf-license-model.xml
@@ -0,0 +1 @@
+<vf-license-model xmlns="http://xmlns.openecomp.org/asdc/license-model/1.0"><vendor-name>basicnf_vendor</vendor-name><vf-id>c96ff9c334a144c7bb952d5753fabaec</vf-id><feature-group-list/></vf-license-model> \ No newline at end of file
diff --git a/asdc-controller/src/test/resources/resource-examples/service-BasicNetwork/service-BasicNetwork-csar.csar b/asdc-controller/src/test/resources/resource-examples/service-BasicNetwork/service-BasicNetwork-csar.csar
new file mode 100644
index 0000000000..a5bc909ca4
--- /dev/null
+++ b/asdc-controller/src/test/resources/resource-examples/service-BasicNetwork/service-BasicNetwork-csar.csar
Binary files differ
diff --git a/asdc-controller/src/test/resources/resource-examples/service-BasicNetwork/service-BasicNetwork-notification.json b/asdc-controller/src/test/resources/resource-examples/service-BasicNetwork/service-BasicNetwork-notification.json
new file mode 100644
index 0000000000..8cc6654fcc
--- /dev/null
+++ b/asdc-controller/src/test/resources/resource-examples/service-BasicNetwork/service-BasicNetwork-notification.json
@@ -0,0 +1,47 @@
+{
+ "distributionID": "2d6c5aa8-b644-4f30-a632-5577801ef957",
+ "serviceName": "basic_network",
+ "serviceVersion": "1.0",
+ "serviceUUID": "9ff42123-ff24-41dc-9f41-a956c9328699",
+ "serviceDescription": "service",
+ "serviceInvariantUUID": "26b9c145-524a-4e30-8864-ad1ff7342bf4",
+ "resources": [
+ {
+ "resourceInstanceName": "GenericNeutronNet 0",
+ "resourceName": "GenericNeutronNet",
+ "resourceVersion": "1.0",
+ "resoucreType": "VL",
+ "resourceUUID": "73670f4b-f10b-4f37-9bf0-79600ec86730",
+ "resourceInvariantUUID": "7c0b578e-6594-4213-be8b-aa6c7ae50853",
+ "resourceCustomizationUUID": "fc59df65-4914-4817-b525-5565b8e66ce0",
+ "category": "Generic",
+ "subcategory": "Network Elements",
+ "artifacts": [ ]
+ }
+
+
+ ],
+ "serviceArtifacts": [
+ {
+ "artifactName": "service-BasicNetwork-template.yml",
+ "artifactType": "TOSCA_TEMPLATE",
+ "artifactURL": "/service-BasicNetwork-template.yml",
+ "artifactChecksum": "NTUzMDU5YzM3MTk4OGNiNjQ2OGRlMWY2YjU3MjE2YjM\u003d",
+ "artifactDescription": "TOSCA representation of the asset",
+ "artifactTimeout": 0,
+ "artifactUUID": "9ff42123-ff24-41dc-9f41-a956c9328699",
+ "artifactVersion": "1"
+ },
+ {
+ "artifactName": "service-BasicNetwork-csar.csar",
+ "artifactType": "TOSCA_CSAR",
+ "artifactURL": "/service-BasicNetwork-csar.csar",
+ "artifactChecksum": "ZTRhOGI0M2UxN2ZhYjQ0ODI5ZDZhZTExZTFkMGU3N2Y\u003d",
+ "artifactDescription": "TOSCA definition package of the asset",
+ "artifactTimeout": 0,
+ "artifactUUID": "9ff42123-ff24-41dc-9f41-a956c9328699",
+ "artifactVersion": "1"
+ }
+ ],
+ "workloadContext": "Production"
+}
diff --git a/asdc-controller/src/test/resources/resource-examples/service-BasicNetwork/service-BasicNetwork-template.yml b/asdc-controller/src/test/resources/resource-examples/service-BasicNetwork/service-BasicNetwork-template.yml
new file mode 100644
index 0000000000..89204f47a2
--- /dev/null
+++ b/asdc-controller/src/test/resources/resource-examples/service-BasicNetwork/service-BasicNetwork-template.yml
@@ -0,0 +1,112 @@
+tosca_definitions_version: tosca_simple_yaml_1_1
+metadata:
+ invariantUUID: 26b9c145-524a-4e30-8864-ad1ff7342bf4
+ UUID: 9ff42123-ff24-41dc-9f41-a956c9328699
+ name: basic_network
+ description: service
+ type: Service
+ category: Network Service
+ serviceType: ''
+ serviceRole: ''
+ instantiationType: A-la-carte
+ serviceEcompNaming: 'true'
+ ecompGeneratedNaming: 'true'
+ namingPolicy: ''
+ environmentContext: General_Revenue-Bearing
+ serviceFunction: ''
+imports:
+- nodes:
+ file: nodes.yml
+- datatypes:
+ file: data.yml
+- capabilities:
+ file: capabilities.yml
+- relationships:
+ file: relationships.yml
+- groups:
+ file: groups.yml
+- policies:
+ file: policies.yml
+- annotations:
+ file: annotations.yml
+- service-basic_network-interface:
+ file: service-BasicNetwork-template-interface.yml
+- resource-Generic NeutronNet:
+ file: resource-GenericNeutronnet-template.yml
+- resource-ExtVL:
+ file: resource-Extvl-template.yml
+topology_template:
+ inputs:
+ skip_post_instantiation_configuration:
+ default: true
+ type: boolean
+ required: false
+ controller_actor:
+ default: SO-REF-DATA
+ type: string
+ required: false
+ cds_model_version:
+ type: string
+ required: false
+ cds_model_name:
+ type: string
+ required: false
+ default_software_version:
+ type: string
+ required: false
+ node_templates:
+ Generic NeutronNet 0:
+ type: org.openecomp.resource.vl.GenericNeutronNet
+ metadata:
+ invariantUUID: 7c0b578e-6594-4213-be8b-aa6c7ae50853
+ UUID: 73670f4b-f10b-4f37-9bf0-79600ec86730
+ customizationUUID: fc59df65-4914-4817-b525-5565b8e66ce0
+ version: '1.0'
+ name: Generic NeutronNet
+ description: Generic NeutronNet
+ type: VL
+ category: Generic
+ subcategory: Network Elements
+ resourceVendor: ONAP (Tosca)
+ resourceVendorRelease: 1.0.0.wd03
+ resourceVendorModelNumber: ''
+ properties:
+ network_assignments:
+ is_external_network: false
+ is_trunked: false
+ ipv4_subnet_default_assignment:
+ min_subnets_count: 1
+ ecomp_generated_network_assignment: false
+ ipv6_subnet_default_assignment:
+ min_subnets_count: 1
+ exVL_naming:
+ ecomp_generated_naming: true
+ network_flows:
+ is_network_policy: false
+ is_bound_to_vpn: false
+ network_ecomp_naming:
+ ecomp_generated_naming: true
+ network_type: NEUTRON
+ network_technology: NEUTRON
+ network_homing:
+ ecomp_selected_instance_node_target: false
+ substitution_mappings:
+ node_type: org.openecomp.service.BasicNetwork
+ capabilities:
+ genericneutronnet0.feature:
+ - Generic NeutronNet 0
+ - feature
+ genericneutronnet0.virtual_linkable:
+ - Generic NeutronNet 0
+ - virtual_linkable
+ properties:
+ skip_post_instantiation_configuration:
+ - skip_post_instantiation_configuration
+ controller_actor:
+ - controller_actor
+ cds_model_version:
+ - cds_model_version
+ cds_model_name:
+ - cds_model_name
+ default_software_version:
+ - default_software_version
diff --git a/asdc-controller/src/test/resources/resource-examples/service-ubuntu16test/base_ubuntu16.env b/asdc-controller/src/test/resources/resource-examples/service-ubuntu16test/base_ubuntu16.env
new file mode 100644
index 0000000000..b868a4b318
--- /dev/null
+++ b/asdc-controller/src/test/resources/resource-examples/service-ubuntu16test/base_ubuntu16.env
@@ -0,0 +1,10 @@
+parameters:
+ admin_plane_net_name: "admin"
+ ubuntu16_flavor_name: "onap.small"
+ ubuntu16_image_name: "ubuntu-16.04-daily"
+ ubuntu16_key_name: "cleouverte"
+ ubuntu16_name_0: "ubuntu16"
+ ubuntu16_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDY15cdBmIs2XOpe4EiFCsaY6bmUmK/GysMoLl4UG51JCfJwvwoWCoA+6mDIbymZxhxq9IGxilp/yTA6WQ9s/5pBag1cUMJmFuda9PjOkXl04jgqh5tR6I+GZ97AvCg93KAECis5ubSqw1xOCj4utfEUtPoF1OuzqM/lE5mY4N6VKXn+fT7pCD6cifBEs6JHhVNvs5OLLp/tO8Pa3kKYQOdyS0xc3rh+t2lrzvKUSWGZbX+dLiFiEpjsUL3tDqzkEMNUn4pdv69OJuzWHCxRWPfdrY9Wg0j3mJesP29EBht+w+EC9/kBKq+1VKdmsXUXAcjEvjovVL8l1BrX3BY0R8D imported-openssh-key"
+ vf_module_id: "Ubuntu16-VF-module"
+ vnf_id: "Ubuntu16-VNF"
+ vnf_name: "Ubuntu16-VNF-name"
diff --git a/asdc-controller/src/test/resources/resource-examples/service-ubuntu16test/base_ubuntu16.yaml b/asdc-controller/src/test/resources/resource-examples/service-ubuntu16test/base_ubuntu16.yaml
new file mode 100644
index 0000000000..e89fd6f1b1
--- /dev/null
+++ b/asdc-controller/src/test/resources/resource-examples/service-ubuntu16test/base_ubuntu16.yaml
@@ -0,0 +1,106 @@
+heat_template_version: 2013-05-23
+
+description: Heat template to deploy a ubuntu16 VM
+
+parameters:
+ # Metadata required by ONAP
+ vnf_name:
+ type: string
+ label: VM name
+ description: The VM name
+ vnf_id:
+ type: string
+ label: VNF ID
+ description: The VNF ID is provided by ONAP
+ vf_module_id:
+ type: string
+ label: VF module ID
+ description: The VF Module ID is provided by ONAP
+
+# Server parameters, naming required by ONAP
+ ubuntu16_image_name:
+ type: string
+ label: Image name or ID
+ description: Image to be used for compute instance
+ ubuntu16_flavor_name:
+ type: string
+ label: Flavor
+ description: Type of instance (flavor) to be used
+ ubuntu16_key_name:
+ type: string
+ label: openSSH Key name
+ description: openSSH key name
+ ubuntu16_pub_key:
+ type: string
+ label: Public key
+ description: Public key to be installed on the compute instance
+ ubuntu16_name_0:
+ type: string
+ label: VM name
+ description: The VM name
+
+# Network parameters, naming required by ONAP
+ admin_plane_net_name:
+ type: string
+ label: management network
+ description: The external management network
+
+resources:
+ random-str:
+ type: OS::Heat::RandomString
+ properties:
+ length: 4
+
+ ubuntu16_instantiated_key_name:
+ type: OS::Nova::KeyPair
+ properties:
+ name:
+ str_replace:
+ template: base_rand
+ params:
+ base: { get_param: ubuntu16_key_name }
+ rand: { get_resource: random-str }
+ public_key: { get_param: ubuntu16_pub_key }
+ save_private_key: false
+
+ ubuntu16_admin_security_group:
+ type: OS::Neutron::SecurityGroup
+ properties:
+ description: security group
+ name: ubuntu16_admin_security_group
+ rules: [
+ {remote_ip_prefix: 0.0.0.0/0, protocol: tcp, port_range_min: 22, port_range_max: 22},
+ {remote_ip_prefix: 0.0.0.0/0, protocol: icmp}]
+
+ ubuntu16_0_admin_plane_port_0:
+ type: OS::Neutron::Port
+ properties:
+ name:
+ str_replace:
+ template: base_rand
+ params:
+ base: ubuntu16_0_admin_plane_port
+ rand: { get_resource: random-str }
+ network: { get_param: admin_plane_net_name }
+ security_groups: [{ get_resource: ubuntu16_admin_security_group }]
+
+ ubuntu16_VM_settings:
+ type: OS::Heat::SoftwareConfig
+ properties:
+ config: |
+ #!/bin/bash
+ sudo apt-get update
+
+ ubuntu16_server_0:
+ type: OS::Nova::Server
+ properties:
+ image: { get_param: ubuntu16_image_name }
+ flavor: { get_param: ubuntu16_flavor_name }
+ name: { get_param: ubuntu16_name_0 }
+ metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }, vnf_name: { get_param: vnf_name }}
+ key_name: { get_resource: ubuntu16_instantiated_key_name }
+ networks:
+ - port: { get_resource: ubuntu16_0_admin_plane_port_0 }
+ user_data_format: RAW
+ user_data:
+ get_resource: ubuntu16_VM_settings
diff --git a/asdc-controller/src/test/resources/resource-examples/service-ubuntu16test/service-Ubuntu16test-csar.csar b/asdc-controller/src/test/resources/resource-examples/service-ubuntu16test/service-Ubuntu16test-csar.csar
new file mode 100644
index 0000000000..8e992e2e66
--- /dev/null
+++ b/asdc-controller/src/test/resources/resource-examples/service-ubuntu16test/service-Ubuntu16test-csar.csar
Binary files differ
diff --git a/asdc-controller/src/test/resources/resource-examples/service-ubuntu16test/service-Ubuntu16test-template.yml b/asdc-controller/src/test/resources/resource-examples/service-ubuntu16test/service-Ubuntu16test-template.yml
new file mode 100644
index 0000000000..65bc7252fa
--- /dev/null
+++ b/asdc-controller/src/test/resources/resource-examples/service-ubuntu16test/service-Ubuntu16test-template.yml
@@ -0,0 +1,429 @@
+tosca_definitions_version: tosca_simple_yaml_1_1
+metadata:
+ invariantUUID: 941b713e-4ba0-47c9-bfaf-611168cbf7d1
+ UUID: ed0391da-b963-4c45-bf3a-b49cc7a94fab
+ name: ubuntu16test
+ description: service
+ type: Service
+ category: Network Service
+ serviceType: ''
+ serviceRole: ''
+ instantiationType: A-la-carte
+ serviceEcompNaming: 'true'
+ ecompGeneratedNaming: 'true'
+ namingPolicy: ''
+ environmentContext: General_Revenue-Bearing
+ serviceFunction: ''
+imports:
+- nodes:
+ file: nodes.yml
+- datatypes:
+ file: data.yml
+- capabilities:
+ file: capabilities.yml
+- relationships:
+ file: relationships.yml
+- groups:
+ file: groups.yml
+- policies:
+ file: policies.yml
+- annotations:
+ file: annotations.yml
+- service-ubuntu16test-interface:
+ file: service-Ubuntu16test-template-interface.yml
+- resource-ubuntu16test:
+ file: resource-Ubuntu16test-template.yml
+- resource-ubuntu16test-interface:
+ file: resource-Ubuntu16test-template-interface.yml
+- resource-SecurityRules:
+ file: resource-Securityrules-template.yml
+topology_template:
+ inputs:
+ skip_post_instantiation_configuration:
+ default: true
+ type: boolean
+ required: false
+ controller_actor:
+ default: SO-REF-DATA
+ type: string
+ required: false
+ cds_model_version:
+ type: string
+ required: false
+ cds_model_name:
+ type: string
+ required: false
+ default_software_version:
+ type: string
+ required: false
+ node_templates:
+ ubuntu16test 0:
+ type: org.openecomp.resource.vf.Ubuntu16test
+ metadata:
+ invariantUUID: 72ce1922-0359-4079-a76e-f3f1b6cf8cc1
+ UUID: e6afd1be-ee4f-439d-bd79-d559c626fd27
+ customizationUUID: 1b2bf1c7-25a5-48df-bf30-7ae43508a5ea
+ version: '1.0'
+ name: ubuntu16test
+ description: VF
+ type: VF
+ category: Generic
+ subcategory: Abstract
+ resourceVendor: basicvm_vendor
+ resourceVendorRelease: '1.0'
+ resourceVendorModelNumber: ''
+ properties:
+ vf_module_id: Ubuntu16-VF-module
+ skip_post_instantiation_configuration: true
+ nf_naming:
+ ecomp_generated_naming: true
+ ubuntu16_flavor_name: onap.small
+ multi_stage_design: false
+ controller_actor: SO-REF-DATA
+ availability_zone_max_count: 1
+ vnf_name: Ubuntu16-VNF-name
+ ubuntu16_name_0: ubuntu16
+ ubuntu16_pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDY15cdBmIs2XOpe4EiFCsaY6bmUmK/GysMoLl4UG51JCfJwvwoWCoA+6mDIbymZxhxq9IGxilp/yTA6WQ9s/5pBag1cUMJmFuda9PjOkXl04jgqh5tR6I+GZ97AvCg93KAECis5ubSqw1xOCj4utfEUtPoF1OuzqM/lE5mY4N6VKXn+fT7pCD6cifBEs6JHhVNvs5OLLp/tO8Pa3kKYQOdyS0xc3rh+t2lrzvKUSWGZbX+dLiFiEpjsUL3tDqzkEMNUn4pdv69OJuzWHCxRWPfdrY9Wg0j3mJesP29EBht+w+EC9/kBKq+1VKdmsXUXAcjEvjovVL8l1BrX3BY0R8D imported-openssh-key
+ vnf_id: Ubuntu16-VNF
+ ubuntu16_image_name: ubuntu-16.04-daily
+ admin_plane_net_name: admin
+ ubuntu16_key_name: cleouverte
+ capabilities:
+ abstract_ubuntu16.cpu_util_ubuntu16:
+ properties:
+ name: cpu_util
+ abstract_ubuntu16.disk.device.read.bytes.rate_ubuntu16:
+ properties:
+ name: disk.device.read.bytes.rate
+ abstract_ubuntu16.endpoint_ubuntu16:
+ properties:
+ secure: true
+ abstract_ubuntu16.disk.ephemeral.size_ubuntu16:
+ properties:
+ name: disk.ephemeral.size
+ abstract_ubuntu16.network.incoming.packets_ubuntu16_ubuntu16_admin_plane_port_0:
+ properties:
+ name: network.incoming.packets
+ abstract_ubuntu16.disk.write.bytes_ubuntu16:
+ properties:
+ name: disk.write.bytes
+ abstract_ubuntu16.cpu.delta_ubuntu16:
+ properties:
+ name: cpu.delta
+ abstract_ubuntu16.network.incoming.bytes_ubuntu16_ubuntu16_admin_plane_port_0:
+ properties:
+ name: network.incoming.bytes
+ abstract_ubuntu16.network.outpoing.packets_ubuntu16_ubuntu16_admin_plane_port_0:
+ properties:
+ name: network.outpoing.packets
+ abstract_ubuntu16.disk.write.requests.rate_ubuntu16:
+ properties:
+ name: disk.write.requests.rate
+ abstract_ubuntu16.memory_ubuntu16:
+ properties:
+ name: memory
+ abstract_ubuntu16.network.incoming.bytes.rate_ubuntu16_ubuntu16_admin_plane_port_0:
+ properties:
+ name: network.incoming.bytes.rate
+ abstract_ubuntu16.disk.root.size_ubuntu16:
+ properties:
+ name: disk.root.size
+ abstract_ubuntu16.network.incoming.packets.rate_ubuntu16_ubuntu16_admin_plane_port_0:
+ properties:
+ name: network.incoming.packets.rate
+ abstract_ubuntu16.disk.device.usage_ubuntu16:
+ properties:
+ name: disk.device.usage
+ abstract_ubuntu16.disk.write.requests_ubuntu16:
+ properties:
+ name: disk.write.requests
+ abstract_ubuntu16.disk.device.read.bytes_ubuntu16:
+ properties:
+ name: disk.device.read.bytes
+ abstract_ubuntu16.vcpus_ubuntu16:
+ properties:
+ name: vcpus
+ abstract_ubuntu16.port_mirroring_ubuntu16_ubuntu16_admin_plane_port_0:
+ properties:
+ connection_point:
+ network_role:
+ get_input: port_ubuntu16_admin_plane_port_0_network_role
+ nfc_naming_code: ubuntu16
+ abstract_ubuntu16.disk.read.bytes_ubuntu16:
+ properties:
+ name: disk.read.bytes
+ abstract_ubuntu16.disk.latency_ubuntu16:
+ properties:
+ name: disk.latency
+ abstract_ubuntu16.disk.device.read.requests.rate_ubuntu16:
+ properties:
+ name: disk.device.read.requests.rate
+ abstract_ubuntu16.scalable_ubuntu16:
+ properties:
+ min_instances: 1
+ max_instances: 1
+ abstract_ubuntu16.disk.device.write.requests.rate_ubuntu16:
+ properties:
+ name: disk.device.write.requests.rate
+ abstract_ubuntu16.disk.device.allocation_ubuntu16:
+ properties:
+ name: disk.device.allocation
+ abstract_ubuntu16.disk.device.write.bytes_ubuntu16:
+ properties:
+ name: disk.device.write.bytes
+ abstract_ubuntu16.disk.device.capacity_ubuntu16:
+ properties:
+ name: disk.device.capacity
+ abstract_ubuntu16.network.outgoing.bytes_ubuntu16_ubuntu16_admin_plane_port_0:
+ properties:
+ name: network.outgoing.bytes
+ abstract_ubuntu16.disk.device.latency_ubuntu16:
+ properties:
+ name: disk.device.latency
+ abstract_ubuntu16.disk.write.bytes.rate_ubuntu16:
+ properties:
+ name: disk.write.bytes.rate
+ abstract_ubuntu16.instance_ubuntu16:
+ properties:
+ name: instance
+ abstract_ubuntu16.disk.iops_ubuntu16:
+ properties:
+ name: disk.iops
+ abstract_ubuntu16.disk.capacity_ubuntu16:
+ properties:
+ name: disk.capacity
+ abstract_ubuntu16.memory.resident_ubuntu16:
+ properties:
+ name: memory.resident
+ abstract_ubuntu16.disk.allocation_ubuntu16:
+ properties:
+ name: disk.allocation
+ abstract_ubuntu16.network.outgoing.bytes.rate_ubuntu16_ubuntu16_admin_plane_port_0:
+ properties:
+ name: network.outgoing.bytes.rate
+ abstract_ubuntu16.disk.read.requests_ubuntu16:
+ properties:
+ name: disk.read.requests
+ abstract_ubuntu16.cpu_ubuntu16:
+ properties:
+ name: cpu
+ abstract_ubuntu16.disk.device.iops_ubuntu16:
+ properties:
+ name: disk.device.iops
+ abstract_ubuntu16.disk.device.read.requests_ubuntu16:
+ properties:
+ name: disk.device.read.requests
+ abstract_ubuntu16.memory.usage_ubuntu16:
+ properties:
+ name: memory.usage
+ abstract_ubuntu16.disk.usage_ubuntu16:
+ properties:
+ name: disk.usage
+ abstract_ubuntu16.disk.device.write.bytes.rate_ubuntu16:
+ properties:
+ name: disk.device.write.bytes.rate
+ abstract_ubuntu16.disk.read.bytes.rate_ubuntu16:
+ properties:
+ name: disk.read.bytes.rate
+ abstract_ubuntu16.network.outgoing.packets.rate_ubuntu16_ubuntu16_admin_plane_port_0:
+ properties:
+ name: network.outgoing.packets.rate
+ abstract_ubuntu16.disk.device.write.requests_ubuntu16:
+ properties:
+ name: disk.device.write.requests
+ groups:
+ ubuntu16test0..Ubuntu16test..base_ubuntu16..module-0:
+ type: org.openecomp.groups.VfModule
+ metadata:
+ vfModuleModelName: Ubuntu16test..base_ubuntu16..module-0
+ vfModuleModelInvariantUUID: 28038eb1-cb06-45be-b7f4-dd6349f45a83
+ vfModuleModelUUID: 1c71e637-0a79-4316-86f0-c24921798bfa
+ vfModuleModelVersion: '1'
+ vfModuleModelCustomizationUUID: 58832c82-4fd8-4248-9dbc-e006af9c1702
+ properties:
+ min_vf_module_instances: 1
+ vf_module_label: base_ubuntu16
+ max_vf_module_instances: 1
+ vf_module_type: Base
+ isBase: true
+ initial_count: 1
+ volume_group: false
+ substitution_mappings:
+ node_type: org.openecomp.service.Ubuntu16test
+ capabilities:
+ ubuntu16test0.abstract_ubuntu16.network.incoming.bytes_ubuntu16_ubuntu16_admin_plane_port_0:
+ - ubuntu16test 0
+ - abstract_ubuntu16.network.incoming.bytes_ubuntu16_ubuntu16_admin_plane_port_0
+ ubuntu16test0.abstract_ubuntu16.scalable_ubuntu16:
+ - ubuntu16test 0
+ - abstract_ubuntu16.scalable_ubuntu16
+ ubuntu16test0.abstract_ubuntu16.disk.device.write.bytes_ubuntu16:
+ - ubuntu16test 0
+ - abstract_ubuntu16.disk.device.write.bytes_ubuntu16
+ ubuntu16test0.abstract_ubuntu16.vcpus_ubuntu16:
+ - ubuntu16test 0
+ - abstract_ubuntu16.vcpus_ubuntu16
+ ubuntu16test0.abstract_ubuntu16.feature_ubuntu16_ubuntu16_admin_plane_port_0:
+ - ubuntu16test 0
+ - abstract_ubuntu16.feature_ubuntu16_ubuntu16_admin_plane_port_0
+ ubuntu16test0.abstract_ubuntu16.disk.device.write.requests.rate_ubuntu16:
+ - ubuntu16test 0
+ - abstract_ubuntu16.disk.device.write.requests.rate_ubuntu16
+ ubuntu16test0.abstract_ubuntu16.disk.read.bytes.rate_ubuntu16:
+ - ubuntu16test 0
+ - abstract_ubuntu16.disk.read.bytes.rate_ubuntu16
+ ubuntu16test0.abstract_ubuntu16.network.incoming.packets_ubuntu16_ubuntu16_admin_plane_port_0:
+ - ubuntu16test 0
+ - abstract_ubuntu16.network.incoming.packets_ubuntu16_ubuntu16_admin_plane_port_0
+ ubuntu16test0.abstract_ubuntu16.instance_ubuntu16:
+ - ubuntu16test 0
+ - abstract_ubuntu16.instance_ubuntu16
+ ubuntu16test0.abstract_ubuntu16.disk.allocation_ubuntu16:
+ - ubuntu16test 0
+ - abstract_ubuntu16.disk.allocation_ubuntu16
+ ubuntu16test0.abstract_ubuntu16.binding_ubuntu16:
+ - ubuntu16test 0
+ - abstract_ubuntu16.binding_ubuntu16
+ ubuntu16test0.abstract_ubuntu16.cpu_ubuntu16:
+ - ubuntu16test 0
+ - abstract_ubuntu16.cpu_ubuntu16
+ ubuntu16test0.abstract_ubuntu16.feature_ubuntu16:
+ - ubuntu16test 0
+ - abstract_ubuntu16.feature_ubuntu16
+ ubuntu16test0.abstract_ubuntu16.memory_ubuntu16:
+ - ubuntu16test 0
+ - abstract_ubuntu16.memory_ubuntu16
+ ubuntu16test0.abstract_ubuntu16.disk.device.read.bytes_ubuntu16:
+ - ubuntu16test 0
+ - abstract_ubuntu16.disk.device.read.bytes_ubuntu16
+ ubuntu16test0.abstract_ubuntu16.disk.device.write.requests_ubuntu16:
+ - ubuntu16test 0
+ - abstract_ubuntu16.disk.device.write.requests_ubuntu16
+ ubuntu16test0.abstract_ubuntu16.disk.device.latency_ubuntu16:
+ - ubuntu16test 0
+ - abstract_ubuntu16.disk.device.latency_ubuntu16
+ ubuntu16test0.abstract_ubuntu16.endpoint_ubuntu16:
+ - ubuntu16test 0
+ - abstract_ubuntu16.endpoint_ubuntu16
+ ubuntu16test0.abstract_ubuntu16.disk.device.read.bytes.rate_ubuntu16:
+ - ubuntu16test 0
+ - abstract_ubuntu16.disk.device.read.bytes.rate_ubuntu16
+ ubuntu16test0.abstract_ubuntu16.network.incoming.packets.rate_ubuntu16_ubuntu16_admin_plane_port_0:
+ - ubuntu16test 0
+ - abstract_ubuntu16.network.incoming.packets.rate_ubuntu16_ubuntu16_admin_plane_port_0
+ ubuntu16test0.abstract_ubuntu16.disk.write.requests_ubuntu16:
+ - ubuntu16test 0
+ - abstract_ubuntu16.disk.write.requests_ubuntu16
+ ubuntu16test0.abstract_ubuntu16.disk.root.size_ubuntu16:
+ - ubuntu16test 0
+ - abstract_ubuntu16.disk.root.size_ubuntu16
+ ubuntu16test0.ubuntu16_admin_security_group.feature:
+ - ubuntu16test 0
+ - ubuntu16_admin_security_group.feature
+ ubuntu16test0.abstract_ubuntu16.disk.device.usage_ubuntu16:
+ - ubuntu16test 0
+ - abstract_ubuntu16.disk.device.usage_ubuntu16
+ ubuntu16test0.abstract_ubuntu16.disk.latency_ubuntu16:
+ - ubuntu16test 0
+ - abstract_ubuntu16.disk.latency_ubuntu16
+ ubuntu16test0.abstract_ubuntu16.cpu_util_ubuntu16:
+ - ubuntu16test 0
+ - abstract_ubuntu16.cpu_util_ubuntu16
+ ubuntu16test0.abstract_ubuntu16.disk.read.bytes_ubuntu16:
+ - ubuntu16test 0
+ - abstract_ubuntu16.disk.read.bytes_ubuntu16
+ ubuntu16test0.abstract_ubuntu16.disk.write.requests.rate_ubuntu16:
+ - ubuntu16test 0
+ - abstract_ubuntu16.disk.write.requests.rate_ubuntu16
+ ubuntu16test0.abstract_ubuntu16.memory.usage_ubuntu16:
+ - ubuntu16test 0
+ - abstract_ubuntu16.memory.usage_ubuntu16
+ ubuntu16test0.abstract_ubuntu16.host_ubuntu16:
+ - ubuntu16test 0
+ - abstract_ubuntu16.host_ubuntu16
+ ubuntu16test0.abstract_ubuntu16.disk.ephemeral.size_ubuntu16:
+ - ubuntu16test 0
+ - abstract_ubuntu16.disk.ephemeral.size_ubuntu16
+ ubuntu16test0.abstract_ubuntu16.memory.resident_ubuntu16:
+ - ubuntu16test 0
+ - abstract_ubuntu16.memory.resident_ubuntu16
+ ubuntu16test0.abstract_ubuntu16.disk.device.read.requests_ubuntu16:
+ - ubuntu16test 0
+ - abstract_ubuntu16.disk.device.read.requests_ubuntu16
+ ubuntu16test0.abstract_ubuntu16.disk.device.allocation_ubuntu16:
+ - ubuntu16test 0
+ - abstract_ubuntu16.disk.device.allocation_ubuntu16
+ ubuntu16test0.abstract_ubuntu16.disk.read.requests_ubuntu16:
+ - ubuntu16test 0
+ - abstract_ubuntu16.disk.read.requests_ubuntu16
+ ubuntu16test0.abstract_ubuntu16.network.outgoing.bytes_ubuntu16_ubuntu16_admin_plane_port_0:
+ - ubuntu16test 0
+ - abstract_ubuntu16.network.outgoing.bytes_ubuntu16_ubuntu16_admin_plane_port_0
+ ubuntu16test0.abstract_ubuntu16.disk.device.iops_ubuntu16:
+ - ubuntu16test 0
+ - abstract_ubuntu16.disk.device.iops_ubuntu16
+ ubuntu16test0.abstract_ubuntu16.cpu.delta_ubuntu16:
+ - ubuntu16test 0
+ - abstract_ubuntu16.cpu.delta_ubuntu16
+ ubuntu16test0.abstract_ubuntu16.forwarder_ubuntu16_ubuntu16_admin_plane_port_0:
+ - ubuntu16test 0
+ - abstract_ubuntu16.forwarder_ubuntu16_ubuntu16_admin_plane_port_0
+ ubuntu16test0.abstract_ubuntu16.network.incoming.bytes.rate_ubuntu16_ubuntu16_admin_plane_port_0:
+ - ubuntu16test 0
+ - abstract_ubuntu16.network.incoming.bytes.rate_ubuntu16_ubuntu16_admin_plane_port_0
+ ubuntu16test0.abstract_ubuntu16.binding_ubuntu16_ubuntu16_admin_plane_port_0:
+ - ubuntu16test 0
+ - abstract_ubuntu16.binding_ubuntu16_ubuntu16_admin_plane_port_0
+ ubuntu16test0.abstract_ubuntu16.attachment_ubuntu16_ubuntu16_admin_plane_port_0:
+ - ubuntu16test 0
+ - abstract_ubuntu16.attachment_ubuntu16_ubuntu16_admin_plane_port_0
+ ubuntu16test0.abstract_ubuntu16.disk.capacity_ubuntu16:
+ - ubuntu16test 0
+ - abstract_ubuntu16.disk.capacity_ubuntu16
+ ubuntu16test0.abstract_ubuntu16.network.outpoing.packets_ubuntu16_ubuntu16_admin_plane_port_0:
+ - ubuntu16test 0
+ - abstract_ubuntu16.network.outpoing.packets_ubuntu16_ubuntu16_admin_plane_port_0
+ ubuntu16test0.abstract_ubuntu16.disk.usage_ubuntu16:
+ - ubuntu16test 0
+ - abstract_ubuntu16.disk.usage_ubuntu16
+ ubuntu16test0.abstract_ubuntu16.port_mirroring_ubuntu16_ubuntu16_admin_plane_port_0:
+ - ubuntu16test 0
+ - abstract_ubuntu16.port_mirroring_ubuntu16_ubuntu16_admin_plane_port_0
+ ubuntu16test0.abstract_ubuntu16.os_ubuntu16:
+ - ubuntu16test 0
+ - abstract_ubuntu16.os_ubuntu16
+ ubuntu16test0.abstract_ubuntu16.network.outgoing.packets.rate_ubuntu16_ubuntu16_admin_plane_port_0:
+ - ubuntu16test 0
+ - abstract_ubuntu16.network.outgoing.packets.rate_ubuntu16_ubuntu16_admin_plane_port_0
+ ubuntu16test0.abstract_ubuntu16.disk.write.bytes_ubuntu16:
+ - ubuntu16test 0
+ - abstract_ubuntu16.disk.write.bytes_ubuntu16
+ ubuntu16test0.abstract_ubuntu16.disk.device.write.bytes.rate_ubuntu16:
+ - ubuntu16test 0
+ - abstract_ubuntu16.disk.device.write.bytes.rate_ubuntu16
+ ubuntu16test0.abstract_ubuntu16.disk.write.bytes.rate_ubuntu16:
+ - ubuntu16test 0
+ - abstract_ubuntu16.disk.write.bytes.rate_ubuntu16
+ ubuntu16test0.abstract_ubuntu16.network.outgoing.bytes.rate_ubuntu16_ubuntu16_admin_plane_port_0:
+ - ubuntu16test 0
+ - abstract_ubuntu16.network.outgoing.bytes.rate_ubuntu16_ubuntu16_admin_plane_port_0
+ ubuntu16test0.abstract_ubuntu16.disk.device.read.requests.rate_ubuntu16:
+ - ubuntu16test 0
+ - abstract_ubuntu16.disk.device.read.requests.rate_ubuntu16
+ ubuntu16test0.abstract_ubuntu16.disk.iops_ubuntu16:
+ - ubuntu16test 0
+ - abstract_ubuntu16.disk.iops_ubuntu16
+ ubuntu16test0.abstract_ubuntu16.disk.device.capacity_ubuntu16:
+ - ubuntu16test 0
+ - abstract_ubuntu16.disk.device.capacity_ubuntu16
+ properties:
+ skip_post_instantiation_configuration:
+ - skip_post_instantiation_configuration
+ controller_actor:
+ - controller_actor
+ cds_model_version:
+ - cds_model_version
+ cds_model_name:
+ - cds_model_name
+ default_software_version:
+ - default_software_version
diff --git a/asdc-controller/src/test/resources/resource-examples/service-ubuntu16test/service-ubuntu16test-notification.json b/asdc-controller/src/test/resources/resource-examples/service-ubuntu16test/service-ubuntu16test-notification.json
new file mode 100644
index 0000000000..8d0ac3e301
--- /dev/null
+++ b/asdc-controller/src/test/resources/resource-examples/service-ubuntu16test/service-ubuntu16test-notification.json
@@ -0,0 +1,114 @@
+{
+ "distributionID": "2d6c5aa8-b644-4f30-a632-5577801ef954",
+ "serviceName": "ubuntu16test",
+ "serviceVersion": "1.0",
+ "serviceUUID": "ed0391da-b963-4c45-bf3a-b49cc7a94fab",
+ "serviceDescription": "service",
+ "serviceInvariantUUID": "941b713e-4ba0-47c9-bfaf-611168cbf7d1",
+ "resources": [
+ {
+ "resourceInstanceName": "ubuntu16test 0",
+ "resourceName": "Ubuntu16test",
+ "resourceVersion": "1.0",
+ "resoucreType": "VF",
+ "resourceUUID": "e6afd1be-ee4f-439d-bd79-d559c626fd27",
+ "resourceInvariantUUID": "72ce1922-0359-4079-a76e-f3f1b6cf8cc1",
+ "resourceCustomizationUUID": "1b2bf1c7-25a5-48df-bf30-7ae43508a5ea",
+ "category": "Generic",
+ "subcategory": "Abstract",
+ "artifacts": [
+{
+ "artifactName": "ubuntu16test0_modules.json",
+ "artifactType": "VF_MODULES_METADATA",
+ "artifactURL": "/ubuntu16test0_modules.json",
+ "artifactChecksum": "MDJkYjNmNjEzM2Y1ZDgzNzZiZWUxMjZkMzA3YzkwZDI\u003d",
+ "artifactDescription": "Auto-generated VF Modules information artifact",
+ "artifactTimeout": 120,
+ "artifactUUID": "28038eb1-cb06-45be-b7f4-dd6349f45a83",
+ "artifactVersion": "1"
+ },
+
+
+{
+ "artifactName": "base_ubuntu16.env",
+ "artifactType": "HEAT_ENV",
+ "artifactURL": "/base_ubuntu16.env",
+ "artifactChecksum": "YzI4MjlkODk4YzcyOTgzZTg2YjAyM2ZiNWU1N2FmMjI\u003d",
+ "artifactDescription": "Auto-generated HEAT Environment deployment artifact",
+ "artifactTimeout": 120,
+ "artifactUUID": "5821b043-ba50-49ef-b739-61b0896050f2",
+ "artifactVersion": "2",
+ "generatedFromUUID": "12dcc618-20f2-4f15-ab00-c549b96b3910"
+ },
+
+ {
+ "artifactName": "vendor-license-model.xml",
+ "artifactType": "VF_LICENSE",
+ "artifactURL": "/vendor-license-model.xml",
+ "artifactChecksum": "YjYyYWNiMzUxM2YzMWYxYWVhN2Y5MTM3N2E5YzNhNmU\u003d",
+ "artifactDescription": "VF license file",
+ "artifactTimeout": 120,
+ "artifactUUID": "5c29e823-7114-4988-824f-f670ba9d7b21",
+ "artifactVersion": "1"
+ },
+
+ {
+ "artifactName": "/base_ubuntu16.yaml",
+ "artifactType": "HEAT",
+ "artifactURL": "/base_ubuntu16.yaml",
+ "artifactChecksum": "NWU2NGUwNmNkMGEzYjAxMTAyODkzNTc5YzFmZDBmMzM\u003d",
+ "artifactDescription": "created from csar",
+ "artifactTimeout": 120,
+ "artifactUUID": "fdb0d678-10f5-4ff0-a1b4-36bc01a012d7",
+ "artifactVersion": "2"
+ },
+ {
+ "artifactName": "vendor-license-model.xml",
+ "artifactType": "VENDOR_LICENSE",
+ "artifactURL": "/vendor-license-model.xml",
+ "artifactChecksum": "OTRkOTY3YjdjM2ZlNDM3NjNlZjBjODU4YTJmNGZhNGE\u003d",
+ "artifactDescription": " Vendor license file",
+ "artifactTimeout": 120,
+ "artifactUUID": "74c4d1bd-1779-421f-8c9d-774ac4567031",
+ "artifactVersion": "1"
+ },
+ {
+ "artifactName": "base_ubuntu16.env",
+ "artifactType": "HEAT_ENV",
+ "artifactURL": "/base_ubuntu16.env",
+ "artifactChecksum": "OTRkOTY3YjdjM2ZlNDM3NjNlZjBjODU4YTJmNGZhNGE\u003d",
+ "artifactDescription": " Vendor license file",
+ "artifactTimeout": 120,
+ "artifactUUID": "9a3c7717-09b6-4a96-8a39-66beb2bb2b36",
+ "artifactVersion": "1"
+ }
+
+ ]
+ }
+
+
+ ],
+ "serviceArtifacts": [
+ {
+ "artifactName": "service-Ubuntu16test-template.ym",
+ "artifactType": "TOSCA_TEMPLATE",
+ "artifactURL": "/service-Ubuntu16test-template.ym",
+ "artifactChecksum": "NTUzMDU5YzM3MTk4OGNiNjQ2OGRlMWY2YjU3MjE2YjM\u003d",
+ "artifactDescription": "TOSCA representation of the asset",
+ "artifactTimeout": 0,
+ "artifactUUID": "2617d0ca-54f0-4222-b659-c12e292d94dd",
+ "artifactVersion": "1"
+ },
+ {
+ "artifactName": "service-Ubuntu16test-csar.csar",
+ "artifactType": "TOSCA_CSAR",
+ "artifactURL": "/service-Ubuntu16test-csar.csar",
+ "artifactChecksum": "ZTRhOGI0M2UxN2ZhYjQ0ODI5ZDZhZTExZTFkMGU3N2Y\u003d",
+ "artifactDescription": "TOSCA definition package of the asset",
+ "artifactTimeout": 0,
+ "artifactUUID": "26a323ff-b97b-4b86-96b1-25a80c0876e5",
+ "artifactVersion": "1"
+ }
+ ],
+ "workloadContext": "Production"
+}
diff --git a/asdc-controller/src/test/resources/resource-examples/service-ubuntu16test/ubuntu16test0_modules.json b/asdc-controller/src/test/resources/resource-examples/service-ubuntu16test/ubuntu16test0_modules.json
new file mode 100644
index 0000000000..478df36881
--- /dev/null
+++ b/asdc-controller/src/test/resources/resource-examples/service-ubuntu16test/ubuntu16test0_modules.json
@@ -0,0 +1,25 @@
+[
+ {
+ "vfModuleModelName": "Ubuntu16test..base_ubuntu16..module-0",
+ "vfModuleModelInvariantUUID": "28038eb1-cb06-45be-b7f4-dd6349f45a83",
+ "vfModuleModelVersion": "1",
+ "vfModuleModelUUID": "1c71e637-0a79-4316-86f0-c24921798bfa",
+ "vfModuleModelCustomizationUUID": "58832c82-4fd8-4248-9dbc-e006af9c1702",
+ "isBase": true,
+ "artifacts": [
+ "9a3c7717-09b6-4a96-8a39-66beb2bb2b36",
+ "fdb0d678-10f5-4ff0-a1b4-36bc01a012d7"
+ ],
+ "properties": {
+ "min_vf_module_instances": "1",
+ "vf_module_label": "base_ubuntu16",
+ "max_vf_module_instances": "1",
+ "vfc_list": "",
+ "vf_module_type": "Base",
+ "vf_module_description": "",
+ "initial_count": "1",
+ "volume_group": "false",
+ "availability_zone_count": ""
+ }
+ }
+] \ No newline at end of file
diff --git a/asdc-controller/src/test/resources/resource-examples/service-ubuntu16test/vendor-license-model.xml b/asdc-controller/src/test/resources/resource-examples/service-ubuntu16test/vendor-license-model.xml
new file mode 100644
index 0000000000..11d2b958c9
--- /dev/null
+++ b/asdc-controller/src/test/resources/resource-examples/service-ubuntu16test/vendor-license-model.xml
@@ -0,0 +1 @@
+<vendor-license-model xmlns="http://xmlns.openecomp.org/asdc/license-model/1.0"><vendor-name>basicvm_vendor</vendor-name><entitlement-pool-list/><license-key-group-list/></vendor-license-model> \ No newline at end of file
diff --git a/asdc-controller/src/test/resources/resource-examples/vgw/ETSI_PACKAGE/VENDOR_LICENSE/vendor-license-model.xml b/asdc-controller/src/test/resources/resource-examples/vgw/ETSI_PACKAGE/VENDOR_LICENSE/vendor-license-model.xml
deleted file mode 100644
index 6499a58fab..0000000000
--- a/asdc-controller/src/test/resources/resource-examples/vgw/ETSI_PACKAGE/VENDOR_LICENSE/vendor-license-model.xml
+++ /dev/null
@@ -1 +0,0 @@
-<vendor-license-model xmlns="http://xmlns.openecomp.org/asdc/license-model/1.0"><vendor-name>VLM</vendor-name><entitlement-pool-list><entitlement-pool><entitlement-pool-invariant-uuid>d6dea4a3db6b415ba50f17cb3311d046</entitlement-pool-invariant-uuid><entitlement-pool-uuid>04B01ABDE6CA4A9FBA75ACC023C6FEDA</entitlement-pool-uuid><version>1.0</version><name>EP</name><description/><increments/><manufacturer-reference-number>2345</manufacturer-reference-number><operational-scope><value/></operational-scope><start-date/><expiry-date/><threshold-value><unit/><value/></threshold-value><sp-limits/><vendor-limits/></entitlement-pool></entitlement-pool-list><license-key-group-list><license-key-group><version>1.0</version><name>LKG</name><description/><type>Unique</type><increments/><manufacturerReferenceNumber/><license-key-group-invariant-uuid>55ddeb1a87be4fbb95a9bd74b4d745ca</license-key-group-invariant-uuid><license-key-group-uuid>81117C9B092C4C70AFF76833373CE7F4</license-key-group-uuid><operational-scope><value/></operational-scope><start-date/><expiry-date/><threshold-value><unit>Absolute</unit><value>23456789</value></threshold-value><sp-limits/><vendor-limits/></license-key-group></license-key-group-list></vendor-license-model> \ No newline at end of file
diff --git a/asdc-controller/src/test/resources/resource-examples/vgw/ETSI_PACKAGE/VF_LICENSE/vf-license-model.xml b/asdc-controller/src/test/resources/resource-examples/vgw/ETSI_PACKAGE/VF_LICENSE/vf-license-model.xml
deleted file mode 100644
index 581a3acb7f..0000000000
--- a/asdc-controller/src/test/resources/resource-examples/vgw/ETSI_PACKAGE/VF_LICENSE/vf-license-model.xml
+++ /dev/null
@@ -1 +0,0 @@
-<vf-license-model xmlns="http://xmlns.openecomp.org/asdc/license-model/1.0"><vendor-name>VLM</vendor-name><vf-id>fa87b9536b704787981357393f36b3fc</vf-id><feature-group-list><feature-group><entitlement-pool-list><entitlement-pool><name>EP</name><description/><increments/><entitlement-pool-invariant-uuid>d6dea4a3db6b415ba50f17cb3311d046</entitlement-pool-invariant-uuid><entitlement-pool-uuid>04B01ABDE6CA4A9FBA75ACC023C6FEDA</entitlement-pool-uuid><manufacturer-reference-number>2345</manufacturer-reference-number><operational-scope><value/></operational-scope><start-date/><expiry-date/><threshold-value><unit/><value/></threshold-value><version>1.0</version><sp-limits/><vendor-limits/></entitlement-pool></entitlement-pool-list><license-key-group-list><license-key-group><name>LKG</name><description/><type>Unique</type><increments/><license-key-group-invariant-uuid>55ddeb1a87be4fbb95a9bd74b4d745ca</license-key-group-invariant-uuid><license-key-group-uuid>81117C9B092C4C70AFF76833373CE7F4</license-key-group-uuid><manufacturer-reference-number/><operational-scope><value/></operational-scope><start-date/><expiry-date/><threshold-value><unit>Absolute</unit><value>23456789</value></threshold-value><version>1.0</version><sp-limits/><vendor-limits/></license-key-group></license-key-group-list><name>FG</name><feature-group-uuid>2218d90f94944a94952be83354847631</feature-group-uuid><description/><part-number>234594</part-number></feature-group></feature-group-list></vf-license-model> \ No newline at end of file
diff --git a/asdc-controller/src/test/resources/resource-examples/vgw/ETSI_PACKAGE/vgw6.csar b/asdc-controller/src/test/resources/resource-examples/vgw/ETSI_PACKAGE/vgw6.csar
deleted file mode 100644
index 56dbb2bce0..0000000000
--- a/asdc-controller/src/test/resources/resource-examples/vgw/ETSI_PACKAGE/vgw6.csar
+++ /dev/null
Binary files differ
diff --git a/asdc-controller/src/test/resources/resource-examples/vgw/SDC_RESOURCE_CSAR/vgw_sdc_resource.csar b/asdc-controller/src/test/resources/resource-examples/vgw/SDC_RESOURCE_CSAR/vgw_sdc_resource.csar
deleted file mode 100644
index 9eb240d9a7..0000000000
--- a/asdc-controller/src/test/resources/resource-examples/vgw/SDC_RESOURCE_CSAR/vgw_sdc_resource.csar
+++ /dev/null
Binary files differ
diff --git a/asdc-controller/src/test/resources/resource-examples/vgw/VENDOR_LICENSE/vendor-license-model.xml b/asdc-controller/src/test/resources/resource-examples/vgw/VENDOR_LICENSE/vendor-license-model.xml
deleted file mode 100644
index 6499a58fab..0000000000
--- a/asdc-controller/src/test/resources/resource-examples/vgw/VENDOR_LICENSE/vendor-license-model.xml
+++ /dev/null
@@ -1 +0,0 @@
-<vendor-license-model xmlns="http://xmlns.openecomp.org/asdc/license-model/1.0"><vendor-name>VLM</vendor-name><entitlement-pool-list><entitlement-pool><entitlement-pool-invariant-uuid>d6dea4a3db6b415ba50f17cb3311d046</entitlement-pool-invariant-uuid><entitlement-pool-uuid>04B01ABDE6CA4A9FBA75ACC023C6FEDA</entitlement-pool-uuid><version>1.0</version><name>EP</name><description/><increments/><manufacturer-reference-number>2345</manufacturer-reference-number><operational-scope><value/></operational-scope><start-date/><expiry-date/><threshold-value><unit/><value/></threshold-value><sp-limits/><vendor-limits/></entitlement-pool></entitlement-pool-list><license-key-group-list><license-key-group><version>1.0</version><name>LKG</name><description/><type>Unique</type><increments/><manufacturerReferenceNumber/><license-key-group-invariant-uuid>55ddeb1a87be4fbb95a9bd74b4d745ca</license-key-group-invariant-uuid><license-key-group-uuid>81117C9B092C4C70AFF76833373CE7F4</license-key-group-uuid><operational-scope><value/></operational-scope><start-date/><expiry-date/><threshold-value><unit>Absolute</unit><value>23456789</value></threshold-value><sp-limits/><vendor-limits/></license-key-group></license-key-group-list></vendor-license-model> \ No newline at end of file
diff --git a/asdc-controller/src/test/resources/resource-examples/vgw/VF_LICENSE/vf-license-model.xml b/asdc-controller/src/test/resources/resource-examples/vgw/VF_LICENSE/vf-license-model.xml
deleted file mode 100644
index 581a3acb7f..0000000000
--- a/asdc-controller/src/test/resources/resource-examples/vgw/VF_LICENSE/vf-license-model.xml
+++ /dev/null
@@ -1 +0,0 @@
-<vf-license-model xmlns="http://xmlns.openecomp.org/asdc/license-model/1.0"><vendor-name>VLM</vendor-name><vf-id>fa87b9536b704787981357393f36b3fc</vf-id><feature-group-list><feature-group><entitlement-pool-list><entitlement-pool><name>EP</name><description/><increments/><entitlement-pool-invariant-uuid>d6dea4a3db6b415ba50f17cb3311d046</entitlement-pool-invariant-uuid><entitlement-pool-uuid>04B01ABDE6CA4A9FBA75ACC023C6FEDA</entitlement-pool-uuid><manufacturer-reference-number>2345</manufacturer-reference-number><operational-scope><value/></operational-scope><start-date/><expiry-date/><threshold-value><unit/><value/></threshold-value><version>1.0</version><sp-limits/><vendor-limits/></entitlement-pool></entitlement-pool-list><license-key-group-list><license-key-group><name>LKG</name><description/><type>Unique</type><increments/><license-key-group-invariant-uuid>55ddeb1a87be4fbb95a9bd74b4d745ca</license-key-group-invariant-uuid><license-key-group-uuid>81117C9B092C4C70AFF76833373CE7F4</license-key-group-uuid><manufacturer-reference-number/><operational-scope><value/></operational-scope><start-date/><expiry-date/><threshold-value><unit>Absolute</unit><value>23456789</value></threshold-value><version>1.0</version><sp-limits/><vendor-limits/></license-key-group></license-key-group-list><name>FG</name><feature-group-uuid>2218d90f94944a94952be83354847631</feature-group-uuid><description/><part-number>234594</part-number></feature-group></feature-group-list></vf-license-model> \ No newline at end of file
diff --git a/asdc-controller/src/test/resources/resource-examples/vgw/dmaap-notification-message.json b/asdc-controller/src/test/resources/resource-examples/vgw/dmaap-notification-message.json
deleted file mode 100644
index 8c42c9c3e9..0000000000
--- a/asdc-controller/src/test/resources/resource-examples/vgw/dmaap-notification-message.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
- "distributionID": "35f20eb9-238a-4cc2-96dc-0a08f71bc209",
- "serviceName": "VgwServiceV1",
- "serviceVersion": "1.0",
- "serviceUUID": "e051ff77-fb79-451c-8457-1cbf94e4db8f",
- "serviceDescription": "Test VGW Service",
- "serviceInvariantUUID": "c2ce924f-0aa1-4777-9b42-c0fec006a883",
- "resources": [
- {
- "resourceInstanceName": "VgwVspV1 0",
- "resourceName": "VgwVspV1",
- "resourceVersion": "1.0",
- "resourceType": "VF",
- "resourceUUID": "655aa939-d589-4333-8cc6-8fcb15db858a",
- "resourceInvariantUUID": "c53a0c91-35f6-40ff-bcda-f75030cfaf2d",
- "resourceCustomizationUUID": "db1673e1-351a-4d04-8e2f-84b2b4c52cc7",
- "category": "Generic",
- "subcategory": "Network Service",
- "artifacts": [
- {
- "artifactName": "vf-license-model.xml",
- "artifactType": "VF_LICENSE",
- "artifactURL": "/VF_LICENSE/vf-license-model.xml",
- "artifactChecksum": "NjMwZDc0YzhiNDRlZDAyYjIxMmFlM2M0MWRkZjFmNDA\u003d",
- "artifactDescription": "VF license file",
- "artifactTimeout": 120,
- "artifactUUID": "8dda263d-90bb-4b3d-b8e0-0048222dc658",
- "artifactVersion": "1"
- },
- {
- "artifactName": "vgw6.csar",
- "artifactType": "ETSI_PACKAGE",
- "artifactURL": "/ETSI_PACKAGE/vgw6.csar",
- "artifactChecksum": "NjdmNGU3ZDlkODQ0YTUzMTU5NjZmOThiYjMxNTJiNGI\u003d",
- "artifactDescription": "Artifact created from csar",
- "artifactTimeout": 120,
- "artifactUUID": "9e9930b8-898e-4b8b-999e-66c43e1611f4",
- "artifactVersion": "1"
- },
- {
- "artifactName": "vendor-license-model.xml",
- "artifactType": "VENDOR_LICENSE",
- "artifactURL": "/VENDOR_LICENSE/vendor-license-model.xml",
- "artifactChecksum": "NGNmNzU4MDhjN2FjMTJkNWIxMjNkZDZhOWQyYzU0ZjA\u003d",
- "artifactDescription": " Vendor license file",
- "artifactTimeout": 120,
- "artifactUUID": "b3f7a4cf-6a35-4f66-b800-cd4a9a0e9719",
- "artifactVersion": "1"
- }
- ]
- }
- ],
- "serviceArtifacts": [
- {
- "artifactName": "service-Vgwservicev1-csar.csar",
- "artifactType": "TOSCA_CSAR",
- "artifactURL": "/service-Vgwservicev1-csar.csar",
- "artifactChecksum": "MzcxNTMwMDhmNGY0MjRkMjFkNzk1MDNjOTVhNjQzMmE\u003d",
- "artifactDescription": "TOSCA definition package of the asset",
- "artifactTimeout": 0,
- "artifactUUID": "0cc70c6e-6ddc-4ecc-8052-d9f1433c14b8",
- "artifactVersion": "1"
- }
- ],
- "workloadContext": "Production"
-}
diff --git a/asdc-controller/src/test/resources/resource-examples/vgw/etsi-catalog-package-onboading-job-status-error-package-exists.json b/asdc-controller/src/test/resources/resource-examples/vgw/etsi-catalog-package-onboading-job-status-error-package-exists.json
deleted file mode 100644
index 8dc07b9613..0000000000
--- a/asdc-controller/src/test/resources/resource-examples/vgw/etsi-catalog-package-onboading-job-status-error-package-exists.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "jobId": "57c13120-0a03-4d2e-837a-7c41d61e4a30",
- "responseDescriptor":
- {
- "status": "error",
- "progress": "255",
- "statusDescription": "VNF package() already exists.",
- "errorCode": "1",
- "responseId": "2",
- "responseHistoryList": [
- {
- "status": "processing",
- "progress": "5",
- "statusDescription": "Start CSAR(8f0b72e1-b6d6-42b6-a808-c60b17f04d7a) distribute.",
- "errorCode": "0",
- "responseId": "1"
- }
- ]
- }
-}
diff --git a/asdc-controller/src/test/resources/resource-examples/vgw/etsi-catalog-package-onboading-job-status-error.json b/asdc-controller/src/test/resources/resource-examples/vgw/etsi-catalog-package-onboading-job-status-error.json
deleted file mode 100644
index 13f346fb7a..0000000000
--- a/asdc-controller/src/test/resources/resource-examples/vgw/etsi-catalog-package-onboading-job-status-error.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "jobId": "57c13120-0a03-4d2e-837a-7c41d61e4a30",
- "responseDescriptor":
- {
- "status": "error",
- "progress": "255",
- "statusDescription": "Failed to query artifacts(resources) from sdc.",
- "errorCode": "0",
- "responseId": "2",
- "responseHistoryList": [
- {
- "status": "processing",
- "progress": "5",
- "statusDescription": "Start CSAR(8f0b72e1-b6d6-42b6-a808-c60b17f04d7a) distribute.",
- "errorCode": "0",
- "responseId": "1"
- }
- ]
- }
-}
diff --git a/asdc-controller/src/test/resources/resource-examples/vgw/etsi-catalog-package-onboading-job-status-successful.json b/asdc-controller/src/test/resources/resource-examples/vgw/etsi-catalog-package-onboading-job-status-successful.json
deleted file mode 100644
index b5dc1fe4f2..0000000000
--- a/asdc-controller/src/test/resources/resource-examples/vgw/etsi-catalog-package-onboading-job-status-successful.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "jobId": "57c13120-0a03-4d2e-837a-7c41d61e4a30",
- "responseDescriptor":
- {
- "status": "finished",
- "progress": "100",
- "statusDescription": "CSAR(8f0b72e1-b6d6-42b6-a808-c60b17f04d7a) distribute successfully.",
- "errorCode": "0",
- "responseId": "3",
- "responseHistoryList": [
- {
- "status": "processing",
- "progress": "30",
- "statusDescription": "Save CSAR(8f0b72e1-b6d6-42b6-a808-c60b17f04d7a) to database.",
- "errorCode": "0",
- "responseId": "2"
- },
- {
- "status": "processing",
- "progress": "5",
- "statusDescription": "Start CSAR(8f0b72e1-b6d6-42b6-a808-c60b17f04d7a) distribute.",
- "errorCode": "0",
- "responseId": "1"
- }
- ]
- }
-}
diff --git a/asdc-controller/src/test/resources/resource-examples/vgw/service-Vgwservicev1-csar.csar b/asdc-controller/src/test/resources/resource-examples/vgw/service-Vgwservicev1-csar.csar
deleted file mode 100644
index eaed092b00..0000000000
--- a/asdc-controller/src/test/resources/resource-examples/vgw/service-Vgwservicev1-csar.csar
+++ /dev/null
Binary files differ
diff --git a/asdc-controller/src/test/resources/schema.sql b/asdc-controller/src/test/resources/schema.sql
index f94f74da97..83be71e5e2 100644
--- a/asdc-controller/src/test/resources/schema.sql
+++ b/asdc-controller/src/test/resources/schema.sql
@@ -651,7 +651,7 @@ CREATE TABLE `network_resource` (
`TOSCA_NODE_TYPE` varchar(200) DEFAULT NULL,
`AIC_VERSION_MIN` varchar(20) NULL,
`AIC_VERSION_MAX` varchar(20) DEFAULT NULL,
- `ORCHESTRATION_MODE` varchar(20) DEFAULT 'HEAT',
+ `ORCHESTRATION_MODE` varchar(20) NOT NULL DEFAULT 'HEAT',
`CREATION_TIMESTAMP` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
`RESOURCE_CATEGORY` varchar(200) DEFAULT NULL,
`RESOURCE_SUB_CATEGORY` varchar(200) DEFAULT NULL,
@@ -961,8 +961,8 @@ CREATE TABLE `vf_module_customization` (
`ID` int(13) NOT NULL AUTO_INCREMENT,
`MODEL_CUSTOMIZATION_UUID` varchar(200) NOT NULL,
`LABEL` varchar(200) DEFAULT NULL,
- `INITIAL_COUNT` int(11) DEFAULT '0',
- `MIN_INSTANCES` int(11) DEFAULT '0',
+ `INITIAL_COUNT` int(11) NOT NULL DEFAULT '0',
+ `MIN_INSTANCES` int(11) NOT NULL DEFAULT '0',
`MAX_INSTANCES` int(11) DEFAULT NULL,
`AVAILABILITY_ZONE_COUNT` int(11) DEFAULT NULL,
`HEAT_ENVIRONMENT_ARTIFACT_UUID` varchar(200) DEFAULT NULL,
@@ -1205,6 +1205,7 @@ CREATE TABLE IF NOT EXISTS `pnf_resource_customization` (
`CDS_BLUEPRINT_VERSION` varchar(20) DEFAULT NULL,
`SKIP_POST_INSTANTIATION_CONFIGURATION` boolean default true,
`CONTROLLER_ACTOR` varchar(200) DEFAULT NULL,
+ `DEFAULT_SOFTWARE_VERSION` varchar(4000) DEFAULT NULL,
PRIMARY KEY (`MODEL_CUSTOMIZATION_UUID`),
KEY `fk_pnf_resource_customization__pnf_resource1_idx` (`PNF_RESOURCE_MODEL_UUID`),
CONSTRAINT `fk_pnf_resource_customization__pnf_resource1` FOREIGN KEY (`PNF_RESOURCE_MODEL_UUID`) REFERENCES `pnf_resource` (`MODEL_UUID`) ON DELETE CASCADE ON UPDATE CASCADE
@@ -1229,7 +1230,7 @@ CREATE TABLE IF NOT EXISTS `workflow` (
`RESOURCE_TARGET` varchar(200) NOT NULL,
`SOURCE` varchar(200) NOT NULL,
`TIMEOUT_MINUTES` int(11) DEFAULT NULL,
- `ARTIFACT_CHECKSUM` varchar(200) DEFAULT 'MANUAL RECORD',
+ `ARTIFACT_CHECKSUM` varchar(200) NULL DEFAULT 'MANUAL RECORD',
`CREATION_TIMESTAMP` datetime NOT NULL DEFAULT current_timestamp(),
PRIMARY KEY (`ID`),
UNIQUE KEY `UK_workflow` (`ARTIFACT_UUID`,`NAME`,`VERSION`,`SOURCE`)