diff options
| author |   Michael Lando <ml636r@att.com> | 2017-07-20 01:29:49 +0300 |
|---|---|---|
| committer | Michael Lando <ml636r@att.com> | 2017-07-20 01:30:06 +0300 |
| commit | 3c3c833897dbfc0e85feaf36086a505f990ecb76 (patch) | |
| tree | 8c308fbe7298aa65066ba0fc8a71e51d20d8e0de /catalog-be/src/main/resources | |
| parent | 30db4407bab8cfea48e278d29e55b11c6c0a528c (diff) | |
[SDC] 1710 rebase + pom modifications
Change-Id: I1f9c0a5201576c7a6b124f6a786db12c1a8cd7c0
Signed-off-by: Michael Lando <ml636r@att.com>
Diffstat (limited to 'catalog-be/src/main/resources')
| -rw-r--r-- | catalog-be/src/main/resources/config/SDC.zip | bin | 29275 -> 29892 bytes | |||
| -rw-r--r-- | catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml | 10 | ||||
| -rw-r--r-- | catalog-be/src/main/resources/import/tosca/data-types/dataTypes.zip | bin | 5408 -> 5521 bytes | |||
| -rw-r--r-- | catalog-be/src/main/resources/scripts/import/tosca/typesToUpgrade.json | 4 | ||||
| -rw-r--r-- | catalog-be/src/main/resources/scripts/import/tosca/upgradeHeatAndNormativeTypes.py | 3 |
5 files changed, 14 insertions, 3 deletions
diff --git a/catalog-be/src/main/resources/config/SDC.zip b/catalog-be/src/main/resources/config/SDC.zip Binary files differindex 6df1b13f2b..a4ff817216 100644 --- a/catalog-be/src/main/resources/config/SDC.zip +++ b/catalog-be/src/main/resources/config/SDC.zip 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 da15414d9d..621274796f 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 @@ -67,7 +67,7 @@ tosca.datatypes.TimeInterval: tosca.datatypes.network.NetworkInfo: derived_from: tosca.datatypes.Root - properties: + properties: network_name: type: string network_id: @@ -1045,7 +1045,13 @@ org.openecomp.datatypes.network.IpRequirements: required: false floating_ip_count_required: type: org.openecomp.datatypes.AssignmentRequirements - required: false + required: false + ip_address_plan_name: + type: string + required: false + vrf_name: + type: string + required: false org.openecomp.datatypes.network.MacAssignments: derived_from: org.openecomp.datatypes.Root 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 08d4bfc3a5..ffbe146f9b 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 diff --git a/catalog-be/src/main/resources/scripts/import/tosca/typesToUpgrade.json b/catalog-be/src/main/resources/scripts/import/tosca/typesToUpgrade.json index 1ef72856a4..5c8e84abe2 100644 --- a/catalog-be/src/main/resources/scripts/import/tosca/typesToUpgrade.json +++ b/catalog-be/src/main/resources/scripts/import/tosca/typesToUpgrade.json @@ -1,5 +1,9 @@ { "heat": [ + "contrailPort", + "extCp", + "contrailV2VirtualMachineInterface", + "neutronPort", "Generic_PNF" ], "normative": [ diff --git a/catalog-be/src/main/resources/scripts/import/tosca/upgradeHeatAndNormativeTypes.py b/catalog-be/src/main/resources/scripts/import/tosca/upgradeHeatAndNormativeTypes.py index 75afe33eba..e35e2d28eb 100644 --- a/catalog-be/src/main/resources/scripts/import/tosca/upgradeHeatAndNormativeTypes.py +++ b/catalog-be/src/main/resources/scripts/import/tosca/upgradeHeatAndNormativeTypes.py @@ -107,4 +107,5 @@ def main(argv): if __name__ == "__main__": - main(sys.argv[1:])
\ No newline at end of file + main(sys.argv[1:]) + |