diff options
author | 2018-07-16 19:22:02 +0300 | |
---|---|---|
committer | 2018-07-18 11:15:02 +0000 | |
commit | a555c46e2065c2de1de87f26f5a829be5ef0d403 (patch) | |
tree | 429ec3e417679eecedf5c4df0c22196bf13e14d7 /catalog-be/src/main/resources/import/tosca | |
parent | 71782cf5739a46034161176c14b3489b66464298 (diff) |
Fixed not needed derived from properties
Removed derived from property that we're added before
Fixed the properties assignments page to work with the new state
Change-Id: Id8d8e9437a9927660cfd373b24efae63f4d13347
Issue-ID: SDC-1514
Signed-off-by: Idan Amit <ia096e@intl.att.com>
Diffstat (limited to 'catalog-be/src/main/resources/import/tosca')
-rw-r--r-- | catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml | 8 | ||||
-rw-r--r-- | catalog-be/src/main/resources/import/tosca/data-types/dataTypes.zip | bin | 7397 -> 7388 bytes |
2 files changed, 0 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 697b333db5..c5555a5838 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 @@ -1422,7 +1422,6 @@ tosca.datatypes.nfv.L3AddressData: type: string required: false tosca.datatypes.nfv.AddressData: - derived_from: tosca.datatypes.Root properties: address_type: constraints: @@ -1453,7 +1452,6 @@ tosca.datatypes.nfv.VlFlavour: flavourId: type: string tosca.datatypes.nfv.ext.AddressPairs: - derived_from: tosca.datatypes.Root properties: ip: type: string @@ -1462,7 +1460,6 @@ tosca.datatypes.nfv.ext.AddressPairs: type: string required: false tosca.datatypes.nfv.ext.FloatingIP: - derived_from: tosca.datatypes.Root properties: external_network: type: string @@ -1471,7 +1468,6 @@ tosca.datatypes.nfv.ext.FloatingIP: type: string required: false tosca.datatypes.nfv.ext.LocationInfo: - derived_from: tosca.datatypes.Root properties: availability_zone: type: string @@ -1483,7 +1479,6 @@ tosca.datatypes.nfv.ext.LocationInfo: type: string required: false tosca.datatypes.nfv.ext.HostRouteInfo: - derived_from: tosca.datatypes.Root properties: destination: type: string @@ -1492,7 +1487,6 @@ tosca.datatypes.nfv.ext.HostRouteInfo: type: string required: false tosca.datatypes.nfv.ext.InjectData: - derived_from: tosca.datatypes.Root properties: file_name: type: string @@ -1501,7 +1495,6 @@ tosca.datatypes.nfv.ext.InjectData: type: string required: false tosca.datatypes.nfv.ext.zte.WatchDog: - derived_from: tosca.datatypes.Root properties: enable_delay: type: integer @@ -1510,7 +1503,6 @@ tosca.datatypes.nfv.ext.zte.WatchDog: type: string required: false 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 1e1fa1e561..84bc0c928d 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 |