diff options
| author |   Michael Lando <ml636r@att.com> | 2018-03-04 14:53:33 +0200 |
|---|---|---|
| committer | Michael Lando <ml636r@att.com> | 2018-03-07 13:19:05 +0000 |
| commit | a5445100050e49e83f73424198d73cd72d672a4d (patch) | |
| tree | cacf4df817df31be23e4e790d1dda857bdae061e /catalog-be/src/main/resources/import/tosca/data-types | |
| parent | 51157f92c21976cba4914c378aaa3cba49826931 (diff) | |
Sync Integ to Master
Change-Id: I71e3acc26fa612127756ac04073a522b9cc6cd74
Issue-ID: SDC-977
Signed-off-by: Gitelman, Tal (tg851x) <tg851x@intl.att.com>
Diffstat (limited to 'catalog-be/src/main/resources/import/tosca/data-types')
| -rw-r--r-- | catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml | 3 | ||||
| -rw-r--r-- | catalog-be/src/main/resources/import/tosca/data-types/dataTypes.zip | bin | 6601 -> 6315 bytes |
2 files changed, 2 insertions, 1 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 449842c2f4..493f399453 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 @@ -1257,6 +1257,7 @@ org.openecomp.datatypes.flavors.DeploymentFlavor: license_flavor: type: org.openecomp.datatypes.flavors.LicenseFlavor required: false + org.openecomp.datatypes.ImageInfo: derived_from: tosca.datatypes.Root properties: @@ -1271,7 +1272,7 @@ org.openecomp.datatypes.ImageInfo: type: string required: false default: md5 -#onap +#ONAP types tosca.datatypes.nfv.VnfcConfigurableProperties: 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 1f79bf2c2d..75f9f73a35 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 |