Updates to config flow-controller bundle

[appc.git] / appc-config / appc-flow-controller / provider / src / main / java / org / onap / appc / flow / controller / data / ActionIdentifier.java

diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/data/ActionIdentifier.java b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/data/ActionIdentifier.java
index abce468..9fc1527 100644 (file)
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/data/ActionIdentifier.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/data/ActionIdentifier.java
@@ -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.
@@ -23,12 +23,14 @@ package org.onap.appc.flow.controller.data;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class ActionIdentifier {
-    
+
     @Override
     public int hashCode() {
         final int prime = 31;
         int result = 1;
         result = prime * result + ((vnfId == null) ? 0 : vnfId.hashCode());
+        result = prime * result + ((vnfcName == null) ? 0 : vnfcName.hashCode());
+        result = prime * result + ((vserverId == null) ? 0 : vserverId.hashCode());
         return result;
     }
 
@@ -46,11 +48,41 @@ public class ActionIdentifier {
                 return false;
         } else if (!vnfId.equals(other.vnfId))
             return false;
+        if (vnfcName == null) {
+            if (other.vnfcName != null)
+                return false;
+        } else if (!vnfcName.equals(other.vnfcName))
+            return false;
+        if (vserverId == null) {
+            if (other.vserverId != null)
+                return false;
+        } else if (!vserverId.equals(other.vserverId))
+            return false;
         return true;
     }
 
     @JsonProperty("vnf-id")
     private String vnfId ;
+    @JsonProperty("vserver-id")
+    private String vserverId;
+    @JsonProperty("vnfc-name")
+    private String vnfcName;
+
+    public String getVserverId() {
+        return vserverId;
+    }
+
+    public void setVserverId(String vserverId) {
+        this.vserverId = vserverId;
+    }
+
+    public String getVnfcName() {
+        return vnfcName;
+    }
+
+    public void setVnfcName(String vnfcName) {
+        this.vnfcName = vnfcName;
+    }
 
     public String getVnfId() {
         return vnfId;
@@ -62,9 +94,7 @@ public class ActionIdentifier {
 
     @Override
     public String toString() {
-        return "ActionIdentifier [vnfId=" + vnfId + "]";
+        return "ActionIdentifier [vnfId=" + vnfId + ", vserverId=" + vserverId + ", vnfcName=" + vnfcName + "]";
     }
 
-    
-    
 }