From 22664610f99038223f996ef1c1661872a92e4ee4 Mon Sep 17 00:00:00 2001 From: Lukasz Rajewski Date: Thu, 23 Dec 2021 13:40:11 +0100 Subject: [TEST] Basic CNF macro Basic CNF macro added with refactoring that enables debugging under IDE Also SDK upgraded to 9.2 what required adaptation in existing tests Issue-ID: TEST-376 Signed-off-by: Lukasz Rajewski Change-Id: I697857bc0c13e86b88b71c3b46e0c4b59751939c Signed-off-by: mrichomme --- .../vnf-services/basic_clamp-service.yaml | 2 +- .../templates/vnf-services/basic_cnf-service.yaml | 2 +- .../vnf-services/basic_cnf_macro-service.yaml | 68 ++++++++++++++++++++++ .../vnf-services/basic_onboard-service.yaml.j2 | 2 +- .../templates/vnf-services/basic_vm-service.yaml | 2 +- .../vnf-services/basic_vm_macro-service.yaml | 2 +- .../basic_vm_macro_stability-service.yaml | 4 +- .../vnf-services/clearwater-ims-service.yaml | 2 +- .../vnf-services/multi-vnf-ubuntu-model.yaml.j2 | 2 +- .../templates/vnf-services/pnf-service.yaml | 2 +- 10 files changed, 78 insertions(+), 10 deletions(-) create mode 100644 src/onaptests/templates/vnf-services/basic_cnf_macro-service.yaml (limited to 'src/onaptests/templates/vnf-services') diff --git a/src/onaptests/templates/vnf-services/basic_clamp-service.yaml b/src/onaptests/templates/vnf-services/basic_clamp-service.yaml index f5fe653..f3ea53b 100644 --- a/src/onaptests/templates/vnf-services/basic_clamp-service.yaml +++ b/src/onaptests/templates/vnf-services/basic_clamp-service.yaml @@ -2,7 +2,7 @@ basicclamp: vnfs: - vnf_name: basicclamp - heat_files_to_upload: onaptests/templates/heat-files/ubuntu18/ubuntu18agent.zip + heat_files_to_upload: templates/heat-files/ubuntu18/ubuntu18agent.zip vnf_parameters: [ {"name": "ubuntu18_image_name", "value": "ubuntu-agent" diff --git a/src/onaptests/templates/vnf-services/basic_cnf-service.yaml b/src/onaptests/templates/vnf-services/basic_cnf-service.yaml index c3c701f..047a244 100644 --- a/src/onaptests/templates/vnf-services/basic_cnf-service.yaml +++ b/src/onaptests/templates/vnf-services/basic_cnf-service.yaml @@ -5,7 +5,7 @@ basic_cnf: subscription_type: "basic_cnf" vnfs: - vnf_name: basic_cnf - heat_files_to_upload: onaptests/templates/heat-files/basic_cnf/basic_cnf.zip + heat_files_to_upload: templates/heat-files/basic_cnf/basic_cnf.zip vnf_parameters: [ {"name": "dummy_name_0", "value": "dummy_name" diff --git a/src/onaptests/templates/vnf-services/basic_cnf_macro-service.yaml b/src/onaptests/templates/vnf-services/basic_cnf_macro-service.yaml new file mode 100644 index 0000000..3660e2b --- /dev/null +++ b/src/onaptests/templates/vnf-services/basic_cnf_macro-service.yaml @@ -0,0 +1,68 @@ +--- +basic_cnf_macro: + tosca_file_from_SDC: service-basic_cnf_macro-template + version: "1.0" + subscription_type: "basic_cnf_macro" + vnfs: + - vnf_name: basic_cnf_macro + properties: + controller_actor: "CDS" + skip_post_instantiation_configuration: False + sdnc_artifact_name: "vnf" + sdnc_model_version: "1.0.0" + sdnc_model_name: "APACHE" + vnf_artifact_type: "CONTROLLER_BLUEPRINT_ARCHIVE" + vnf_artifact_name: "basic_cnf_cba_enriched.zip" + vnf_artifact_label: "vnfcba" + vnf_artifact_file_path: templates/artifacts/basic_cnf_cba_enriched.zip + heat_files_to_upload: templates/heat-files/basic_cnf_macro/basic_cnf_macro.zip + vnf_parameters: [ + { + "name": "k8s-rb-profile-namespace", + "value": "apache" + }, + { + "name": "k8s-rb-profile-k8s-version", + "value": "1.19.0" + } + ] + vf_module_parameters: + - vf_module_name: helm_apache + parameters: [ + { + "name": "vf_module_label", + "value": "helm_apache" + }, + { + "name": "k8s-rb-profile-name", + "value": "node-port-profile" + }, + { + "name": "k8s-rb-profile-source", + "value": "node-port-profile" + }, + { + "name": "k8s-rb-profile-namespace", + "value": "apache" + }, + { + "name": "k8s-rb-instance-release-name", + "value": "rel-1-apache" + }, + { + "name": "k8s-rb-config-template-name", + "value": "replica-count-template" + }, + { + "name": "k8s-rb-config-template-source", + "value": "deployment-config" + }, + { + "name": "k8s-rb-config-name", + "value": "replica-count-change" + }, + { + "name": "k8s-rb-config-value-source", + "value": "custom-values" + } + ] diff --git a/src/onaptests/templates/vnf-services/basic_onboard-service.yaml.j2 b/src/onaptests/templates/vnf-services/basic_onboard-service.yaml.j2 index db84783..8cc4fe5 100644 --- a/src/onaptests/templates/vnf-services/basic_onboard-service.yaml.j2 +++ b/src/onaptests/templates/vnf-services/basic_onboard-service.yaml.j2 @@ -2,7 +2,7 @@ {{ service_name }}: vnfs: - vnf_name: {{ service_name }} - heat_files_to_upload: onaptests/templates/heat-files/ubuntu18/ubuntu18agent.zip + heat_files_to_upload: templates/heat-files/ubuntu18/ubuntu18agent.zip vnf_parameters: [ {"name": "ubuntu18_image_name", "value": "ubuntu-agent" diff --git a/src/onaptests/templates/vnf-services/basic_vm-service.yaml b/src/onaptests/templates/vnf-services/basic_vm-service.yaml index 227ec48..eb4522a 100644 --- a/src/onaptests/templates/vnf-services/basic_vm-service.yaml +++ b/src/onaptests/templates/vnf-services/basic_vm-service.yaml @@ -2,7 +2,7 @@ basic_vm: vnfs: - vnf_name: basic_vm - heat_files_to_upload: onaptests/templates/heat-files/ubuntu20/ubuntu20agent.zip + heat_files_to_upload: templates/heat-files/ubuntu20/ubuntu20agent.zip vnf_parameters: [ {"name": "ubuntu20_image_name", "value": "ubuntu-20.04" diff --git a/src/onaptests/templates/vnf-services/basic_vm_macro-service.yaml b/src/onaptests/templates/vnf-services/basic_vm_macro-service.yaml index 00f66d5..2a616a5 100644 --- a/src/onaptests/templates/vnf-services/basic_vm_macro-service.yaml +++ b/src/onaptests/templates/vnf-services/basic_vm_macro-service.yaml @@ -13,7 +13,7 @@ basic_vm_macro: vnf_artifact_name: "BASIC_VM_enriched.zip" vnf_artifact_label: "vnfcds" vnf_artifact_file_path: "/tmp/BASIC_VM_enriched.zip" - heat_files_to_upload: onaptests/templates/heat-files/ubuntu20/ubuntu20agent.zip + heat_files_to_upload: templates/heat-files/ubuntu20/ubuntu20agent.zip vf_module_parameters: - vf_module_name: base_ubuntu20 parameters: [ diff --git a/src/onaptests/templates/vnf-services/basic_vm_macro_stability-service.yaml b/src/onaptests/templates/vnf-services/basic_vm_macro_stability-service.yaml index 62170bd..d9454c3 100644 --- a/src/onaptests/templates/vnf-services/basic_vm_macro_stability-service.yaml +++ b/src/onaptests/templates/vnf-services/basic_vm_macro_stability-service.yaml @@ -12,8 +12,8 @@ basic_vm_macro: vnf_artifact_type: "CONTROLLER_BLUEPRINT_ARCHIVE" vnf_artifact_name: "BASIC_VM_enriched.zip" vnf_artifact_label: "vnfcds" - vnf_artifact_file_path: onaptests/templates/artifacts/basic_vm_cba_enriched.zip - heat_files_to_upload: onaptests/templates/heat-files/ubuntu20/ubuntu20agent.zip + vnf_artifact_file_path: templates/artifacts/basic_vm_cba_enriched.zip + heat_files_to_upload: templates/heat-files/ubuntu20/ubuntu20agent.zip vf_module_parameters: - vf_module_name: base_ubuntu20 parameters: [ diff --git a/src/onaptests/templates/vnf-services/clearwater-ims-service.yaml b/src/onaptests/templates/vnf-services/clearwater-ims-service.yaml index d720b2c..49824c1 100644 --- a/src/onaptests/templates/vnf-services/clearwater-ims-service.yaml +++ b/src/onaptests/templates/vnf-services/clearwater-ims-service.yaml @@ -2,7 +2,7 @@ clearwater_ims: vnfs: - vnf_name: clearwater_ims_vnf - heat_files_to_upload: onaptests/templates/heat-files/clearwater_ims/clearwater_ims.zip + heat_files_to_upload: templates/heat-files/clearwater_ims/clearwater_ims.zip vnf_parameters: [ {"name": "public_net_id", "value": "FILL ME"}, diff --git a/src/onaptests/templates/vnf-services/multi-vnf-ubuntu-model.yaml.j2 b/src/onaptests/templates/vnf-services/multi-vnf-ubuntu-model.yaml.j2 index 96037c9..7a701e5 100644 --- a/src/onaptests/templates/vnf-services/multi-vnf-ubuntu-model.yaml.j2 +++ b/src/onaptests/templates/vnf-services/multi-vnf-ubuntu-model.yaml.j2 @@ -13,4 +13,4 @@ vnf_artifact_name: "UBUNTUVNF_enriched.zip" vnf_artifact_label: "UbuntuVNF" vnf_artifact_file_path: "/tmp/UBUNTUVNF_enriched.zip" - heat_files_to_upload: onaptests/templates/heat-files/nso_ubuntu/nso_ubuntu.zip + heat_files_to_upload: templates/heat-files/nso_ubuntu/nso_ubuntu.zip diff --git a/src/onaptests/templates/vnf-services/pnf-service.yaml b/src/onaptests/templates/vnf-services/pnf-service.yaml index 2dcdfbb..e9ca513 100644 --- a/src/onaptests/templates/vnf-services/pnf-service.yaml +++ b/src/onaptests/templates/vnf-services/pnf-service.yaml @@ -6,7 +6,7 @@ test_pnf_macro: instantiation_type: "Macro" pnfs: - pnf_name: "test-pnf" - heat_files_to_upload: onaptests/templates/artifacts/pNF.csar + heat_files_to_upload: templates/artifacts/pNF.csar pnf_artifact_type: "CONTROLLER_BLUEPRINT_ARCHIVE" pnf_artifact_name: "CBA_enriched.zip" pnf_artifact_label: "cbapnf" -- cgit 1.2.3-korg