From 576fa380d748395c1d8188dfa816d110dab8f146 Mon Sep 17 00:00:00 2001 From: mrichomme Date: Tue, 22 Sep 2020 17:28:22 +0200 Subject: Prepare python package to integrate it in xtesting docker - creation of entrypoint - include templates in the package - complete requirements Open question for integration python reviewers: - I was not able with the MANIFEST to use the template directory until I put it in the package tree. I am not sure it is very nice.. Maybe it is not the right way, we could simply copy the templates in the docker rather than including them as part of the python package.. Note: I retested the ubuntu16 (onboarding/deployment/instantiation) on the Daily Master Issue-ID: TEST-258 Signed-off-by: mrichomme Change-Id: I26f3e959b9c5e341ab197a6c519ca87e31921921 Signed-off-by: mrichomme --- .../vnf-services/clearwater-ims-service.yaml | 36 +++++++++++++++++++ .../vnf-services/ubuntu16test-service.yaml | 42 ++++++++++++++++++++++ 2 files changed, 78 insertions(+) create mode 100644 src/onaptests/templates/vnf-services/clearwater-ims-service.yaml create mode 100644 src/onaptests/templates/vnf-services/ubuntu16test-service.yaml (limited to 'src/onaptests/templates') diff --git a/src/onaptests/templates/vnf-services/clearwater-ims-service.yaml b/src/onaptests/templates/vnf-services/clearwater-ims-service.yaml new file mode 100644 index 0000000..51543da --- /dev/null +++ b/src/onaptests/templates/vnf-services/clearwater-ims-service.yaml @@ -0,0 +1,36 @@ +--- +clearwater_ims: + vnfs: + - vnf_name: clearwater_ims_vnf + heat_files_to_upload: templates/heat_files/clearwater_ims/clearwater_ims.zip + vnf_parameters: [ + {"name": "public_net_id", + "value": "8b0fb448-0daf-4344-a958-74852c5a0530"}, + {"name": "bono_image_name", + "value": "ubuntu-16.04-daily"}, + {"name": "dime_image_name", + "value": "ubuntu-16.04-daily"}, + {"name": "dns_image_name", + "value": "ubuntu-16.04-daily"}, + {"name": "ellis_image_name", + "value": "ubuntu-16.04-daily"}, + {"name": "homer_image_name", + "value": "ubuntu-16.04-daily"}, + {"name": "robot_image_name", + "value": "ubuntu-16.04-daily"}, + {"name": "sprout_image_name", + "value": "ubuntu-16.04-daily"}, + {"name": "vellum_image_name", + "value": "ubuntu-16.04-daily"}, + {"name": "dns_ip", + "value": "8.8.8.8"}, + {"name": "clearwater_pub_key", + "value": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAA\ +BAQDY15cdBmIs2XOpe4EiFCsaY6bmUmK/GysMoLl4UG51JCfJwvwoWCoA+6mDIbymZxhxq9IGx\ +ilp/yTA6WQ9s/5pBag1cUMJmFuda9PjOkXl04jgqh5tR6I+GZ97AvCg93KAECis5ubSqw1xOCj4\ +utfEUtPoF1OuzqM/lE5mY4N6VKXn+fT7pCD6cifBEs6JHhVNvs5OLLp/tO8Pa3kKYQOdyS0xc3r\ +h+t2lrzvKUSWGZbX+dLiFiEpjsUL3tDqzkEMNUn4pdv69OJuzWHCxRWPfdrY9Wg0j3mJesP29EBh\ +t+w+EC9/kBKq+1VKdmsXUXAcjEvjovVL8l1BrX3BY0R8D imported-openssh-key" + }, + {"name": "clearwater_key_name", + "value": "cleouverte"}] diff --git a/src/onaptests/templates/vnf-services/ubuntu16test-service.yaml b/src/onaptests/templates/vnf-services/ubuntu16test-service.yaml new file mode 100644 index 0000000..7e865ca --- /dev/null +++ b/src/onaptests/templates/vnf-services/ubuntu16test-service.yaml @@ -0,0 +1,42 @@ +--- +ubuntu16test: + tosca_file_from_SDC: service-Ubuntu16tha-template + version: "1.0" + subscription_type: "ubuntu16test" + vnfs: + - vnf_name: ubuntu16test + heat_files_to_upload: src/onaptests/templates/heat_files/ubuntu16/ubuntu16.zip + vnf_parameters: [ + {"name": "ubuntu16_image_name", + "value": "ubuntu-16.04-daily" + }, + {"name": "ubuntu16_key_name", + "value": "cleouverte" + }, + {"name": "ubuntu16_pub_key", + "value": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAA\ +BAQDY15cdBmIs2XOpe4EiFCsaY6bmUmK/GysMoLl4UG51JCfJwvwoWCoA+6mDIbymZxhxq9IGx\ +ilp/yTA6WQ9s/5pBag1cUMJmFuda9PjOkXl04jgqh5tR6I+GZ97AvCg93KAECis5ubSqw1xOCj4\ +utfEUtPoF1OuzqM/lE5mY4N6VKXn+fT7pCD6cifBEs6JHhVNvs5OLLp/tO8Pa3kKYQOdyS0xc3r\ +h+t2lrzvKUSWGZbX+dLiFiEpjsUL3tDqzkEMNUn4pdv69OJuzWHCxRWPfdrY9Wg0j3mJesP29EBh\ +t+w+EC9/kBKq+1VKdmsXUXAcjEvjovVL8l1BrX3BY0R8D imported-openssh-key" + }, + {"name": "ubuntu16_flavor_name", + "value": "m1.small" + }, + {"name": "VM_name", + "value": "ubuntu16test-VM-01" + }, + {"name": "vnf_id", + "value": "ubuntu16test-VNF-instance" + }, + {"name": "vf_module_id", + "value": "ubuntu16test-vfmodule-instance" + }, + {"name": "vnf_name", + "value": "ubuntu16test-VNF" + }, + {"name": "admin_plane_net_name", + "value": "admin" + } + ] -- cgit 1.2.3-korg