diff options
author | Michal Jagiello <michal.jagiello@t-mobile.pl> | 2024-01-31 08:30:41 +0100 |
---|---|---|
committer | Michal Jagiello <michal.jagiello@t-mobile.pl> | 2024-02-02 08:30:15 +0100 |
commit | 440df5e3af8446ddaf1e7ab9ed5abbbe439f9a06 (patch) | |
tree | 13ee8f0a3839b18eff32a1bcab25a6c5baf00364 /src/onaptests/templates | |
parent | 6a3e189d7fac6ec562f8785c71ed87663ef0c311 (diff) |
Refactor tests to use SDC v2 onapsdk module
Refactored SDC allows to archive and delete SDC resources
Remove unmaintained test basic_clamp
Issue-ID: TEST-404
Signed-off-by: Michal Jagiello <michal.jagiello@t-mobile.pl>
Change-Id: I11e4be6f4567098b20733879e393c689766a9c6e
Diffstat (limited to 'src/onaptests/templates')
-rw-r--r-- | src/onaptests/templates/vnf-services/basic_cnf_macro-service.yaml.j2 (renamed from src/onaptests/templates/vnf-services/basic_cnf_macro-service.yaml) | 4 | ||||
-rw-r--r-- | src/onaptests/templates/vnf-services/basic_vm-service.yaml.j2 (renamed from src/onaptests/templates/vnf-services/basic_vm-service.yaml) | 4 | ||||
-rw-r--r-- | src/onaptests/templates/vnf-services/basic_vm_macro-service.yaml.j2 (renamed from src/onaptests/templates/vnf-services/basic_vm_macro-service.yaml) | 4 | ||||
-rw-r--r-- | src/onaptests/templates/vnf-services/pnf-service.yaml.j2 (renamed from src/onaptests/templates/vnf-services/pnf-service.yaml) | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/onaptests/templates/vnf-services/basic_cnf_macro-service.yaml b/src/onaptests/templates/vnf-services/basic_cnf_macro-service.yaml.j2 index 8634cfd..b58e9f0 100644 --- a/src/onaptests/templates/vnf-services/basic_cnf_macro-service.yaml +++ b/src/onaptests/templates/vnf-services/basic_cnf_macro-service.yaml.j2 @@ -1,10 +1,10 @@ --- -basic_cnf_macro: +{{ service_name }}: tosca_file_from_SDC: service-basic_cnf_macro-template version: "1.0" subscription_type: "basic_cnf_macro" vnfs: - - vnf_name: basic_cnf_macro + - vnf_name: {{ service_name }} properties: controller_actor: "CDS" skip_post_instantiation_configuration: False diff --git a/src/onaptests/templates/vnf-services/basic_vm-service.yaml b/src/onaptests/templates/vnf-services/basic_vm-service.yaml.j2 index eb4522a..9d7d4fd 100644 --- a/src/onaptests/templates/vnf-services/basic_vm-service.yaml +++ b/src/onaptests/templates/vnf-services/basic_vm-service.yaml.j2 @@ -1,7 +1,7 @@ --- -basic_vm: +{{ service_name }}: vnfs: - - vnf_name: basic_vm + - vnf_name: {{ service_name }} heat_files_to_upload: templates/heat-files/ubuntu20/ubuntu20agent.zip vnf_parameters: [ {"name": "ubuntu20_image_name", diff --git a/src/onaptests/templates/vnf-services/basic_vm_macro-service.yaml b/src/onaptests/templates/vnf-services/basic_vm_macro-service.yaml.j2 index 2a616a5..c3d1d38 100644 --- a/src/onaptests/templates/vnf-services/basic_vm_macro-service.yaml +++ b/src/onaptests/templates/vnf-services/basic_vm_macro-service.yaml.j2 @@ -1,8 +1,8 @@ --- -basic_vm_macro: +{{ service_name }}: instantiation_type: "Macro" vnfs: - - vnf_name: basic_vm_macro + - vnf_name: {{ service_name }} properties: controller_actor: "CDS" skip_post_instantiation_configuration: False diff --git a/src/onaptests/templates/vnf-services/pnf-service.yaml b/src/onaptests/templates/vnf-services/pnf-service.yaml.j2 index e9ca513..0c13f0a 100644 --- a/src/onaptests/templates/vnf-services/pnf-service.yaml +++ b/src/onaptests/templates/vnf-services/pnf-service.yaml.j2 @@ -1,11 +1,11 @@ --- -test_pnf_macro: +{{ service_name }}: tosca_file_from_SDC: service-basic_network-template version: "1.0" subscription_type: "net" instantiation_type: "Macro" pnfs: - - pnf_name: "test-pnf" + - pnf_name: "{{ service_name }}" heat_files_to_upload: templates/artifacts/pNF.csar pnf_artifact_type: "CONTROLLER_BLUEPRINT_ARCHIVE" pnf_artifact_name: "CBA_enriched.zip" |