From b65b96ecf1712bed1dedbcefe0fb79e51ed2cda8 Mon Sep 17 00:00:00 2001 From: Tal Gitelman Date: Thu, 26 Oct 2017 16:43:24 +0300 Subject: Sanity docker build Huawei_vHSS.csar + vMME.csar + vPCRF_aligned_fixed.csar + vCSCF_aligned.csar + vSBC_aligned.csar aligned VNF addition Change-Id: I7a4fd9b9f82bd5d821568c386c6a22f433e5a557 Issue-ID: SDC-478 Signed-off-by: Tal Gitelman (cherry picked from commit 4f74ac66e4e115654ec30c1f5553e079c3bd4e58) --- .../resources/scripts/import/tosca/importOnapTypes.py | 6 +++--- .../files/default/Files/VNFs/Huawei_vHSS.csar | Bin 0 -> 3100 bytes .../files/default/Files/VNFs/Huawei_vMME.csar | Bin 0 -> 2563 bytes .../Files/VNFs/Huawei_vPCRF_aligned_fixed.csar | Bin 0 -> 3836 bytes .../files/default/Files/VNFs/vCSCF_aligned.csar | Bin 6511 -> 4290 bytes .../files/default/Files/VNFs/vSBC_aligned.csar | Bin 0 -> 3771 bytes 6 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/Huawei_vHSS.csar create mode 100644 sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/Huawei_vMME.csar create mode 100644 sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/Huawei_vPCRF_aligned_fixed.csar create mode 100644 sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/vSBC_aligned.csar diff --git a/catalog-be/src/main/resources/scripts/import/tosca/importOnapTypes.py b/catalog-be/src/main/resources/scripts/import/tosca/importOnapTypes.py index 664c5cc64a..18d2270442 100644 --- a/catalog-be/src/main/resources/scripts/import/tosca/importOnapTypes.py +++ b/catalog-be/src/main/resources/scripts/import/tosca/importOnapTypes.py @@ -26,12 +26,12 @@ def importOnapTypes(beHost, bePort, adminUser, fileDir, updateversion): "extZteCP", "extZteVDU", "extZteVL", + "NSD", + "VDU", "vduCompute", "vduCpd", "vduVirtualStorage", - "vnfVirtualLinkDesc", - "NSD", - "VDU" + "vnfVirtualLinkDesc" ] responseCodes = [200, 201] diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/Huawei_vHSS.csar b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/Huawei_vHSS.csar new file mode 100644 index 0000000000..ea5c1283be Binary files /dev/null and b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/Huawei_vHSS.csar differ diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/Huawei_vMME.csar b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/Huawei_vMME.csar new file mode 100644 index 0000000000..f921f46e06 Binary files /dev/null and b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/Huawei_vMME.csar differ diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/Huawei_vPCRF_aligned_fixed.csar b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/Huawei_vPCRF_aligned_fixed.csar new file mode 100644 index 0000000000..6f997bcf98 Binary files /dev/null and b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/Huawei_vPCRF_aligned_fixed.csar differ diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/vCSCF_aligned.csar b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/vCSCF_aligned.csar index ea977bea80..347b8bcced 100644 Binary files a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/vCSCF_aligned.csar and b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/vCSCF_aligned.csar differ diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/vSBC_aligned.csar b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/vSBC_aligned.csar new file mode 100644 index 0000000000..ee60eed872 Binary files /dev/null and b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/vSBC_aligned.csar differ -- cgit 1.2.3-korg