diff options
| author |   Gamboa, Gilbert <gilbert.g.gamboa@att.com> | 2019-06-06 14:23:36 -0400 |
|---|---|---|
| committer |   Benjamin, Max (mb388a) <mb388a@us.att.com> | 2019-06-06 15:38:14 -0400 |
| commit | 62b2e47808fe1adcbac31dbcdf992617b7f0bd4d (patch) | |
| tree | 6fbdcf652784be141c869259f2c2919d2a7ce378 /common/src/main/java/org/onap | |
| parent | c4b90365d5c117bc6fd64af421a1468539a8aec3 (diff) | |
Accommodate WAN Networking
checked and evaluated naming policy only if infra bonding.
Updated workflowAction to include vrf configuration for vpn-binding in
resourceIds list.
added in linked resource to service proxy cust
committing the asdc controller classpath change
added some unit tests for vrf validation and updated bbinput setup test
update config resource cust foreign key mapping
Moved mockbean for AssignVrfConfiguration task class into BaseBpmnTest.
added in a check to see if list is empty before access
added unit tests for bbinput setup for vrf config
Update AssignFlows enum with correct AssignVrfConfiguration flow name
Change-Id: Ibf14e36505638b19c1366ecebfce560c02e69e44
Issue-ID: SO-1975
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
Diffstat (limited to 'common/src/main/java/org/onap')
| -rw-r--r-- | common/src/main/java/org/onap/so/client/aai/AAIObjectType.java | 3 | ||||
| -rw-r--r-- | common/src/main/java/org/onap/so/serviceinstancebeans/ModelType.java | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/common/src/main/java/org/onap/so/client/aai/AAIObjectType.java b/common/src/main/java/org/onap/so/client/aai/AAIObjectType.java index 6b2b6f2b3e..c2c8e933b1 100644 --- a/common/src/main/java/org/onap/so/client/aai/AAIObjectType.java +++ b/common/src/main/java/org/onap/so/client/aai/AAIObjectType.java @@ -72,6 +72,7 @@ import org.onap.aai.domain.yang.Vnfc; import org.onap.aai.domain.yang.VolumeGroup; import org.onap.aai.domain.yang.VpnBinding; import org.onap.aai.domain.yang.Vserver; +import org.onap.aai.domain.yang.Zone; import org.onap.so.client.graphinventory.GraphInventoryObjectType; import org.onap.so.constants.Defaults; import org.reflections.Reflections; @@ -186,7 +187,7 @@ public class AAIObjectType implements GraphInventoryObjectType, Serializable { "/esr-vnfm/{vnfm-id}/esr-system-info-list", "vnfm-esr-system-info-list"); public static final AAIObjectType CLOUD_ESR_SYSTEM_INFO_LIST = new AAIObjectType( AAIObjectType.CLOUD_REGION.uriTemplate(), "/esr-system-info-list", "cloud-esr-system-info-list"); - + public static final AAIObjectType ZONE = new AAIObjectType(AAINamespaceConstants.NETWORK, Zone.class); private final String uriTemplate; private final String parentUri; diff --git a/common/src/main/java/org/onap/so/serviceinstancebeans/ModelType.java b/common/src/main/java/org/onap/so/serviceinstancebeans/ModelType.java index 34edf91c0c..6b9b39e5a9 100644 --- a/common/src/main/java/org/onap/so/serviceinstancebeans/ModelType.java +++ b/common/src/main/java/org/onap/so/serviceinstancebeans/ModelType.java @@ -36,7 +36,8 @@ public enum ModelType { connectionPoint("connectionPoint"), pnf("pnf"), networkInstanceGroup("networkInstanceGroup"), - instanceGroup("instanceGroup"); + instanceGroup("instanceGroup"), + vpnBinding("vpnBinding"); final String name; |