From: Michael Lando <ml636r@att.com>
Date: Tue, 29 May 2018 21:29:50 +0000 (+0300)
Subject: add drived from statement to datatypes
X-Git-Tag: v1.2.0~8
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=a05044b3b3b91ac21d0728401c3c2f91e1bc7632;p=sdc.git

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)
---

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 1b032cb276..bd8b33789c 100644
Binary files a/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.zip and b/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.zip differ