Change Vlantag Api input param key to vlan-tag-key

Changing the Vlantag Api input param key to vlan-tag-key.

Change-Id: Ie1c18e25a6abe8dde931021c6d86dbca7beef976
Issue-ID: CCSDK-485
Signed-off-by: Paira, Saurav (sp694w) sp694w@att.com <sp694w@att.com>

diff --git a/ms/vlantag-api/src/main/java/org/onap/ccsdk/apps/ms/vlantagapi/core/model/AssignVlanTagRequestInput.java b/ms/vlantag-api/src/main/java/org/onap/ccsdk/apps/ms/vlantagapi/core/model/AssignVlanTagRequestInput.java
index 682ba12..4d78f40 100644 (file)
--- a/ms/vlantag-api/src/main/java/org/onap/ccsdk/apps/ms/vlantagapi/core/model/AssignVlanTagRequestInput.java
+++ b/ms/vlantag-api/src/main/java/org/onap/ccsdk/apps/ms/vlantagapi/core/model/AssignVlanTagRequestInput.java
@@ -32,7 +32,7 @@ public class AssignVlanTagRequestInput {
        private @Valid String resourceName = null;\r
        private @Valid String resourceValue = null;\r
        private @Valid String scopeId = null;\r
-       private @Valid String key = null;\r
+       private @Valid String vlanTagKey = null;\r
        private @Valid String vlanType = null;\r
 \r
 \r
@@ -104,19 +104,19 @@ public class AssignVlanTagRequestInput {
 \r
        /**\r
         **/\r
-       public AssignVlanTagRequestInput key(String key) {\r
-               this.key = key;\r
+       public AssignVlanTagRequestInput vlanTagKey(String vlanTagKey) {\r
+               this.vlanTagKey = vlanTagKey;\r
                return this;\r
        }\r
 \r
        @ApiModelProperty(value = "")\r
-       @JsonProperty("key")\r
-       public String getKey() {\r
-               return key;\r
+       @JsonProperty("vlan-tag-key")\r
+       public String getVlanTagKey() {\r
+               return vlanTagKey;\r
        }\r
 \r
-       public void setKey(String key) {\r
-               this.key = key;\r
+       public void setVlanTagKey(String vlanTagKey) {\r
+               this.vlanTagKey = vlanTagKey;\r
        }\r
 \r
        /**\r
@@ -149,13 +149,13 @@ public class AssignVlanTagRequestInput {
                                && Objects.equals(resourceName, assignVlanTagRequestInput.resourceName)\r
                                && Objects.equals(resourceValue, assignVlanTagRequestInput.resourceValue)\r
                                && Objects.equals(scopeId, assignVlanTagRequestInput.scopeId)\r
-                               && Objects.equals(key, assignVlanTagRequestInput.key)\r
+                               && Objects.equals(vlanTagKey, assignVlanTagRequestInput.vlanTagKey)\r
                                && Objects.equals(vlanType, assignVlanTagRequestInput.vlanType);\r
        }\r
 \r
        @Override\r
        public int hashCode() {\r
-               return Objects.hash(policyInstanceName, resourceName, resourceValue, scopeId, key, vlanType);\r
+               return Objects.hash(policyInstanceName, resourceName, resourceValue, scopeId, vlanTagKey, vlanType);\r
        }\r
 \r
        @Override\r
@@ -167,7 +167,7 @@ public class AssignVlanTagRequestInput {
                sb.append("    resourceName: ").append(toIndentedString(resourceName)).append("\n");\r
                sb.append("    resourceValue: ").append(toIndentedString(resourceValue)).append("\n");\r
                sb.append("    scopeId: ").append(toIndentedString(scopeId)).append("\n");\r
-               sb.append("    key: ").append(toIndentedString(key)).append("\n");\r
+               sb.append("    vlanTagKey: ").append(toIndentedString(vlanTagKey)).append("\n");\r
                sb.append("    vlanType: ").append(toIndentedString(vlanType)).append("\n");\r
                sb.append("}");\r
                return sb.toString();\r

diff --git a/ms/vlantag-api/src/main/java/org/onap/ccsdk/apps/ms/vlantagapi/core/model/UnassignVlanTagRequestInput.java b/ms/vlantag-api/src/main/java/org/onap/ccsdk/apps/ms/vlantagapi/core/model/UnassignVlanTagRequestInput.java
index 64cc911..d0c272c 100644 (file)
--- a/ms/vlantag-api/src/main/java/org/onap/ccsdk/apps/ms/vlantagapi/core/model/UnassignVlanTagRequestInput.java
+++ b/ms/vlantag-api/src/main/java/org/onap/ccsdk/apps/ms/vlantagapi/core/model/UnassignVlanTagRequestInput.java
@@ -33,7 +33,7 @@ public class UnassignVlanTagRequestInput {
 \r
        private @Valid String policyInstanceName = null;\r
        private @Valid String vlanType = null;\r
-       private @Valid String key = null;\r
+       private @Valid String vlanTagKey = null;\r
 \r
        /**\r
         **/\r
@@ -71,19 +71,19 @@ public class UnassignVlanTagRequestInput {
 \r
        /**\r
         **/\r
-       public UnassignVlanTagRequestInput key(String key) {\r
-               this.key = key;\r
+       public UnassignVlanTagRequestInput vlanTagKey(String vlanTagKey) {\r
+               this.vlanTagKey = vlanTagKey;\r
                return this;\r
        }\r
 \r
        @ApiModelProperty(value = "")\r
-       @JsonProperty("key")\r
-       public String getKey() {\r
-               return key;\r
+       @JsonProperty("vlan-tag-key")\r
+       public String getVlanTagKey() {\r
+               return vlanTagKey;\r
        }\r
 \r
-       public void setKey(String key) {\r
-               this.key = key;\r
+       public void setVlanTagKey(String vlanTagKey) {\r
+               this.vlanTagKey = vlanTagKey;\r
        }\r
 \r
        @Override\r
@@ -97,12 +97,12 @@ public class UnassignVlanTagRequestInput {
                UnassignVlanTagRequestInput unassignVlanTagRequestInput = (UnassignVlanTagRequestInput) o;\r
                return Objects.equals(policyInstanceName, unassignVlanTagRequestInput.policyInstanceName)\r
                                && Objects.equals(vlanType, unassignVlanTagRequestInput.vlanType)\r
-                               && Objects.equals(key, unassignVlanTagRequestInput.key);\r
+                               && Objects.equals(vlanTagKey, unassignVlanTagRequestInput.vlanTagKey);\r
        }\r
 \r
        @Override\r
        public int hashCode() {\r
-               return Objects.hash(policyInstanceName, vlanType, key);\r
+               return Objects.hash(policyInstanceName, vlanType, vlanTagKey);\r
        }\r
 \r
        @Override\r
@@ -112,7 +112,7 @@ public class UnassignVlanTagRequestInput {
 \r
                sb.append("    policyInstanceName: ").append(toIndentedString(policyInstanceName)).append("\n");\r
                sb.append("    vlanType: ").append(toIndentedString(vlanType)).append("\n");\r
-               sb.append("    key: ").append(toIndentedString(key)).append("\n");\r
+               sb.append("    vlanTagKey: ").append(toIndentedString(vlanTagKey)).append("\n");\r
                sb.append("}");\r
                return sb.toString();\r
        }\r

diff --git a/ms/vlantag-api/src/main/java/org/onap/ccsdk/apps/ms/vlantagapi/core/model/UnassignVlanTagResponseOutput.java b/ms/vlantag-api/src/main/java/org/onap/ccsdk/apps/ms/vlantagapi/core/model/UnassignVlanTagResponseOutput.java
index 65420b9..b7a0ff4 100644 (file)
--- a/ms/vlantag-api/src/main/java/org/onap/ccsdk/apps/ms/vlantagapi/core/model/UnassignVlanTagResponseOutput.java
+++ b/ms/vlantag-api/src/main/java/org/onap/ccsdk/apps/ms/vlantagapi/core/model/UnassignVlanTagResponseOutput.java
@@ -31,7 +31,7 @@ import io.swagger.annotations.ApiModelProperty;
  */\r
 public class UnassignVlanTagResponseOutput {\r
        private @Valid String vlanType = null;\r
-       private @Valid String key = null;\r
+       private @Valid String vlanTagKey = null;\r
        private @Valid String vlantagName = null;\r
 \r
        /**\r
@@ -54,18 +54,18 @@ public class UnassignVlanTagResponseOutput {
        /**\r
         **/\r
        public UnassignVlanTagResponseOutput key(String key) {\r
-               this.key = key;\r
+               this.vlanTagKey = key;\r
                return this;\r
        }\r
 \r
        @ApiModelProperty(value = "")\r
-       @JsonProperty("key")\r
-       public String getKey() {\r
-               return key;\r
+       @JsonProperty("vlan-tag-key")\r
+       public String getVlanTagKey() {\r
+               return vlanTagKey;\r
        }\r
 \r
-       public void setKey(String key) {\r
-               this.key = key;\r
+       public void setVlanTagKey(String vlanTagKey) {\r
+               this.vlanTagKey = vlanTagKey;\r
        }\r
        \r
        /**\r
@@ -97,13 +97,13 @@ public class UnassignVlanTagResponseOutput {
                }\r
                UnassignVlanTagResponseOutput unassignVlanTagResponseOutput = (UnassignVlanTagResponseOutput) o;\r
                return Objects.equals(vlanType, unassignVlanTagResponseOutput.vlanType)\r
-                               && Objects.equals(key, unassignVlanTagResponseOutput.key)\r
+                               && Objects.equals(vlanTagKey, unassignVlanTagResponseOutput.vlanTagKey)\r
                                && Objects.equals(vlantagName, unassignVlanTagResponseOutput.vlantagName);\r
        }\r
 \r
        @Override\r
        public int hashCode() {\r
-               return Objects.hash(vlanType, key, vlantagName);\r
+               return Objects.hash(vlanType, vlanTagKey, vlantagName);\r
        }\r
 \r
        @Override\r
@@ -112,7 +112,7 @@ public class UnassignVlanTagResponseOutput {
                sb.append("class UnassignVlanTagResponseOutput {\n");\r
 \r
                sb.append("    vlanType: ").append(toIndentedString(vlanType)).append("\n");\r
-               sb.append("    key: ").append(toIndentedString(key)).append("\n");\r
+               sb.append("    vlanTagKey: ").append(toIndentedString(vlanTagKey)).append("\n");\r
                sb.append("    vlantagName: ").append(toIndentedString(vlantagName)).append("\n");\r
                sb.append("}");\r
                return sb.toString();\r

diff --git a/ms/vlantag-api/src/main/java/org/onap/ccsdk/apps/ms/vlantagapi/core/service/VlantagApiServiceImpl.java b/ms/vlantag-api/src/main/java/org/onap/ccsdk/apps/ms/vlantagapi/core/service/VlantagApiServiceImpl.java
index 3b79cdc..358241e 100644 (file)
--- a/ms/vlantag-api/src/main/java/org/onap/ccsdk/apps/ms/vlantagapi/core/service/VlantagApiServiceImpl.java
+++ b/ms/vlantag-api/src/main/java/org/onap/ccsdk/apps/ms/vlantagapi/core/service/VlantagApiServiceImpl.java
@@ -151,7 +151,7 @@ public class VlantagApiServiceImpl implements VlantagApiService {
                        ResourceEntity re, ResourceTarget rt, ResourceRequest rr) throws VlantagApiException {\r
                log.info("Preparing RA Objects for Vlan Type : " + input.getVlanType() + " and Element : "\r
                                + element.getVlantagName());\r
-               re.resourceEntityId = input.getKey();\r
+               re.resourceEntityId = input.getVlanTagKey();\r
                re.resourceEntityType = model.getKeyType() == null ? "DEFAULT" : model.getKeyType();\r
                re.resourceEntityVersion = "1";\r
 \r
@@ -306,7 +306,7 @@ public class VlantagApiServiceImpl implements VlantagApiService {
                        if (input.getScopeId() == null || input.getScopeId().isEmpty())\r
                                throw new VlantagApiException("VlanTag Assign Request scope-id is null.");\r
 \r
-                       if (input.getKey() == null || input.getKey().isEmpty())\r
+                       if (input.getVlanTagKey() == null || input.getVlanTagKey().isEmpty())\r
                                throw new VlantagApiException("VlanTag Assign Request key is null.");\r
                }\r
 \r
@@ -381,7 +381,7 @@ public class VlantagApiServiceImpl implements VlantagApiService {
 \r
                 UnassignVlanTagRequestInput input = new UnassignVlanTagRequestInput();\r
                 input.setVlanType(assignReqInput.getVlanType());\r
-                input.setKey(assignReqInput.getKey());\r
+                input.setVlanTagKey(assignReqInput.getVlanTagKey());\r
                 input.setPolicyInstanceName(assignReqInput.getPolicyInstanceName());\r
                 inputList.add(input);\r
             });\r
@@ -414,7 +414,7 @@ public class VlantagApiServiceImpl implements VlantagApiService {
                                for (Elements elements : model.getElements()) {\r
 \r
                                        ResourceEntity re = new ResourceEntity();\r
-                                       re.resourceEntityId = input.getKey();\r
+                                       re.resourceEntityId = input.getVlanTagKey();\r
                                        re.resourceEntityType = model.getKeyType() == null ? "DEFAULT" : model.getKeyType();\r
                                        re.resourceEntityVersion = "1";\r
 \r
@@ -426,7 +426,7 @@ public class VlantagApiServiceImpl implements VlantagApiService {
 \r
                                                if (AllocationStatus.Success.equals(status)) {\r
                                                        UnassignVlanTagResponseOutput ro = new UnassignVlanTagResponseOutput();\r
-                                                       ro.setKey(input.getKey());\r
+                                                       ro.setVlanTagKey(input.getVlanTagKey());\r
                                                        ro.setVlanType(input.getVlanType());\r
                                                        ro.setVlantagName(elements.getVlantagName());\r
                                                        output.add(ro);\r
@@ -520,7 +520,7 @@ public class VlantagApiServiceImpl implements VlantagApiService {
                        if (input.getVlanType() == null || input.getVlanType().isEmpty())\r
                                throw new VlantagApiException("VlanTag Unassign Request resource-name is null.");\r
 \r
-                       if (input.getKey() == null || input.getKey().isEmpty())\r
+                       if (input.getVlanTagKey() == null || input.getVlanTagKey().isEmpty())\r
                                throw new VlantagApiException("VlanTag Unassign Request key is null.");\r
                }\r
 \r

diff --git a/ms/vlantag-api/src/test/java/org/onap/ccsdk/apps/ms/vlantagapi/core/service/TestVlantagApiServiceImpl.java b/ms/vlantag-api/src/test/java/org/onap/ccsdk/apps/ms/vlantagapi/core/service/TestVlantagApiServiceImpl.java
index c4c9f35..4655d3d 100644 (file)
--- a/ms/vlantag-api/src/test/java/org/onap/ccsdk/apps/ms/vlantagapi/core/service/TestVlantagApiServiceImpl.java
+++ b/ms/vlantag-api/src/test/java/org/onap/ccsdk/apps/ms/vlantagapi/core/service/TestVlantagApiServiceImpl.java
@@ -89,7 +89,7 @@ private static final Logger log = LoggerFactory.getLogger(TestVlantagApiServiceI
                input.setPolicyInstanceName("some-policy-instance");\r
                input.setVlanType("vlan-id-outer");\r
                input.setScopeId("some-scope-id");\r
-               input.setKey("some-key");\r
+               input.setVlanTagKey("some-key");\r
                \r
                AssignVlanTagRequest request = new AssignVlanTagRequest();\r
                List<AssignVlanTagRequestInput> inputs = new ArrayList<>();\r
@@ -108,7 +108,7 @@ private static final Logger log = LoggerFactory.getLogger(TestVlantagApiServiceI
                UnassignVlanTagRequestInput input = new UnassignVlanTagRequestInput();\r
                input.setPolicyInstanceName("some-policy-instance");\r
                input.setVlanType("vlan-id-outer");\r
-               input.setKey("some-key");\r
+               input.setVlanTagKey("some-key");\r
                \r
                UnassignVlanTagRequest request = new UnassignVlanTagRequest();\r
                List<UnassignVlanTagRequestInput> inputs = new ArrayList<>();\r
@@ -167,7 +167,7 @@ private static final Logger log = LoggerFactory.getLogger(TestVlantagApiServiceI
        public void test_resolveResourceElementValue_001() throws VlantagApiException {\r
                \r
                AssignVlanTagRequestInput input = new AssignVlanTagRequestInput();\r
-               input.setKey("some-key");\r
+               input.setVlanTagKey("some-key");\r
                input.setPolicyInstanceName("some-policy-instance-name");\r
                input.setVlanType("vlan-id-outer");\r
                input.setResourceValue("[ 123, 123, 234 ]");\r
@@ -214,7 +214,7 @@ private static final Logger log = LoggerFactory.getLogger(TestVlantagApiServiceI
        public void test_resolveResourceElementValue_002() throws VlantagApiException {\r
                \r
                AssignVlanTagRequestInput input = new AssignVlanTagRequestInput();\r
-               input.setKey("some-key");\r
+               input.setVlanTagKey("some-key");\r
                input.setPolicyInstanceName("some-policy-instance-name");\r
                input.setVlanType("vlan-id-outer");\r
                input.setResourceValue("[ 123]");\r
@@ -263,7 +263,7 @@ private static final Logger log = LoggerFactory.getLogger(TestVlantagApiServiceI
                expectedEx.expectMessage("Vlantag Name missing for Element in Resource Model Policy for Vlan Type : vlan-id-outer");\r
                \r
                AssignVlanTagRequestInput input = new AssignVlanTagRequestInput();\r
-               input.setKey("some-key");\r
+               input.setVlanTagKey("some-key");\r
                input.setPolicyInstanceName("some-policy-instance-name");\r
                input.setVlanType("vlan-id-outer");\r
                input.setResourceValue("[ 123, 123, 234 ]");\r
@@ -288,7 +288,7 @@ private static final Logger log = LoggerFactory.getLogger(TestVlantagApiServiceI
                expectedEx.expectMessage("Allowed Ranges missing for Element in Resource Model Policy for Vlan Type : vlan-id-outer");\r
                \r
                AssignVlanTagRequestInput input = new AssignVlanTagRequestInput();\r
-               input.setKey("some-key");\r
+               input.setVlanTagKey("some-key");\r
                input.setPolicyInstanceName("some-policy-instance-name");\r
                input.setVlanType("vlan-id-outer");\r
                input.setResourceValue("[ 123, 123, 234 ]");\r
@@ -314,7 +314,7 @@ private static final Logger log = LoggerFactory.getLogger(TestVlantagApiServiceI
                expectedEx.expectMessage("No Vlantag Elements found in Resource Model Policy for Vlan Type : vlan-id-outer");\r
                \r
                AssignVlanTagRequestInput input = new AssignVlanTagRequestInput();\r
-               input.setKey("some-key");\r
+               input.setVlanTagKey("some-key");\r
                input.setPolicyInstanceName("some-policy-instance-name");\r
                input.setVlanType("vlan-id-outer");\r
                input.setResourceValue("[ 123, 123, 234 ]");\r
@@ -330,7 +330,7 @@ private static final Logger log = LoggerFactory.getLogger(TestVlantagApiServiceI
        public void test_validateElements_assign_Success_004() throws VlantagApiException {\r
                        \r
                AssignVlanTagRequestInput input = new AssignVlanTagRequestInput();\r
-               input.setKey("some-key");\r
+               input.setVlanTagKey("some-key");\r
                input.setPolicyInstanceName("some-policy-instance-name");\r
                input.setVlanType("vlan-id-outer");\r
                input.setResourceValue("[ 123, 123, 234 ]");\r
@@ -363,7 +363,7 @@ private static final Logger log = LoggerFactory.getLogger(TestVlantagApiServiceI
                expectedEx.expectMessage("Vlantag Name missing for Element in Resource Model Policy for Vlan Type : vlan-id-outer");\r
                \r
                UnassignVlanTagRequestInput input = new UnassignVlanTagRequestInput();\r
-               input.setKey("some-key");\r
+               input.setVlanTagKey("some-key");\r
                input.setPolicyInstanceName("some-policy-instance-name");\r
                input.setVlanType("vlan-id-outer");\r
                \r
@@ -386,7 +386,7 @@ private static final Logger log = LoggerFactory.getLogger(TestVlantagApiServiceI
                expectedEx.expectMessage("No Vlantag Elements found in Resource Model Policy for Vlan Type : vlan-id-outer");\r
                \r
                UnassignVlanTagRequestInput input = new UnassignVlanTagRequestInput();\r
-               input.setKey("some-key");\r
+               input.setVlanTagKey("some-key");\r
                input.setPolicyInstanceName("some-policy-instance-name");\r
                input.setVlanType("vlan-id-outer");\r
                \r
@@ -401,7 +401,7 @@ private static final Logger log = LoggerFactory.getLogger(TestVlantagApiServiceI
        public void test_validateElements_unassign_Success_004() throws VlantagApiException {\r
                        \r
                UnassignVlanTagRequestInput input = new UnassignVlanTagRequestInput();\r
-               input.setKey("some-key");\r
+               input.setVlanTagKey("some-key");\r
                input.setPolicyInstanceName("some-policy-instance-name");\r
                input.setVlanType("vlan-id-outer");\r
                \r
@@ -432,7 +432,7 @@ private static final Logger log = LoggerFactory.getLogger(TestVlantagApiServiceI
                expectedEx.expectMessage("No Matching Policy Resource Model found for Vlan Type : vlan-id-outer");\r
                \r
                AssignVlanTagRequestInput input = new AssignVlanTagRequestInput();\r
-               input.setKey("some-key");\r
+               input.setVlanTagKey("some-key");\r
                input.setPolicyInstanceName("some-policy-instance-name");\r
                input.setVlanType("vlan-id-outer");\r
                input.setResourceValue("[ 123]");\r
@@ -448,7 +448,7 @@ private static final Logger log = LoggerFactory.getLogger(TestVlantagApiServiceI
                expectedEx.expectMessage("Resource Resolution Recipe is null in Resource Model for Vlan Type : vlan-id-outer");\r
                \r
                AssignVlanTagRequestInput input = new AssignVlanTagRequestInput();\r
-               input.setKey("some-key");\r
+               input.setVlanTagKey("some-key");\r
                input.setPolicyInstanceName("some-policy-instance-name");\r
                input.setVlanType("vlan-id-outer");\r
                input.setResourceValue("[ 123]");\r
@@ -467,7 +467,7 @@ private static final Logger log = LoggerFactory.getLogger(TestVlantagApiServiceI
                expectedEx.expectMessage("Scope is null in Resource Model for Vlan Type : vlan-id-outer");\r
                \r
                AssignVlanTagRequestInput input = new AssignVlanTagRequestInput();\r
-               input.setKey("some-key");\r
+               input.setVlanTagKey("some-key");\r
                input.setPolicyInstanceName("some-policy-instance-name");\r
                input.setVlanType("vlan-id-outer");\r
                input.setResourceValue("[ 123]");\r
@@ -484,7 +484,7 @@ private static final Logger log = LoggerFactory.getLogger(TestVlantagApiServiceI
        public void test_validateModel_assign_success_004() throws VlantagApiException {\r
                \r
                AssignVlanTagRequestInput input = new AssignVlanTagRequestInput();\r
-               input.setKey("some-key");\r
+               input.setVlanTagKey("some-key");\r
                input.setPolicyInstanceName("some-policy-instance-name");\r
                input.setVlanType("vlan-id-outer");\r
                input.setResourceValue("[ 123]");\r
@@ -522,7 +522,7 @@ private static final Logger log = LoggerFactory.getLogger(TestVlantagApiServiceI
                expectedEx.expectMessage("No Matching Policy Resource Model found for Vlan Type : vlan-id-outer");\r
                \r
                UnassignVlanTagRequestInput input = new UnassignVlanTagRequestInput();\r
-               input.setKey("some-key");\r
+               input.setVlanTagKey("some-key");\r
                input.setPolicyInstanceName("some-policy-instance-name");\r
                input.setVlanType("vlan-id-outer");\r
                \r
@@ -536,7 +536,7 @@ private static final Logger log = LoggerFactory.getLogger(TestVlantagApiServiceI
                expectedEx.expectMessage("Resource Resolution Recipe is null in Resource Model for Vlan Type : vlan-id-outer");\r
                \r
                UnassignVlanTagRequestInput input = new UnassignVlanTagRequestInput();\r
-               input.setKey("some-key");\r
+               input.setVlanTagKey("some-key");\r
                input.setPolicyInstanceName("some-policy-instance-name");\r
                input.setVlanType("vlan-id-outer");             \r
                        \r
@@ -553,7 +553,7 @@ private static final Logger log = LoggerFactory.getLogger(TestVlantagApiServiceI
                expectedEx.expectMessage("Scope is null in Resource Model for Vlan Type : vlan-id-outer");\r
                \r
                UnassignVlanTagRequestInput input = new UnassignVlanTagRequestInput();\r
-               input.setKey("some-key");\r
+               input.setVlanTagKey("some-key");\r
                input.setPolicyInstanceName("some-policy-instance-name");\r
                input.setVlanType("vlan-id-outer");             \r
                        \r
@@ -568,7 +568,7 @@ private static final Logger log = LoggerFactory.getLogger(TestVlantagApiServiceI
        public void test_validateModel_unassign_success_004() throws VlantagApiException {\r
                \r
                UnassignVlanTagRequestInput input = new UnassignVlanTagRequestInput();\r
-               input.setKey("some-key");\r
+               input.setVlanTagKey("some-key");\r
                input.setPolicyInstanceName("some-policy-instance-name");\r
                input.setVlanType("vlan-id-outer");\r
                \r
@@ -625,7 +625,7 @@ private static final Logger log = LoggerFactory.getLogger(TestVlantagApiServiceI
                expectedEx.expectMessage("VlanTag Assign Request policy-instance-name is null.");\r
                \r
                AssignVlanTagRequestInput input = new AssignVlanTagRequestInput();\r
-               input.setKey("some-key");\r
+               input.setVlanTagKey("some-key");\r
                input.setVlanType("vlan-id-outer");\r
                input.setResourceValue("[ 123]");\r
                input.setScopeId("scope-id");\r
@@ -647,7 +647,7 @@ private static final Logger log = LoggerFactory.getLogger(TestVlantagApiServiceI
                expectedEx.expectMessage("VlanTag Assign Request vlan-type is null.");\r
                \r
                AssignVlanTagRequestInput input = new AssignVlanTagRequestInput();\r
-               input.setKey("some-key");\r
+               input.setVlanTagKey("some-key");\r
                input.setPolicyInstanceName("some-policy-instance");\r
                input.setResourceValue("[ 123]");\r
                input.setScopeId("scope-id");\r
@@ -668,7 +668,7 @@ private static final Logger log = LoggerFactory.getLogger(TestVlantagApiServiceI
                expectedEx.expectMessage("VlanTag Assign Request scope-id is null.");\r
                \r
                AssignVlanTagRequestInput input = new AssignVlanTagRequestInput();\r
-               input.setKey("some-key");\r
+               input.setVlanTagKey("some-key");\r
                input.setPolicyInstanceName("some-policy-instance");\r
                input.setVlanType("vlan-id-outer");\r
                input.setResourceValue("[ 123]");\r
@@ -714,7 +714,7 @@ private static final Logger log = LoggerFactory.getLogger(TestVlantagApiServiceI
                input.setScopeId("scope-id");\r
                input.setResourceValue("[ 123]");\r
                input.setVlanType("vlan-type");\r
-               input.setKey("some-key");\r
+               input.setVlanTagKey("some-key");\r
                \r
                AssignVlanTagRequest request = new AssignVlanTagRequest();\r
                List<AssignVlanTagRequestInput> inputs = new ArrayList<>();\r
@@ -753,7 +753,7 @@ private static final Logger log = LoggerFactory.getLogger(TestVlantagApiServiceI
                expectedEx.expectMessage("VlanTag Unassign Request policy-instance-name is null.");\r
                \r
                UnassignVlanTagRequestInput input = new UnassignVlanTagRequestInput();\r
-               input.setKey("some-key");\r
+               input.setVlanTagKey("some-key");\r
                input.setVlanType("vlan-id-outer");\r
                \r
                UnassignVlanTagRequest request = new UnassignVlanTagRequest();\r
@@ -772,7 +772,7 @@ private static final Logger log = LoggerFactory.getLogger(TestVlantagApiServiceI
                expectedEx.expectMessage("VlanTag Unassign Request resource-name is null.");\r
                \r
                UnassignVlanTagRequestInput input = new UnassignVlanTagRequestInput();\r
-               input.setKey("some-key");\r
+               input.setVlanTagKey("some-key");\r
                input.setPolicyInstanceName("some-policy-instance");\r
                \r
                UnassignVlanTagRequest request = new UnassignVlanTagRequest();\r
@@ -808,7 +808,7 @@ private static final Logger log = LoggerFactory.getLogger(TestVlantagApiServiceI
        public void test_validateRequest_unassign_success_006() throws VlantagApiException {\r
                \r
                UnassignVlanTagRequestInput input = new UnassignVlanTagRequestInput();\r
-               input.setKey("some-key");\r
+               input.setVlanTagKey("some-key");\r
                input.setPolicyInstanceName("some-policy-instance");\r
                input.setVlanType("vlan-id-outer");\r
                \r