From 3b2267ad7c5cbbebfe1137ce27afd05bf82bb6ff Mon Sep 17 00:00:00 2001 From: Michael Lando Date: Wed, 30 May 2018 00:29:50 +0300 Subject: [PATCH] add drived from statement to datatypes fix issue where some data types did not have the derived from add derive from root to all missing once. Change-Id: I432fbd96da300adebf66c4dfac5af0804be1859c Issue-ID: SDC-1297 Signed-off-by: Michael Lando --- .../import/tosca/data-types/dataTypes.yml | 23 ++++++++++++++------- .../import/tosca/data-types/dataTypes.zip | Bin 7408 -> 7378 bytes 2 files changed, 15 insertions(+), 8 deletions(-) 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 e8c27c2e03..bbac8b7cad 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 @@ -1417,6 +1417,7 @@ tosca.datatypes.nfv.L3AddressData: type: string required: false tosca.datatypes.nfv.AddressData: + derived_from: tosca.datatypes.Root properties: address_type: constraints: @@ -1446,7 +1447,8 @@ tosca.datatypes.nfv.VlFlavour: properties: flavourId: type: string -tosca.datatypes.nfv.ext.AddressPairs: +tosca.datatypes.nfv.ext.AddressPairs: + derived_from: tosca.datatypes.Root properties: ip: type: string @@ -1454,7 +1456,8 @@ tosca.datatypes.nfv.ext.AddressPairs: mac: type: string required: false -tosca.datatypes.nfv.ext.FloatingIP: +tosca.datatypes.nfv.ext.FloatingIP: + derived_from: tosca.datatypes.Root properties: external_network: type: string @@ -1462,7 +1465,8 @@ tosca.datatypes.nfv.ext.FloatingIP: ip_address: type: string required: false -tosca.datatypes.nfv.ext.LocationInfo: +tosca.datatypes.nfv.ext.LocationInfo: + derived_from: tosca.datatypes.Root properties: availability_zone: type: string @@ -1473,7 +1477,8 @@ tosca.datatypes.nfv.ext.LocationInfo: tenant: type: string required: false -tosca.datatypes.nfv.ext.HostRouteInfo: +tosca.datatypes.nfv.ext.HostRouteInfo: + derived_from: tosca.datatypes.Root properties: destination: type: string @@ -1481,8 +1486,8 @@ tosca.datatypes.nfv.ext.HostRouteInfo: nexthop: type: string required: false - -tosca.datatypes.nfv.ext.InjectData: +tosca.datatypes.nfv.ext.InjectData: + derived_from: tosca.datatypes.Root properties: file_name: type: string @@ -1490,7 +1495,8 @@ tosca.datatypes.nfv.ext.InjectData: file_data: type: string required: false -tosca.datatypes.nfv.ext.zte.WatchDog: +tosca.datatypes.nfv.ext.zte.WatchDog: + derived_from: tosca.datatypes.Root properties: enable_delay: type: integer @@ -1498,7 +1504,8 @@ tosca.datatypes.nfv.ext.zte.WatchDog: action: type: string required: false -tosca.datatypes.nfv.ext.LocalAffinityOrAntiAffinityRule: +tosca.datatypes.nfv.ext.LocalAffinityOrAntiAffinityRule: + derived_from: tosca.datatypes.Root properties: scope: type: string 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 1b032cb2767b19058cad40535de45531392476e6..bd8b33789cbbc80c24a21b441ae881308fca369e 100644 GIT binary patch literal 7378 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 -- 2.16.6