diff options
| author |   Michael Lando <ml636r@att.com> | 2018-05-30 00:29:50 +0300 |
|---|---|---|
| committer | Michael Lando <ml636r@att.com> | 2018-06-02 13:08:34 +0000 |
| commit | a05044b3b3b91ac21d0728401c3c2f91e1bc7632 (patch) | |
| tree | b50764a917f35483b9cbe36d4043b6cfaaa38566 | |
| parent | bd6665a88439c0c6459c32fdbe1f979b33a9068c (diff) | |
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 <ml636r@att.com>
(cherry picked from commit 3b2267ad7c5cbbebfe1137ce27afd05bf82bb6ff)
| -rw-r--r-- | catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml | 23 | ||||
| -rw-r--r-- | catalog-be/src/main/resources/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 Binary files differindex 1b032cb276..bd8b33789c 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 |