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

5 files changed, 64 insertions, 64 deletions

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 682ba122..4d78f404 100644
--- 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;

 	private @Valid String resourceValue = null;

 	private @Valid String scopeId = null;

-	private @Valid String key = null;

+	private @Valid String vlanTagKey = null;

 	private @Valid String vlanType = null;

 

 

@@ -104,19 +104,19 @@ public class AssignVlanTagRequestInput {
 

 	/**

 	 **/

-	public AssignVlanTagRequestInput key(String key) {

-		this.key = key;

+	public AssignVlanTagRequestInput vlanTagKey(String vlanTagKey) {

+		this.vlanTagKey = vlanTagKey;

 		return this;

 	}

 

 	@ApiModelProperty(value = "")

-	@JsonProperty("key")

-	public String getKey() {

-		return key;

+	@JsonProperty("vlan-tag-key")

+	public String getVlanTagKey() {

+		return vlanTagKey;

 	}

 

-	public void setKey(String key) {

-		this.key = key;

+	public void setVlanTagKey(String vlanTagKey) {

+		this.vlanTagKey = vlanTagKey;

 	}

 

 	/**

@@ -149,13 +149,13 @@ public class AssignVlanTagRequestInput {
 				&& Objects.equals(resourceName, assignVlanTagRequestInput.resourceName)

 				&& Objects.equals(resourceValue, assignVlanTagRequestInput.resourceValue)

 				&& Objects.equals(scopeId, assignVlanTagRequestInput.scopeId)

-				&& Objects.equals(key, assignVlanTagRequestInput.key)

+				&& Objects.equals(vlanTagKey, assignVlanTagRequestInput.vlanTagKey)

 				&& Objects.equals(vlanType, assignVlanTagRequestInput.vlanType);

 	}

 

 	@Override

 	public int hashCode() {

-		return Objects.hash(policyInstanceName, resourceName, resourceValue, scopeId, key, vlanType);

+		return Objects.hash(policyInstanceName, resourceName, resourceValue, scopeId, vlanTagKey, vlanType);

 	}

 

 	@Override

@@ -167,7 +167,7 @@ public class AssignVlanTagRequestInput {
 		sb.append("    resourceName: ").append(toIndentedString(resourceName)).append("\n");

 		sb.append("    resourceValue: ").append(toIndentedString(resourceValue)).append("\n");

 		sb.append("    scopeId: ").append(toIndentedString(scopeId)).append("\n");

-		sb.append("    key: ").append(toIndentedString(key)).append("\n");

+		sb.append("    vlanTagKey: ").append(toIndentedString(vlanTagKey)).append("\n");

 		sb.append("    vlanType: ").append(toIndentedString(vlanType)).append("\n");

 		sb.append("}");

 		return sb.toString();

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 64cc9113..d0c272c5 100644
--- 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 {
 

 	private @Valid String policyInstanceName = null;

 	private @Valid String vlanType = null;

-	private @Valid String key = null;

+	private @Valid String vlanTagKey = null;

 

 	/**

 	 **/

@@ -71,19 +71,19 @@ public class UnassignVlanTagRequestInput {
 

 	/**

 	 **/

-	public UnassignVlanTagRequestInput key(String key) {

-		this.key = key;

+	public UnassignVlanTagRequestInput vlanTagKey(String vlanTagKey) {

+		this.vlanTagKey = vlanTagKey;

 		return this;

 	}

 

 	@ApiModelProperty(value = "")

-	@JsonProperty("key")

-	public String getKey() {

-		return key;

+	@JsonProperty("vlan-tag-key")

+	public String getVlanTagKey() {

+		return vlanTagKey;

 	}

 

-	public void setKey(String key) {

-		this.key = key;

+	public void setVlanTagKey(String vlanTagKey) {

+		this.vlanTagKey = vlanTagKey;

 	}

 

 	@Override

@@ -97,12 +97,12 @@ public class UnassignVlanTagRequestInput {
 		UnassignVlanTagRequestInput unassignVlanTagRequestInput = (UnassignVlanTagRequestInput) o;

 		return Objects.equals(policyInstanceName, unassignVlanTagRequestInput.policyInstanceName)

 				&& Objects.equals(vlanType, unassignVlanTagRequestInput.vlanType)

-				&& Objects.equals(key, unassignVlanTagRequestInput.key);

+				&& Objects.equals(vlanTagKey, unassignVlanTagRequestInput.vlanTagKey);

 	}

 

 	@Override

 	public int hashCode() {

-		return Objects.hash(policyInstanceName, vlanType, key);

+		return Objects.hash(policyInstanceName, vlanType, vlanTagKey);

 	}

 

 	@Override

@@ -112,7 +112,7 @@ public class UnassignVlanTagRequestInput {
 

 		sb.append("    policyInstanceName: ").append(toIndentedString(policyInstanceName)).append("\n");

 		sb.append("    vlanType: ").append(toIndentedString(vlanType)).append("\n");

-		sb.append("    key: ").append(toIndentedString(key)).append("\n");

+		sb.append("    vlanTagKey: ").append(toIndentedString(vlanTagKey)).append("\n");

 		sb.append("}");

 		return sb.toString();

 	}

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 65420b94..b7a0ff44 100644
--- 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;
  */

 public class UnassignVlanTagResponseOutput {

 	private @Valid String vlanType = null;

-	private @Valid String key = null;

+	private @Valid String vlanTagKey = null;

 	private @Valid String vlantagName = null;

 

 	/**

@@ -54,18 +54,18 @@ public class UnassignVlanTagResponseOutput {
 	/**

 	 **/

 	public UnassignVlanTagResponseOutput key(String key) {

-		this.key = key;

+		this.vlanTagKey = key;

 		return this;

 	}

 

 	@ApiModelProperty(value = "")

-	@JsonProperty("key")

-	public String getKey() {

-		return key;

+	@JsonProperty("vlan-tag-key")

+	public String getVlanTagKey() {

+		return vlanTagKey;

 	}

 

-	public void setKey(String key) {

-		this.key = key;

+	public void setVlanTagKey(String vlanTagKey) {

+		this.vlanTagKey = vlanTagKey;

 	}

 	

 	/**

@@ -97,13 +97,13 @@ public class UnassignVlanTagResponseOutput {
 		}

 		UnassignVlanTagResponseOutput unassignVlanTagResponseOutput = (UnassignVlanTagResponseOutput) o;

 		return Objects.equals(vlanType, unassignVlanTagResponseOutput.vlanType)

-				&& Objects.equals(key, unassignVlanTagResponseOutput.key)

+				&& Objects.equals(vlanTagKey, unassignVlanTagResponseOutput.vlanTagKey)

 				&& Objects.equals(vlantagName, unassignVlanTagResponseOutput.vlantagName);

 	}

 

 	@Override

 	public int hashCode() {

-		return Objects.hash(vlanType, key, vlantagName);

+		return Objects.hash(vlanType, vlanTagKey, vlantagName);

 	}

 

 	@Override

@@ -112,7 +112,7 @@ public class UnassignVlanTagResponseOutput {
 		sb.append("class UnassignVlanTagResponseOutput {\n");

 

 		sb.append("    vlanType: ").append(toIndentedString(vlanType)).append("\n");

-		sb.append("    key: ").append(toIndentedString(key)).append("\n");

+		sb.append("    vlanTagKey: ").append(toIndentedString(vlanTagKey)).append("\n");

 		sb.append("    vlantagName: ").append(toIndentedString(vlantagName)).append("\n");

 		sb.append("}");

 		return sb.toString();

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 3b79cdc1..358241eb 100644
--- 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 {

 		log.info("Preparing RA Objects for Vlan Type : " + input.getVlanType() + " and Element : "

 				+ element.getVlantagName());

-		re.resourceEntityId = input.getKey();

+		re.resourceEntityId = input.getVlanTagKey();

 		re.resourceEntityType = model.getKeyType() == null ? "DEFAULT" : model.getKeyType();

 		re.resourceEntityVersion = "1";

 

@@ -306,7 +306,7 @@ public class VlantagApiServiceImpl implements VlantagApiService {
 			if (input.getScopeId() == null || input.getScopeId().isEmpty())

 				throw new VlantagApiException("VlanTag Assign Request scope-id is null.");

 

-			if (input.getKey() == null || input.getKey().isEmpty())

+			if (input.getVlanTagKey() == null || input.getVlanTagKey().isEmpty())

 				throw new VlantagApiException("VlanTag Assign Request key is null.");

 		}

 

@@ -381,7 +381,7 @@ public class VlantagApiServiceImpl implements VlantagApiService {
 

                 UnassignVlanTagRequestInput input = new UnassignVlanTagRequestInput();

                 input.setVlanType(assignReqInput.getVlanType());

-                input.setKey(assignReqInput.getKey());

+                input.setVlanTagKey(assignReqInput.getVlanTagKey());

                 input.setPolicyInstanceName(assignReqInput.getPolicyInstanceName());

                 inputList.add(input);

             });

@@ -414,7 +414,7 @@ public class VlantagApiServiceImpl implements VlantagApiService {
 				for (Elements elements : model.getElements()) {

 

 					ResourceEntity re = new ResourceEntity();

-					re.resourceEntityId = input.getKey();

+					re.resourceEntityId = input.getVlanTagKey();

 					re.resourceEntityType = model.getKeyType() == null ? "DEFAULT" : model.getKeyType();

 					re.resourceEntityVersion = "1";

 

@@ -426,7 +426,7 @@ public class VlantagApiServiceImpl implements VlantagApiService {
 

 						if (AllocationStatus.Success.equals(status)) {

 							UnassignVlanTagResponseOutput ro = new UnassignVlanTagResponseOutput();

-							ro.setKey(input.getKey());

+							ro.setVlanTagKey(input.getVlanTagKey());

 							ro.setVlanType(input.getVlanType());

 							ro.setVlantagName(elements.getVlantagName());

 							output.add(ro);

@@ -520,7 +520,7 @@ public class VlantagApiServiceImpl implements VlantagApiService {
 			if (input.getVlanType() == null || input.getVlanType().isEmpty())

 				throw new VlantagApiException("VlanTag Unassign Request resource-name is null.");

 

-			if (input.getKey() == null || input.getKey().isEmpty())

+			if (input.getVlanTagKey() == null || input.getVlanTagKey().isEmpty())

 				throw new VlantagApiException("VlanTag Unassign Request key is null.");

 		}

 

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 c4c9f35f..4655d3d1 100644
--- 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");

 		input.setVlanType("vlan-id-outer");

 		input.setScopeId("some-scope-id");

-		input.setKey("some-key");

+		input.setVlanTagKey("some-key");

 		

 		AssignVlanTagRequest request = new AssignVlanTagRequest();

 		List<AssignVlanTagRequestInput> inputs = new ArrayList<>();

@@ -108,7 +108,7 @@ private static final Logger log = LoggerFactory.getLogger(TestVlantagApiServiceI
 		UnassignVlanTagRequestInput input = new UnassignVlanTagRequestInput();

 		input.setPolicyInstanceName("some-policy-instance");

 		input.setVlanType("vlan-id-outer");

-		input.setKey("some-key");

+		input.setVlanTagKey("some-key");

 		

 		UnassignVlanTagRequest request = new UnassignVlanTagRequest();

 		List<UnassignVlanTagRequestInput> inputs = new ArrayList<>();

@@ -167,7 +167,7 @@ private static final Logger log = LoggerFactory.getLogger(TestVlantagApiServiceI
 	public void test_resolveResourceElementValue_001() throws VlantagApiException {

 		

 		AssignVlanTagRequestInput input = new AssignVlanTagRequestInput();

-		input.setKey("some-key");

+		input.setVlanTagKey("some-key");

 		input.setPolicyInstanceName("some-policy-instance-name");

 		input.setVlanType("vlan-id-outer");

 		input.setResourceValue("[ 123, 123, 234 ]");

@@ -214,7 +214,7 @@ private static final Logger log = LoggerFactory.getLogger(TestVlantagApiServiceI
 	public void test_resolveResourceElementValue_002() throws VlantagApiException {

 		

 		AssignVlanTagRequestInput input = new AssignVlanTagRequestInput();

-		input.setKey("some-key");

+		input.setVlanTagKey("some-key");

 		input.setPolicyInstanceName("some-policy-instance-name");

 		input.setVlanType("vlan-id-outer");

 		input.setResourceValue("[ 123]");

@@ -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");

 		

 		AssignVlanTagRequestInput input = new AssignVlanTagRequestInput();

-		input.setKey("some-key");

+		input.setVlanTagKey("some-key");

 		input.setPolicyInstanceName("some-policy-instance-name");

 		input.setVlanType("vlan-id-outer");

 		input.setResourceValue("[ 123, 123, 234 ]");

@@ -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");

 		

 		AssignVlanTagRequestInput input = new AssignVlanTagRequestInput();

-		input.setKey("some-key");

+		input.setVlanTagKey("some-key");

 		input.setPolicyInstanceName("some-policy-instance-name");

 		input.setVlanType("vlan-id-outer");

 		input.setResourceValue("[ 123, 123, 234 ]");

@@ -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");

 		

 		AssignVlanTagRequestInput input = new AssignVlanTagRequestInput();

-		input.setKey("some-key");

+		input.setVlanTagKey("some-key");

 		input.setPolicyInstanceName("some-policy-instance-name");

 		input.setVlanType("vlan-id-outer");

 		input.setResourceValue("[ 123, 123, 234 ]");

@@ -330,7 +330,7 @@ private static final Logger log = LoggerFactory.getLogger(TestVlantagApiServiceI
 	public void test_validateElements_assign_Success_004() throws VlantagApiException {

 			

 		AssignVlanTagRequestInput input = new AssignVlanTagRequestInput();

-		input.setKey("some-key");

+		input.setVlanTagKey("some-key");

 		input.setPolicyInstanceName("some-policy-instance-name");

 		input.setVlanType("vlan-id-outer");

 		input.setResourceValue("[ 123, 123, 234 ]");

@@ -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");

 		

 		UnassignVlanTagRequestInput input = new UnassignVlanTagRequestInput();

-		input.setKey("some-key");

+		input.setVlanTagKey("some-key");

 		input.setPolicyInstanceName("some-policy-instance-name");

 		input.setVlanType("vlan-id-outer");

 		

@@ -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");

 		

 		UnassignVlanTagRequestInput input = new UnassignVlanTagRequestInput();

-		input.setKey("some-key");

+		input.setVlanTagKey("some-key");

 		input.setPolicyInstanceName("some-policy-instance-name");

 		input.setVlanType("vlan-id-outer");

 		

@@ -401,7 +401,7 @@ private static final Logger log = LoggerFactory.getLogger(TestVlantagApiServiceI
 	public void test_validateElements_unassign_Success_004() throws VlantagApiException {

 			

 		UnassignVlanTagRequestInput input = new UnassignVlanTagRequestInput();

-		input.setKey("some-key");

+		input.setVlanTagKey("some-key");

 		input.setPolicyInstanceName("some-policy-instance-name");

 		input.setVlanType("vlan-id-outer");

 		

@@ -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");

 		

 		AssignVlanTagRequestInput input = new AssignVlanTagRequestInput();

-		input.setKey("some-key");

+		input.setVlanTagKey("some-key");

 		input.setPolicyInstanceName("some-policy-instance-name");

 		input.setVlanType("vlan-id-outer");

 		input.setResourceValue("[ 123]");

@@ -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");

 		

 		AssignVlanTagRequestInput input = new AssignVlanTagRequestInput();

-		input.setKey("some-key");

+		input.setVlanTagKey("some-key");

 		input.setPolicyInstanceName("some-policy-instance-name");

 		input.setVlanType("vlan-id-outer");

 		input.setResourceValue("[ 123]");

@@ -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");

 		

 		AssignVlanTagRequestInput input = new AssignVlanTagRequestInput();

-		input.setKey("some-key");

+		input.setVlanTagKey("some-key");

 		input.setPolicyInstanceName("some-policy-instance-name");

 		input.setVlanType("vlan-id-outer");

 		input.setResourceValue("[ 123]");

@@ -484,7 +484,7 @@ private static final Logger log = LoggerFactory.getLogger(TestVlantagApiServiceI
 	public void test_validateModel_assign_success_004() throws VlantagApiException {

 		

 		AssignVlanTagRequestInput input = new AssignVlanTagRequestInput();

-		input.setKey("some-key");

+		input.setVlanTagKey("some-key");

 		input.setPolicyInstanceName("some-policy-instance-name");

 		input.setVlanType("vlan-id-outer");

 		input.setResourceValue("[ 123]");

@@ -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");

 		

 		UnassignVlanTagRequestInput input = new UnassignVlanTagRequestInput();

-		input.setKey("some-key");

+		input.setVlanTagKey("some-key");

 		input.setPolicyInstanceName("some-policy-instance-name");

 		input.setVlanType("vlan-id-outer");

 		

@@ -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");

 		

 		UnassignVlanTagRequestInput input = new UnassignVlanTagRequestInput();

-		input.setKey("some-key");

+		input.setVlanTagKey("some-key");

 		input.setPolicyInstanceName("some-policy-instance-name");

 		input.setVlanType("vlan-id-outer");		

 			

@@ -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");

 		

 		UnassignVlanTagRequestInput input = new UnassignVlanTagRequestInput();

-		input.setKey("some-key");

+		input.setVlanTagKey("some-key");

 		input.setPolicyInstanceName("some-policy-instance-name");

 		input.setVlanType("vlan-id-outer");		

 			

@@ -568,7 +568,7 @@ private static final Logger log = LoggerFactory.getLogger(TestVlantagApiServiceI
 	public void test_validateModel_unassign_success_004() throws VlantagApiException {

 		

 		UnassignVlanTagRequestInput input = new UnassignVlanTagRequestInput();

-		input.setKey("some-key");

+		input.setVlanTagKey("some-key");

 		input.setPolicyInstanceName("some-policy-instance-name");

 		input.setVlanType("vlan-id-outer");

 		

@@ -625,7 +625,7 @@ private static final Logger log = LoggerFactory.getLogger(TestVlantagApiServiceI
 		expectedEx.expectMessage("VlanTag Assign Request policy-instance-name is null.");

 		

 		AssignVlanTagRequestInput input = new AssignVlanTagRequestInput();

-		input.setKey("some-key");

+		input.setVlanTagKey("some-key");

 		input.setVlanType("vlan-id-outer");

 		input.setResourceValue("[ 123]");

 		input.setScopeId("scope-id");

@@ -647,7 +647,7 @@ private static final Logger log = LoggerFactory.getLogger(TestVlantagApiServiceI
 		expectedEx.expectMessage("VlanTag Assign Request vlan-type is null.");

 		

 		AssignVlanTagRequestInput input = new AssignVlanTagRequestInput();

-		input.setKey("some-key");

+		input.setVlanTagKey("some-key");

 		input.setPolicyInstanceName("some-policy-instance");

 		input.setResourceValue("[ 123]");

 		input.setScopeId("scope-id");

@@ -668,7 +668,7 @@ private static final Logger log = LoggerFactory.getLogger(TestVlantagApiServiceI
 		expectedEx.expectMessage("VlanTag Assign Request scope-id is null.");

 		

 		AssignVlanTagRequestInput input = new AssignVlanTagRequestInput();

-		input.setKey("some-key");

+		input.setVlanTagKey("some-key");

 		input.setPolicyInstanceName("some-policy-instance");

 		input.setVlanType("vlan-id-outer");

 		input.setResourceValue("[ 123]");

@@ -714,7 +714,7 @@ private static final Logger log = LoggerFactory.getLogger(TestVlantagApiServiceI
 		input.setScopeId("scope-id");

 		input.setResourceValue("[ 123]");

 		input.setVlanType("vlan-type");

-		input.setKey("some-key");

+		input.setVlanTagKey("some-key");

 		

 		AssignVlanTagRequest request = new AssignVlanTagRequest();

 		List<AssignVlanTagRequestInput> inputs = new ArrayList<>();

@@ -753,7 +753,7 @@ private static final Logger log = LoggerFactory.getLogger(TestVlantagApiServiceI
 		expectedEx.expectMessage("VlanTag Unassign Request policy-instance-name is null.");

 		

 		UnassignVlanTagRequestInput input = new UnassignVlanTagRequestInput();

-		input.setKey("some-key");

+		input.setVlanTagKey("some-key");

 		input.setVlanType("vlan-id-outer");

 		

 		UnassignVlanTagRequest request = new UnassignVlanTagRequest();

@@ -772,7 +772,7 @@ private static final Logger log = LoggerFactory.getLogger(TestVlantagApiServiceI
 		expectedEx.expectMessage("VlanTag Unassign Request resource-name is null.");

 		

 		UnassignVlanTagRequestInput input = new UnassignVlanTagRequestInput();

-		input.setKey("some-key");

+		input.setVlanTagKey("some-key");

 		input.setPolicyInstanceName("some-policy-instance");

 		

 		UnassignVlanTagRequest request = new UnassignVlanTagRequest();

@@ -808,7 +808,7 @@ private static final Logger log = LoggerFactory.getLogger(TestVlantagApiServiceI
 	public void test_validateRequest_unassign_success_006() throws VlantagApiException {

 		

 		UnassignVlanTagRequestInput input = new UnassignVlanTagRequestInput();

-		input.setKey("some-key");

+		input.setVlanTagKey("some-key");

 		input.setPolicyInstanceName("some-policy-instance");

 		input.setVlanType("vlan-id-outer");