summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml8
-rw-r--r--catalog-be/src/main/resources/import/tosca/data-types/dataTypes.zipbin7397 -> 7388 bytes
-rw-r--r--catalog-ui/src/app/ng2/services/data-type.service.ts8
3 files changed, 4 insertions, 12 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
index 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
Binary files differ
diff --git a/catalog-ui/src/app/ng2/services/data-type.service.ts b/catalog-ui/src/app/ng2/services/data-type.service.ts
index 6b5908903e..e2489c6ec2 100644
--- a/catalog-ui/src/app/ng2/services/data-type.service.ts
+++ b/catalog-ui/src/app/ng2/services/data-type.service.ts
@@ -7,9 +7,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -57,7 +57,7 @@ export class DataTypeService {
});
}
//recurse parent (derivedFrom), in case one of parents contains properties
- if (PROPERTY_DATA.ROOT_DATA_TYPE !== dataTypeObj.derivedFrom.name) {
+ if (dataTypeObj.derivedFrom && PROPERTY_DATA.ROOT_DATA_TYPE == dataTypeObj.derivedFrom.name) {
this.getDerivedDataTypeProperties(dataTypeObj.derivedFrom, propertiesArray, parentName);
}
}
@@ -65,7 +65,7 @@ export class DataTypeService {
/**
* Checks for custom behavior for a given data type by checking if a function exists within data-type.service with that name
* Additional custom behavior can be added by adding a function with the given dataType name
- */
+ */
public checkForCustomBehavior = (property:PropertyFEModel) => {
let shortTypeName:string = property.type.split('.').pop();
if (this[shortTypeName]) {