From 9a6c8fc028db1e94c873300ec14211b7beb5c78a Mon Sep 17 00:00:00 2001 From: Michael Lando Date: Mon, 11 Jun 2018 13:26:35 +0300 Subject: update sdc logic for new types update sdc conformance level and add logic to package onap normatives. Change-Id: I321eeb0cccf662346eb36cb42420fd8fca72ae32 Issue-ID: SDC-1380 Signed-off-by: Michael Lando --- .../src/main/resources/config/configuration.yaml | 2 +- .../resources/import/tosca/data-types/dataTypes.yml | 5 +++++ .../resources/import/tosca/data-types/dataTypes.zip | Bin 7378 -> 7397 bytes 3 files changed, 6 insertions(+), 1 deletion(-) (limited to 'catalog-be/src/main') diff --git a/catalog-be/src/main/resources/config/configuration.yaml b/catalog-be/src/main/resources/config/configuration.yaml index aefdacea98..991ed92e5d 100644 --- a/catalog-be/src/main/resources/config/configuration.yaml +++ b/catalog-be/src/main/resources/config/configuration.yaml @@ -23,7 +23,7 @@ beSslPort: 8443 version: 1.1.0 released: 2012-11-30 -toscaConformanceLevel: 7.0 +toscaConformanceLevel: 10.0 minToscaConformanceLevel: 3.0 titanCfgFile: /home/vagrant/catalog-be/config/catalog-be/titan.properties diff --git a/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml b/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml index bbac8b7cad..697b333db5 100644 --- a/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml +++ b/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml @@ -1371,6 +1371,8 @@ tosca.datatypes.nfv.VirtualNetworkInterfaceRequirements: support_mandatory: type: boolean required: true + requirement: + type: string # not specified network_interface_requirements: type: map entry_schema: @@ -1394,6 +1396,9 @@ tosca.datatypes.nfv.L2AddressData: mac_address_assignment: type: boolean required: true + address: + type: string + required: false tosca.datatypes.nfv.L3AddressData: derived_from: tosca.datatypes.Root properties: diff --git a/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.zip b/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.zip index bd8b33789c..1e1fa1e561 100644 Binary files a/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.zip and b/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.zip differ -- cgit 1.2.3-korg