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>
type: string
required: false
tosca.datatypes.nfv.AddressData:
type: string
required: false
tosca.datatypes.nfv.AddressData:
- derived_from: tosca.datatypes.Root
properties:
address_type:
constraints:
properties:
address_type:
constraints:
flavourId:
type: string
tosca.datatypes.nfv.ext.AddressPairs:
flavourId:
type: string
tosca.datatypes.nfv.ext.AddressPairs:
- derived_from: tosca.datatypes.Root
properties:
ip:
type: string
properties:
ip:
type: string
type: string
required: false
tosca.datatypes.nfv.ext.FloatingIP:
type: string
required: false
tosca.datatypes.nfv.ext.FloatingIP:
- derived_from: tosca.datatypes.Root
properties:
external_network:
type: string
properties:
external_network:
type: string
type: string
required: false
tosca.datatypes.nfv.ext.LocationInfo:
type: string
required: false
tosca.datatypes.nfv.ext.LocationInfo:
- derived_from: tosca.datatypes.Root
properties:
availability_zone:
type: string
properties:
availability_zone:
type: string
type: string
required: false
tosca.datatypes.nfv.ext.HostRouteInfo:
type: string
required: false
tosca.datatypes.nfv.ext.HostRouteInfo:
- derived_from: tosca.datatypes.Root
properties:
destination:
type: string
properties:
destination:
type: string
type: string
required: false
tosca.datatypes.nfv.ext.InjectData:
type: string
required: false
tosca.datatypes.nfv.ext.InjectData:
- derived_from: tosca.datatypes.Root
properties:
file_name:
type: string
properties:
file_name:
type: string
type: string
required: false
tosca.datatypes.nfv.ext.zte.WatchDog:
type: string
required: false
tosca.datatypes.nfv.ext.zte.WatchDog:
- derived_from: tosca.datatypes.Root
properties:
enable_delay:
type: integer
properties:
enable_delay:
type: integer
type: string
required: false
tosca.datatypes.nfv.ext.LocalAffinityOrAntiAffinityRule:
type: string
required: false
tosca.datatypes.nfv.ext.LocalAffinityOrAntiAffinityRule:
- derived_from: tosca.datatypes.Root
properties:
scope:
type: string
properties:
scope:
type: string
* 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
* 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
* 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.
* 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.
});
}
//recurse parent (derivedFrom), in case one of parents contains properties
});
}
//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);
}
}
this.getDerivedDataTypeProperties(dataTypeObj.derivedFrom, propertiesArray, parentName);
}
}
/**
* 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
/**
* 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]) {
public checkForCustomBehavior = (property:PropertyFEModel) => {
let shortTypeName:string = property.type.split('.').pop();
if (this[shortTypeName]) {