aboutsummaryrefslogtreecommitdiffstats
path: root/mso-catalog-db/src/main/java/org
diff options
context:
space:
mode:
authorBoslet, Cory <cory.boslet@att.com>2020-04-02 15:17:22 -0400
committerBenjamin, Max (mb388a) <mb388a@att.com>2020-04-04 14:28:18 -0400
commit3db9a38fdae095122f716189900942e0f2b53f03 (patch)
treef0c383a1390a469781d0fed46a6ceb93c0220398 /mso-catalog-db/src/main/java/org
parent3534e7089c955406866bd8e796a8f5e40b08100b (diff)
Added logic to update the requests DB when a
Added logic to update the requests DB when a Create or Delete BB is silent success and updated enum Updated regrex and add junit test for orch validator and formatted files Formatted pom files that were not formatted correctly. Removed use of ternary operator if statement and moved enum to static final. Updated equals method to include resource status message for mockito verify Removed resourceStatusMessage from equals and used argument capture instead Issue-ID: SO-2782 Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com> Change-Id: I3a292f57d2771200ce85a99e845e776e2f3bd600
Diffstat (limited to 'mso-catalog-db/src/main/java/org')
-rw-r--r--mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ResourceType.java26
1 files changed, 16 insertions, 10 deletions
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ResourceType.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ResourceType.java
index 4fd28c910e..74f58a210c 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ResourceType.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ResourceType.java
@@ -21,24 +21,30 @@
package org.onap.so.db.catalog.beans;
public enum ResourceType {
- SERVICE("Service"),
- VNF("Vnf"),
- VOLUME_GROUP("VolumeGroup"),
- VF_MODULE("VfModule"),
- NETWORK("Network"),
- NETWORK_COLLECTION("NetworkCollection"),
- CONFIGURATION("Configuration"),
- INSTANCE_GROUP("InstanceGroup"),
- NO_VALIDATE("NoValidate");
+ SERVICE("Service", "SERVICE_INSTANCE_ID"),
+ VNF("Vnf", "GENERIC_VNF_ID"),
+ VOLUME_GROUP("VolumeGroup", "VOLUME_GROUP_ID"),
+ VF_MODULE("VfModule", "VF_MODULE_ID"),
+ NETWORK("Network", "NETWORK_ID"),
+ NETWORK_COLLECTION("NetworkCollection", "NETWORK_COLLECTION_ID"),
+ CONFIGURATION("Configuration", "CONFIGURATION_ID"),
+ INSTANCE_GROUP("InstanceGroup", "INSTANCE_GROUP_ID"),
+ NO_VALIDATE("NoValidate", "");
private final String name;
+ private final String resourceKey;
- private ResourceType(String name) {
+ private ResourceType(String name, String resourceKey) {
this.name = name;
+ this.resourceKey = resourceKey;
}
@Override
public String toString() {
return name;
}
+
+ public String getResourceKey() {
+ return resourceKey;
+ }
}