diff options
| author |   Michael Lando <ml636r@att.com> | 2018-06-11 13:26:35 +0300 |
|---|---|---|
| committer | Michael Lando <ml636r@att.com> | 2018-06-12 12:38:22 +0300 |
| commit | 9a6c8fc028db1e94c873300ec14211b7beb5c78a (patch) | |
| tree | a0114b0e58b721dae1dc1caa745b590b6ac7dbac /catalog-be | |
| parent | 95b8fb296567ab71e2661a56ad4a9cbbd84fd31a (diff) | |
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 <ml636r@att.com>
Diffstat (limited to 'catalog-be')
4 files changed, 7 insertions, 2 deletions
diff --git a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb index 178950729c..4d86fbf6c7 100644 --- a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb +++ b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb @@ -25,7 +25,7 @@ beProtocol: http beSslPort: <%= @ssl_port %> version: 1.1.0 released: 2012-11-30 -toscaConformanceLevel: 5.0 +toscaConformanceLevel: 10.0 minToscaConformanceLevel: 3.0 titanCfgFile: /var/lib/jetty/config/catalog-be/titan.properties 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 Binary files differindex bd8b33789c..1e1fa1e561 100644 --- a/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.zip +++ b/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.zip |