Cleanup of A&AI message model module.

Fields have been made fields private in POJOs, and wrote JUnit unit tests to bring up code coverage. AAIManager also changed to use non-static methods so that it can be stubbed with Mockito.

Change-Id: I871427ced5db8a1dfd6495fef4e6d84adf264e65
Signed-off-by: Liam Fallon <liam.fallon@ericsson.com>
Issue-ID: POLICY-455
Signed-off-by: Liam Fallon <liam.fallon@ericsson.com>

29 files changed, 957 insertions, 263 deletions

diff --git a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAIGETResponse.java b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAIGETResponse.java
index ac6e38deb..ef205cfea 100644
--- a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAIGETResponse.java
+++ b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAIGETResponse.java
@@ -32,20 +32,69 @@ public class AAIGETResponse implements Serializable {
 	private static final long serialVersionUID = 7311418432051756161L;
 	
 	@SerializedName("in-maint")
-	public String inMaint;
+	private String inMaint;
  
 	@SerializedName("is-closed-loop-disabled")
-	public String isClosedLoopDisabled;
+	private String isClosedLoopDisabled;
 	
 	@SerializedName("model-invariant-id")
-	public String modelInvariantId;
+	private String modelInvariantId;
 	
 	@SerializedName("resource-version")
-	public String resourceVersion; 
+	private String resourceVersion; 
 	
 	@SerializedName("relationship-list")
-	public RelationshipList relationshipList;
+	private RelationshipList relationshipList;
 	
 	@SerializedName("requestError")
-	public AAINQRequestError requestError;
+	private AAINQRequestError requestError;
+
+	public String getInMaint() {
+		return inMaint;
+	}
+
+	public String getIsClosedLoopDisabled() {
+		return isClosedLoopDisabled;
+	}
+
+	public String getModelInvariantId() {
+		return modelInvariantId;
+	}
+
+	public String getResourceVersion() {
+		return resourceVersion;
+	}
+
+	public RelationshipList getRelationshipList() {
+		return relationshipList;
+	}
+
+	public AAINQRequestError getRequestError() {
+		return requestError;
+	}
+
+	public void setInMaint(String inMaint) {
+		this.inMaint = inMaint;
+	}
+
+	public void setIsClosedLoopDisabled(String isClosedLoopDisabled) {
+		this.isClosedLoopDisabled = isClosedLoopDisabled;
+	}
+
+	public void setModelInvariantId(String modelInvariantId) {
+		this.modelInvariantId = modelInvariantId;
+	}
+
+	public void setResourceVersion(String resourceVersion) {
+		this.resourceVersion = resourceVersion;
+	}
+
+	public void setRelationshipList(RelationshipList relationshipList) {
+		this.relationshipList = relationshipList;
+	}
+
+	public void setRequestError(AAINQRequestError requestError) {
+		this.requestError = requestError;
+	}
+	
 }
diff --git a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAIGETVnfResponse.java b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAIGETVnfResponse.java
index c89083b18..a67963698 100644
--- a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAIGETVnfResponse.java
+++ b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAIGETVnfResponse.java
@@ -26,23 +26,60 @@ import com.google.gson.annotations.SerializedName;
 
 public class AAIGETVnfResponse extends AAIGETResponse implements Serializable {
 
-	/**
-	 * 
-	 */
 	private static final long serialVersionUID = -6247505944905898870L;
 	
 	@SerializedName("vnf-id")
-	public String vnfID;
+	private String vnfID;
 	
 	@SerializedName("vnf-name")
-	public String vnfName;
+	private String vnfName;
 	
 	@SerializedName("vnf-type")
-	public String vnfType;
+	private String vnfType;
 	
 	@SerializedName("service-id")
-	public String serviceId;
+	private String serviceId;
 	
 	@SerializedName("orchestration-status")
-	public String orchestrationStatus;
+	private String orchestrationStatus;
+
+	public String getVnfID() {
+		return vnfID;
+	}
+
+	public String getVnfName() {
+		return vnfName;
+	}
+
+	public String getVnfType() {
+		return vnfType;
+	}
+
+	public String getServiceId() {
+		return serviceId;
+	}
+
+	public String getOrchestrationStatus() {
+		return orchestrationStatus;
+	}
+
+	public void setVnfID(String vnfID) {
+		this.vnfID = vnfID;
+	}
+
+	public void setVnfName(String vnfName) {
+		this.vnfName = vnfName;
+	}
+
+	public void setVnfType(String vnfType) {
+		this.vnfType = vnfType;
+	}
+
+	public void setServiceId(String serviceId) {
+		this.serviceId = serviceId;
+	}
+
+	public void setOrchestrationStatus(String orchestrationStatus) {
+		this.orchestrationStatus = orchestrationStatus;
+	}
 }
\ No newline at end of file
diff --git a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAIGETVserverResponse.java b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAIGETVserverResponse.java
index 162df0d93..05dffc1dd 100644
--- a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAIGETVserverResponse.java
+++ b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAIGETVserverResponse.java
@@ -26,20 +26,49 @@ import com.google.gson.annotations.SerializedName;
 
 public class AAIGETVserverResponse extends AAIGETResponse implements Serializable {
 
-	/**
-	 * 
-	 */
 	private static final long serialVersionUID = -6247505944905898870L;
  
 	@SerializedName("vserver-id")
-	public String vserverID;
+	private String vserverID;
 	
 	@SerializedName("vserver-name")
-	public String vserverName;
+	private String vserverName;
 	
 	@SerializedName("vserver-name2")
-	public String vserverName2;
+	private String vserverName2;
 	
 	@SerializedName("vserver-selflink")
-	public String vserverSelflink;
+	private String vserverSelflink;
+
+	public String getVserverID() {
+		return vserverID;
+	}
+
+	public String getVserverName() {
+		return vserverName;
+	}
+
+	public String getVserverName2() {
+		return vserverName2;
+	}
+
+	public String getVserverSelflink() {
+		return vserverSelflink;
+	}
+
+	public void setVserverID(String vserverID) {
+		this.vserverID = vserverID;
+	}
+
+	public void setVserverName(String vserverName) {
+		this.vserverName = vserverName;
+	}
+
+	public void setVserverName2(String vserverName2) {
+		this.vserverName2 = vserverName2;
+	}
+
+	public void setVserverSelflink(String vserverSelflink) {
+		this.vserverSelflink = vserverSelflink;
+	}
 }
diff --git a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAIManager.java b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAIManager.java
index 621398282..53d32b056 100644
--- a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAIManager.java
+++ b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAIManager.java
@@ -32,19 +32,44 @@ import org.slf4j.LoggerFactory;
 
 import com.google.gson.JsonSyntaxException;
 
+/**
+ * This class handles communication towards and responses from A&AI for this module.
+ */
 public final class AAIManager {
+
+	/** The Constant LINE_SEPARATOR. */
 	private static final String LINE_SEPARATOR = System.lineSeparator();
 
+	/** The Constant logger. */
+	private static final Logger logger = LoggerFactory.getLogger(AAIManager.class);
+	
+	/** The Constant netLogger. */
+	private static final Logger netLogger = LoggerFactory.getLogger(org.onap.policy.drools.event.comm.Topic.NETWORK_LOGGER);
+
+	/** The rest manager. */
+	// The REST manager used for processing REST calls for this AAI manager
+	private final RESTManager restManager;
+
 	/**
-	 * Private constructor added to avoid instantiation of static class
+	 * Constructor, create the AAI manager with the specified REST manager.
+	 *
+	 * @param restManager the rest manager to use for REST calls
 	 */
-	private AAIManager() {
+	public AAIManager(final RESTManager restManager) {
+		this.restManager = restManager;
 	}
 
-	private static final Logger logger = LoggerFactory.getLogger(AAIManager.class);
-	private static final Logger netLogger = LoggerFactory.getLogger(org.onap.policy.drools.event.comm.Topic.NETWORK_LOGGER);
-
-	public static AAINQResponse	postQuery(String url, String username, String password, AAINQRequest request, UUID requestID) {
+	/**
+	 * Post a query to A&AI.
+	 *
+	 * @param url the A&AI URL
+	 * @param username the user name for authentication
+	 * @param password the password for authentication
+	 * @param request the request to issue towards A&AI
+	 * @param requestID the UUID of the request
+	 * @return the response from A&AI
+	 */
+	public AAINQResponse	postQuery(String url, String username, String password, AAINQRequest request, UUID requestID) {
 
 		Map<String, String> headers = createHeaders(requestID);
 
@@ -53,7 +78,7 @@ public final class AAIManager {
 		logger.debug("RESTManager.post before");
 		String requestJson = Serialization.gsonPretty.toJson(request);
 		netLogger.info("[OUT|{}|{}|]{}{}", "AAI", url, LINE_SEPARATOR, requestJson);
-		Pair<Integer, String> httpDetails = RESTManager.post(url, username, password, headers, "application/json", requestJson);
+		Pair<Integer, String> httpDetails = restManager.post(url, username, password, headers, "application/json", requestJson);
 		logger.debug("RESTManager.post after");
 
 		if (httpDetails == null) {
@@ -62,78 +87,95 @@ public final class AAIManager {
 		}
 
 		int httpResponseCode = httpDetails.a;
-		
+
 		logger.info(url);
 		logger.info("{}", httpResponseCode);
 		logger.info(httpDetails.b);
-		
+
 		if (httpDetails.b != null) {
 			return composeResponse(httpDetails, url, AAINQResponse.class);
 		}
 		return null;
 	}
 
-	public static AAIGETVserverResponse getQueryByVserverName(String urlGet, String username, String password, UUID requestID, String key) {
-
-		Map<String, String> headers = createHeaders(requestID);
-
-		urlGet = urlGet + key; 
-
-		int attemptsLeft = 3;
-
-		while(attemptsLeft-- > 0){
-
-			netLogger.info("[OUT|{}|{}|]", "AAI", urlGet);
-			Pair<Integer, String> httpDetailsGet = RESTManager.get(urlGet, username, password, headers);
-			if (httpDetailsGet == null) {
-				logger.info("AAI GET Null Response to {}", urlGet);
-				return null;
-			}
-
-			int httpResponseCode = httpDetailsGet.a;
-			
-			logger.info(urlGet);
-			logger.info("{}", httpResponseCode);
-			logger.info(httpDetailsGet.b);
+	/**
+	 * Perform a GET request for a particular virtual server towards A&AI.
+	 *
+	 * @param urlGet the A&AI URL
+	 * @param username the user name for authentication
+	 * @param password the password for authentication 
+	 * @param requestID the UUID of the request
+	 * @param key the key of the virtual server
+	 * @return the response for the virtual server from A&AI
+	 */
+	public AAIGETVserverResponse getQueryByVserverName(String urlGet, String username, String password, UUID requestID, String key) {
+		return getQuery(urlGet, username, password, requestID, key, AAIGETVserverResponse.class);
+	}
 
-			if (httpResponseCode == 200) {
-				AAIGETVserverResponse responseGet = composeResponse(httpDetailsGet, urlGet, AAIGETVserverResponse.class);
-				if (responseGet != null) {
-					return responseGet;
-				}
-			}
-			try {
-				Thread.sleep(1000);
-			} catch (InterruptedException e) { Thread.currentThread().interrupt(); }
-		}
+	/**
+	 * Perform a GET request for a particular VNF by VNF ID towards A&AI.
+	 *
+	 * @param urlGet the A&AI URL
+	 * @param username the user name for authentication
+	 * @param password the password for authentication 
+	 * @param requestID the UUID of the request
+	 * @param key the ID of the VNF
+	 * @return the response for the virtual server from A&AI
+	 */
+	public AAIGETVnfResponse getQueryByVnfID(String urlGet, String username, String password, UUID requestID, String key) {
+		return getQuery(urlGet, username, password, requestID, key, AAIGETVnfResponse.class);
+	}
 
-		return null;
+	/**
+	 * Perform a GET request for a particular VNF by VNF name towards A&AI.
+	 *
+	 * @param urlGet the A&AI URL
+	 * @param username the user name for authentication
+	 * @param password the password for authentication 
+	 * @param requestID the UUID of the request
+	 * @param key the name of the VNF
+	 * @return the response for the virtual server from A&AI
+	 */
+	public AAIGETVnfResponse getQueryByVnfName(String urlGet, String username, String password, UUID requestID, String key) {
+		return getQuery(urlGet, username, password, requestID, key, AAIGETVnfResponse.class);
 	}
 
-	public static AAIGETVnfResponse getQueryByVnfID(String urlGet, String username, String password, UUID requestID, String key) {
+	/**
+	 * Perform a GET query for a particular entity towards A&AI.
+	 *
+	 * @param <T> the generic type for the response
+	 * @param urlGet the A&AI URL
+	 * @param username the user name for authentication
+	 * @param password the password for authentication
+	 * @param requestID the UUID of the request
+	 * @param key the name of the VNF
+	 * @param classOfT the class of the response to return
+	 * @return the response for the virtual server from A&AI
+	 */
+	private <T> T getQuery(final String url, final String username, final String password, final UUID requestID, final String key, final Class<T> classOfResponse) {
 
 		Map<String, String> headers = createHeaders(requestID); 
 
-		urlGet = urlGet + key; 
+		String urlGet = url + key; 
 
 		int attemptsLeft = 3;
 
 		while(attemptsLeft-- > 0){
 			netLogger.info("[OUT|{}|{}|]", "AAI", urlGet);
-			Pair<Integer, String> httpDetailsGet = RESTManager.get(urlGet, username, password, headers);
+			Pair<Integer, String> httpDetailsGet = restManager.get(urlGet, username, password, headers);
 			if (httpDetailsGet == null) {
 				logger.info("AAI GET Null Response to {}", urlGet);
 				return null;
 			}
 
 			int httpResponseCode = httpDetailsGet.a;
-			
+
 			logger.info(urlGet);
 			logger.info("{}", httpResponseCode);
 			logger.info(httpDetailsGet.b);
 
 			if (httpResponseCode == 200) {
-				AAIGETVnfResponse responseGet = composeResponse(httpDetailsGet, urlGet, AAIGETVnfResponse.class);
+				T responseGet = composeResponse(httpDetailsGet, urlGet, classOfResponse);
 				if (responseGet != null) {
 					return responseGet;
 				}
@@ -147,16 +189,13 @@ public final class AAIManager {
 		return null;
 	}
 
-	public static AAIGETVnfResponse getQueryByVnfName(String urlGet, String username, String password, UUID requestID, String key) {
-		return getQueryByVnfID(urlGet, username, password, requestID, key);
-	}
-
 	/**
-	 * Create the headers for the HTTP request
+	 * Create the headers for the HTTP request.
+	 *
 	 * @param requestID the request ID to insert in the headers
 	 * @return the HTTP headers
 	 */
-	private static Map<String, String> createHeaders(final UUID requestID) {
+	private Map<String, String> createHeaders(final UUID requestID) {
 		Map<String, String> headers = new HashMap<>();
 
 		headers.put("X-FromAppId", "POLICY");
@@ -167,16 +206,18 @@ public final class AAIManager {
 	}
 
 	/**
-	 * This method uses Google's GSON to create a response object from a JSON string
+	 * This method uses Google's GSON to create a response object from a JSON string.
+	 *
+	 * @param <T> the generic type
 	 * @param httpDetails the HTTP response
 	 * @param url the URL from which the response came
-	 * @param classOfT The response class
+	 * @param classOfResponse The response class
 	 * @return an instance of the response class
 	 * @throws JsonSyntaxException on GSON errors instantiating the response
 	 */
-	private static <T> T composeResponse(final Pair<Integer, String> httpDetails, final String url, final Class<T> classOfT) {
+	private <T> T composeResponse(final Pair<Integer, String> httpDetails, final String url, final Class<T> classOfResponse) {
 		try {
-			T response = Serialization.gsonPretty.fromJson(httpDetails.b, classOfT);
+			T response = Serialization.gsonPretty.fromJson(httpDetails.b, classOfResponse);
 			netLogger.info("[IN|{}|{}|]{}{}", "AAI", url, LINE_SEPARATOR, httpDetails.b);
 			return response;
 		} catch (JsonSyntaxException e) {
diff --git a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQCloudRegion.java b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQCloudRegion.java
index bfeb1e56c..e7a8f19c3 100644
--- a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQCloudRegion.java
+++ b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQCloudRegion.java
@@ -26,23 +26,60 @@ import com.google.gson.annotations.SerializedName;
 
 public class AAINQCloudRegion implements Serializable {
 
-	/**
-	 * 
-	 */
 	private static final long serialVersionUID = -897231529157222683L;
 
 	@SerializedName("cloud-owner")
-	public String cloudOwner;
+	private String cloudOwner;
 	
 	@SerializedName("cloud-region-id")
-	public String cloudRegionId;
+	private String cloudRegionId;
 	
 	@SerializedName("cloud-region-version")
-	public String cloudRegionVersion;
+	private String cloudRegionVersion;
 	
 	@SerializedName("complex-name")
-	public String complexName;
+	private String complexName;
 	
 	@SerializedName("resource-version")
-	public String resourceVersion;
+	private String resourceVersion;
+
+	public String getCloudOwner() {
+		return cloudOwner;
+	}
+
+	public String getCloudRegionId() {
+		return cloudRegionId;
+	}
+
+	public String getCloudRegionVersion() {
+		return cloudRegionVersion;
+	}
+
+	public String getComplexName() {
+		return complexName;
+	}
+
+	public String getResourceVersion() {
+		return resourceVersion;
+	}
+
+	public void setCloudOwner(String cloudOwner) {
+		this.cloudOwner = cloudOwner;
+	}
+
+	public void setCloudRegionId(String cloudRegionId) {
+		this.cloudRegionId = cloudRegionId;
+	}
+
+	public void setCloudRegionVersion(String cloudRegionVersion) {
+		this.cloudRegionVersion = cloudRegionVersion;
+	}
+
+	public void setComplexName(String complexName) {
+		this.complexName = complexName;
+	}
+
+	public void setResourceVersion(String resourceVersion) {
+		this.resourceVersion = resourceVersion;
+	}
 }
diff --git a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQExtraProperties.java b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQExtraProperties.java
index b11859aeb..2322ef2f9 100644
--- a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQExtraProperties.java
+++ b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQExtraProperties.java
@@ -27,10 +27,6 @@ import java.util.List;
 import com.google.gson.annotations.SerializedName;
 
 public class AAINQExtraProperties implements Serializable {
-
-	/**
-	 * 
-	 */
 	private static final long serialVersionUID = 4109625574744702319L;
 
 	@SerializedName("extra-property")
diff --git a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQExtraProperty.java b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQExtraProperty.java
index 4a968c5e6..5761a543b 100644
--- a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQExtraProperty.java
+++ b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQExtraProperty.java
@@ -26,16 +26,13 @@ import com.google.gson.annotations.SerializedName;
 
 public class AAINQExtraProperty implements Serializable {
 
-	/**
-	 * 
-	 */
 	private static final long serialVersionUID = -3861240617222397736L;
 	
 	@SerializedName("property-name")
-	public String propertyName;
+	private String propertyName;
 	
 	@SerializedName("property-value")
-	public String propertyValue;
+	private String propertyValue;
 	
 	public AAINQExtraProperty() {
 	}
@@ -45,4 +42,19 @@ public class AAINQExtraProperty implements Serializable {
 		this.propertyValue = propertyValue;
 	}
 
+	public String getPropertyName() {
+		return propertyName;
+	}
+
+	public String getPropertyValue() {
+		return propertyValue;
+	}
+
+	public void setPropertyName(String propertyName) {
+		this.propertyName = propertyName;
+	}
+
+	public void setPropertyValue(String propertyValue) {
+		this.propertyValue = propertyValue;
+	}
 }
diff --git a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQGenericVNF.java b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQGenericVNF.java
index 12b8fc42a..62903a083 100644
--- a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQGenericVNF.java
+++ b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQGenericVNF.java
@@ -26,59 +26,192 @@ import com.google.gson.annotations.SerializedName;
 
 public class AAINQGenericVNF implements Serializable {
 
-	/**
-	 * 
-	 */
 	private static final long serialVersionUID = 834322706248060559L;
 	
 	@SerializedName("vnf-id")
-	public String vnfID;
+	private String vnfID;
 	
 	@SerializedName("vnf-name")
-	public String vnfName;
+	private String vnfName;
 	
 	@SerializedName("vnf-name2")
-	public String vnfName2;
+	private String vnfName2;
 	
 	@SerializedName("vnf-type")
-	public String vnfType;
+	private String vnfType;
 	
 	@SerializedName("service-id")
-	public String serviceId;
+	private String serviceId;
 	
 	@SerializedName("prov-status")
-	public String provStatus;
+	private String provStatus;
 	
 	@SerializedName("operational-state")
-	public String operationalState;
+	private String operationalState;
 	
 	@SerializedName("ipv4-oam-address")
-	public String ipv4OamAddress;
+	private String ipv4OamAddress;
 	
 	@SerializedName("ipv4-loopback0-address")
-	public String ipv4Loopback0Address;
+	private String ipv4Loopback0Address;
 	
 	@SerializedName("in-maint")
-	public Boolean inMaint;
+	private Boolean inMaint;
 	
 	@SerializedName("is-closed-loop-disabled")
-	public Boolean isClosedLoopDisabled;
+	private Boolean isClosedLoopDisabled;
 	
 	@SerializedName("resource-version")
-	public String resourceVersion;
+	private String resourceVersion;
 	
 	@SerializedName("encrypted-access-flag")
-	public Boolean encrypedAccessFlag;
+	private Boolean encrypedAccessFlag;
 	
 	@SerializedName("persona-model-id")
-	public String personaModelId;
+	private String personaModelId;
 	
 	@SerializedName("persona-model-version")
-	public String personaModelVersion;
+	private String personaModelVersion;
 	
 	@SerializedName("model-invariant-id")
-	public String modelInvariantId;
+	private String modelInvariantId;
 	
 	@SerializedName("model-version-id")
-	public String modelVersionId;
+	private String modelVersionId;
+
+	public String getVnfID() {
+		return vnfID;
+	}
+
+	public String getVnfName() {
+		return vnfName;
+	}
+
+	public String getVnfName2() {
+		return vnfName2;
+	}
+
+	public String getVnfType() {
+		return vnfType;
+	}
+
+	public String getServiceId() {
+		return serviceId;
+	}
+
+	public String getProvStatus() {
+		return provStatus;
+	}
+
+	public String getOperationalState() {
+		return operationalState;
+	}
+
+	public String getIpv4OamAddress() {
+		return ipv4OamAddress;
+	}
+
+	public String getIpv4Loopback0Address() {
+		return ipv4Loopback0Address;
+	}
+
+	public Boolean getInMaint() {
+		return inMaint;
+	}
+
+	public Boolean getIsClosedLoopDisabled() {
+		return isClosedLoopDisabled;
+	}
+
+	public String getResourceVersion() {
+		return resourceVersion;
+	}
+
+	public Boolean getEncrypedAccessFlag() {
+		return encrypedAccessFlag;
+	}
+
+	public String getPersonaModelId() {
+		return personaModelId;
+	}
+
+	public String getPersonaModelVersion() {
+		return personaModelVersion;
+	}
+
+	public String getModelInvariantId() {
+		return modelInvariantId;
+	}
+
+	public String getModelVersionId() {
+		return modelVersionId;
+	}
+
+	public void setVnfID(String vnfID) {
+		this.vnfID = vnfID;
+	}
+
+	public void setVnfName(String vnfName) {
+		this.vnfName = vnfName;
+	}
+
+	public void setVnfName2(String vnfName2) {
+		this.vnfName2 = vnfName2;
+	}
+
+	public void setVnfType(String vnfType) {
+		this.vnfType = vnfType;
+	}
+
+	public void setServiceId(String serviceId) {
+		this.serviceId = serviceId;
+	}
+
+	public void setProvStatus(String provStatus) {
+		this.provStatus = provStatus;
+	}
+
+	public void setOperationalState(String operationalState) {
+		this.operationalState = operationalState;
+	}
+
+	public void setIpv4OamAddress(String ipv4OamAddress) {
+		this.ipv4OamAddress = ipv4OamAddress;
+	}
+
+	public void setIpv4Loopback0Address(String ipv4Loopback0Address) {
+		this.ipv4Loopback0Address = ipv4Loopback0Address;
+	}
+
+	public void setInMaint(Boolean inMaint) {
+		this.inMaint = inMaint;
+	}
+
+	public void setIsClosedLoopDisabled(Boolean isClosedLoopDisabled) {
+		this.isClosedLoopDisabled = isClosedLoopDisabled;
+	}
+
+	public void setResourceVersion(String resourceVersion) {
+		this.resourceVersion = resourceVersion;
+	}
+
+	public void setEncrypedAccessFlag(Boolean encrypedAccessFlag) {
+		this.encrypedAccessFlag = encrypedAccessFlag;
+	}
+
+	public void setPersonaModelId(String personaModelId) {
+		this.personaModelId = personaModelId;
+	}
+
+	public void setPersonaModelVersion(String personaModelVersion) {
+		this.personaModelVersion = personaModelVersion;
+	}
+
+	public void setModelInvariantId(String modelInvariantId) {
+		this.modelInvariantId = modelInvariantId;
+	}
+
+	public void setModelVersionId(String modelVersionId) {
+		this.modelVersionId = modelVersionId;
+	}
 }
diff --git a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQInventoryResponseItem.java b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQInventoryResponseItem.java
index b4f1767e4..e9a387eff 100644
--- a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQInventoryResponseItem.java
+++ b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQInventoryResponseItem.java
@@ -26,35 +26,104 @@ import com.google.gson.annotations.SerializedName;
 
 public class AAINQInventoryResponseItem implements Serializable {
 
-	/**
-	 * 
-	 */
 	private static final long serialVersionUID = 7142072567154675183L;
 	
 	@SerializedName("model-name")
-	public String modelName;
+	private String modelName;
 	
 	@SerializedName("vf-module")
-	public AAINQVfModule vfModule;
+	private AAINQVfModule vfModule;
 	
 	@SerializedName("service-instance")
-	public AAINQServiceInstance serviceInstance;
+	private AAINQServiceInstance serviceInstance;
 	
 	@SerializedName("vserver")
-	public AAINQVServer vserver;
+	private AAINQVServer vserver;
 	
 	@SerializedName("tenant")
-	public AAINQTenant tenant;
+	private AAINQTenant tenant;
 	
 	@SerializedName("cloud-region")
-	public AAINQCloudRegion cloudRegion;
+	private AAINQCloudRegion cloudRegion;
 	
 	@SerializedName("generic-vnf")
-	public AAINQGenericVNF genericVNF;
+	private AAINQGenericVNF genericVNF;
 	
 	@SerializedName("extra-properties")
-	public AAINQExtraProperties extraProperties;
+	private AAINQExtraProperties extraProperties;
 	
 	@SerializedName("inventory-response-items")
-	public AAINQInventoryResponseItems items;
+	private AAINQInventoryResponseItems items;
+
+	public String getModelName() {
+		return modelName;
+	}
+
+	public AAINQVfModule getVfModule() {
+		return vfModule;
+	}
+
+	public AAINQServiceInstance getServiceInstance() {
+		return serviceInstance;
+	}
+
+	public AAINQVServer getVserver() {
+		return vserver;
+	}
+
+	public AAINQTenant getTenant() {
+		return tenant;
+	}
+
+	public AAINQCloudRegion getCloudRegion() {
+		return cloudRegion;
+	}
+
+	public AAINQGenericVNF getGenericVNF() {
+		return genericVNF;
+	}
+
+	public AAINQExtraProperties getExtraProperties() {
+		return extraProperties;
+	}
+
+	public AAINQInventoryResponseItems getItems() {
+		return items;
+	}
+
+	public void setModelName(String modelName) {
+		this.modelName = modelName;
+	}
+
+	public void setVfModule(AAINQVfModule vfModule) {
+		this.vfModule = vfModule;
+	}
+
+	public void setServiceInstance(AAINQServiceInstance serviceInstance) {
+		this.serviceInstance = serviceInstance;
+	}
+
+	public void setVserver(AAINQVServer vserver) {
+		this.vserver = vserver;
+	}
+
+	public void setTenant(AAINQTenant tenant) {
+		this.tenant = tenant;
+	}
+
+	public void setCloudRegion(AAINQCloudRegion cloudRegion) {
+		this.cloudRegion = cloudRegion;
+	}
+
+	public void setGenericVNF(AAINQGenericVNF genericVNF) {
+		this.genericVNF = genericVNF;
+	}
+
+	public void setExtraProperties(AAINQExtraProperties extraProperties) {
+		this.extraProperties = extraProperties;
+	}
+
+	public void setItems(AAINQInventoryResponseItems items) {
+		this.items = items;
+	}
 }
diff --git a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQInventoryResponseItems.java b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQInventoryResponseItems.java
index 8e9728ab3..e05bcccb4 100644
--- a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQInventoryResponseItems.java
+++ b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQInventoryResponseItems.java
@@ -27,10 +27,6 @@ import java.util.List;
 import com.google.gson.annotations.SerializedName;
 
 public class AAINQInventoryResponseItems implements Serializable {
-
-	/**
-	 * 
-	 */
 	private static final long serialVersionUID = 7602807659381179004L;
 
 	@SerializedName("inventory-response-item")
diff --git a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQNamedQuery.java b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQNamedQuery.java
index 423c98090..4dddbbe4a 100644
--- a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQNamedQuery.java
+++ b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQNamedQuery.java
@@ -26,12 +26,16 @@ import java.util.UUID;
 import com.google.gson.annotations.SerializedName;
 
 public class AAINQNamedQuery implements Serializable {
-
-	/**
-	 * 
-	 */
 	private static final long serialVersionUID = -3277980060302645333L;
 
 	@SerializedName("named-query-uuid")
-	public UUID namedQueryUUID;
+	private UUID namedQueryUUID;
+
+	public UUID getNamedQueryUUID() {
+		return namedQueryUUID;
+	}
+
+	public void setNamedQueryUUID(UUID namedQueryUUID) {
+		this.namedQueryUUID = namedQueryUUID;
+	}
 }
diff --git a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQQueryParameters.java b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQQueryParameters.java
index ddff71043..3843676aa 100644
--- a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQQueryParameters.java
+++ b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQQueryParameters.java
@@ -25,12 +25,16 @@ import java.io.Serializable;
 import com.google.gson.annotations.SerializedName;
 
 public class AAINQQueryParameters implements Serializable {
-
-	/**
-	 * 
-	 */
 	private static final long serialVersionUID = -4291227193197126982L;
 	
 	@SerializedName("named-query")
-	public AAINQNamedQuery namedQuery;
+	private AAINQNamedQuery namedQuery;
+
+	public AAINQNamedQuery getNamedQuery() {
+		return namedQuery;
+	}
+
+	public void setNamedQuery(AAINQNamedQuery namedQuery) {
+		this.namedQuery = namedQuery;
+	}
 }
diff --git a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQRequest.java b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQRequest.java
index d8d600075..db7317168 100644
--- a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQRequest.java
+++ b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQRequest.java
@@ -25,14 +25,27 @@ import java.io.Serializable;
 import com.google.gson.annotations.SerializedName;
 
 public class AAINQRequest implements Serializable {
-
-	/**
-	 * 
-	 */
 	private static final long serialVersionUID = -3283942659786236032L;
 	
 	@SerializedName("query-parameters")
-	public AAINQQueryParameters queryParameters;
+	private AAINQQueryParameters queryParameters;
+	
 	@SerializedName("instance-filters")
-	public AAINQInstanceFilters instanceFilters;
+	private AAINQInstanceFilters instanceFilters;
+
+	public AAINQQueryParameters getQueryParameters() {
+		return queryParameters;
+	}
+
+	public AAINQInstanceFilters getInstanceFilters() {
+		return instanceFilters;
+	}
+
+	public void setQueryParameters(AAINQQueryParameters queryParameters) {
+		this.queryParameters = queryParameters;
+	}
+
+	public void setInstanceFilters(AAINQInstanceFilters instanceFilters) {
+		this.instanceFilters = instanceFilters;
+	}
 }
diff --git a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQRequestError.java b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQRequestError.java
index f2498fb6e..2ebf1c2e3 100644
--- a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQRequestError.java
+++ b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQRequestError.java
@@ -25,9 +25,16 @@ import java.io.Serializable;
 import com.google.gson.annotations.SerializedName;
 
 public class AAINQRequestError implements Serializable {
-	
 	private static final long serialVersionUID = -7742674155387022932L;
 	
 	@SerializedName("serviceException")
-	public AAINQServiceExcept serviceExcept;
+	private AAINQServiceExcept serviceExcept;
+
+	public AAINQServiceExcept getServiceExcept() {
+		return serviceExcept;
+	}
+
+	public void setServiceExcept(AAINQServiceExcept serviceExcept) {
+		this.serviceExcept = serviceExcept;
+	}
 }
diff --git a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQResponse.java b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQResponse.java
index 2e6776fc6..690e83eb3 100644
--- a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQResponse.java
+++ b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQResponse.java
@@ -28,10 +28,6 @@ import com.google.gson.annotations.SerializedName;
 import org.onap.policy.aai.AAINQInventoryResponseItem;
 
 public class AAINQResponse implements Serializable {
-
-	/**
-	 * 
-	 */
 	private static final long serialVersionUID = 8411407444051746101L;
 	
 	@SerializedName("inventory-response-item")
@@ -43,16 +39,4 @@ public class AAINQResponse implements Serializable {
 	public List<AAINQInventoryResponseItem> getInventoryResponseItems() {
 		return inventoryResponseItems;
 	}
-
-	public void setInventoryResponseItems(List<AAINQInventoryResponseItem> inventoryResponseItems) {
-		this.inventoryResponseItems = inventoryResponseItems;
-	}
-
-	public AAINQRequestError getRequestError() {
-		return requestError;
-	}
-
-	public void setRequestError(AAINQRequestError requestError) {
-		this.requestError = requestError;
-	}
 }
\ No newline at end of file
diff --git a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQServiceExcept.java b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQServiceExcept.java
index acee98f04..12fb1a0c4 100644
--- a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQServiceExcept.java
+++ b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQServiceExcept.java
@@ -25,15 +25,26 @@ import java.io.Serializable;
 import com.google.gson.annotations.SerializedName;
 
 public class AAINQServiceExcept implements Serializable {
-
 	private static final long serialVersionUID = 2858343404484338546L;
 
 	@SerializedName("messageId")
-	public String messageId;
+	private String messageId;
 	
 	@SerializedName("text")
-	public String text;
+	private String text;
 	
 	@SerializedName("variables")
-	public String[] variables;
+	private String[] variables;
+
+	public String getMessageId() {
+		return messageId;
+	}
+
+	public String getText() {
+		return text;
+	}
+
+	public String[] getVariables() {
+		return variables;
+	}
 }
diff --git a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQServiceInstance.java b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQServiceInstance.java
index 256a057a4..3ae366ea5 100644
--- a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQServiceInstance.java
+++ b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQServiceInstance.java
@@ -25,33 +25,93 @@ import java.io.Serializable;
 import com.google.gson.annotations.SerializedName;
 
 public class AAINQServiceInstance implements Serializable {
-
-	/**
-	 * 
-	 */
 	private static final long serialVersionUID = -8000944396593889586L;
 
 	@SerializedName("service-instance-id")
-	public String serviceInstanceID;
+	private String serviceInstanceID;
 	
 	@SerializedName("service-instance-name")
-	public String serviceInstanceName;
+	private String serviceInstanceName;
 	
 	@SerializedName("persona-model-id")
-	public String personaModelId;
+	private String personaModelId;
 	
 	@SerializedName("persona-model-version")
-	public String personaModelVersion;
+	private String personaModelVersion;
 	
 	@SerializedName("service-instance-location-id")
-	public String serviceInstanceLocationId;
+	private String serviceInstanceLocationId;
 	
 	@SerializedName("resource-version")
-	public String resourceVersion;
+	private String resourceVersion;
 	
 	@SerializedName("model-invariant-id")
-	public String modelInvariantId;
+	private String modelInvariantId;
 	
 	@SerializedName("model-version-id")
-	public String modelVersionId;
+	private String modelVersionId;
+
+	public String getServiceInstanceID() {
+		return serviceInstanceID;
+	}
+
+	public String getServiceInstanceName() {
+		return serviceInstanceName;
+	}
+
+	public String getPersonaModelId() {
+		return personaModelId;
+	}
+
+	public String getPersonaModelVersion() {
+		return personaModelVersion;
+	}
+
+	public String getServiceInstanceLocationId() {
+		return serviceInstanceLocationId;
+	}
+
+	public String getResourceVersion() {
+		return resourceVersion;
+	}
+
+	public String getModelInvariantId() {
+		return modelInvariantId;
+	}
+
+	public String getModelVersionId() {
+		return modelVersionId;
+	}
+
+	public void setServiceInstanceID(String serviceInstanceID) {
+		this.serviceInstanceID = serviceInstanceID;
+	}
+
+	public void setServiceInstanceName(String serviceInstanceName) {
+		this.serviceInstanceName = serviceInstanceName;
+	}
+
+	public void setPersonaModelId(String personaModelId) {
+		this.personaModelId = personaModelId;
+	}
+
+	public void setPersonaModelVersion(String personaModelVersion) {
+		this.personaModelVersion = personaModelVersion;
+	}
+
+	public void setServiceInstanceLocationId(String serviceInstanceLocationId) {
+		this.serviceInstanceLocationId = serviceInstanceLocationId;
+	}
+
+	public void setResourceVersion(String resourceVersion) {
+		this.resourceVersion = resourceVersion;
+	}
+
+	public void setModelInvariantId(String modelInvariantId) {
+		this.modelInvariantId = modelInvariantId;
+	}
+
+	public void setModelVersionId(String modelVersionId) {
+		this.modelVersionId = modelVersionId;
+	}
 }
diff --git a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQTenant.java b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQTenant.java
index afd55fd45..a370b7ddb 100644
--- a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQTenant.java
+++ b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQTenant.java
@@ -25,18 +25,40 @@ import java.io.Serializable;
 import com.google.gson.annotations.SerializedName;
 
 public class AAINQTenant implements Serializable {
-
-	/**
-	 * 
-	 */
 	private static final long serialVersionUID = 4702784101671984364L;
 
 	@SerializedName("tenant-id")
-	public String tenantId;
+	private String tenantId;
 	
 	@SerializedName("tenant-name")
-	public String tenantName;
+	private String tenantName;
 	
 	@SerializedName("resource-version")
-	public String resourceVersion;
+	private String resourceVersion;
+
+	public String getTenantId() {
+		return tenantId;
+	}
+
+	public String getTenantName() {
+		return tenantName;
+	}
+
+	public String getResourceVersion() {
+		return resourceVersion;
+	}
+
+	public void setTenantId(String tenantId) {
+		this.tenantId = tenantId;
+	}
+
+	public void setTenantName(String tenantName) {
+		this.tenantName = tenantName;
+	}
+
+	public void setResourceVersion(String resourceVersion) {
+		this.resourceVersion = resourceVersion;
+	}
+	
+	
 }
diff --git a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQVServer.java b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQVServer.java
index f6130e95b..180ac3680 100644
--- a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQVServer.java
+++ b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQVServer.java
@@ -25,33 +25,95 @@ import java.io.Serializable;
 import com.google.gson.annotations.SerializedName;
 
 public class AAINQVServer implements Serializable {
-
-	/**
-	 * 
-	 */
 	private static final long serialVersionUID = -6718526692734215643L;
 
 	@SerializedName("vserver-id")
-	public String vserverId;
+	private String vserverId;
 	
 	@SerializedName("vserver-name")
-	public String vserverName;
+	private String vserverName;
 	
 	@SerializedName("vserver-name2")
-	public String vserverName2;
+	private String vserverName2;
 	
 	@SerializedName("prov-status")
-	public String provStatus;
+	private String provStatus;
 	
 	@SerializedName("vserver-selflink")
-	public String vserverSelflink;
+	private String vserverSelflink;
 	
 	@SerializedName("in-maint")
-	public Boolean inMaint;
+	private Boolean inMaint;
 	
 	@SerializedName("is-closed-loop-disabled")
-	public Boolean isClosedLoopDisabled;
+	private Boolean isClosedLoopDisabled;
 	
 	@SerializedName("resource-version")
-	public String resourceVersion;
+	private String resourceVersion;
+
+	public String getVserverId() {
+		return vserverId;
+	}
+
+	public String getVserverName() {
+		return vserverName;
+	}
+
+	public String getVserverName2() {
+		return vserverName2;
+	}
+
+	public String getProvStatus() {
+		return provStatus;
+	}
+
+	public String getVserverSelflink() {
+		return vserverSelflink;
+	}
+
+	public Boolean getInMaint() {
+		return inMaint;
+	}
+
+	public Boolean getIsClosedLoopDisabled() {
+		return isClosedLoopDisabled;
+	}
+
+	public String getResourceVersion() {
+		return resourceVersion;
+	}
+
+	public void setVserverId(String vserverId) {
+		this.vserverId = vserverId;
+	}
+
+	public void setVserverName(String vserverName) {
+		this.vserverName = vserverName;
+	}
+
+	public void setVserverName2(String vserverName2) {
+		this.vserverName2 = vserverName2;
+	}
+
+	public void setProvStatus(String provStatus) {
+		this.provStatus = provStatus;
+	}
+
+	public void setVserverSelflink(String vserverSelflink) {
+		this.vserverSelflink = vserverSelflink;
+	}
+
+	public void setInMaint(Boolean inMaint) {
+		this.inMaint = inMaint;
+	}
+
+	public void setIsClosedLoopDisabled(Boolean isClosedLoopDisabled) {
+		this.isClosedLoopDisabled = isClosedLoopDisabled;
+	}
+
+	public void setResourceVersion(String resourceVersion) {
+		this.resourceVersion = resourceVersion;
+	}
+	
+	
 }
diff --git a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQVfModule.java b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQVfModule.java
index b20681d7f..97c794f07 100644
--- a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQVfModule.java
+++ b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQVfModule.java
@@ -25,48 +25,148 @@ import java.io.Serializable;
 import com.google.gson.annotations.SerializedName;
 
 public class AAINQVfModule implements Serializable {
-
-	/**
-	 * 
-	 */
 	private static final long serialVersionUID = 8019133081429638231L;
 
 	@SerializedName("vf-module-id")
-	public String vfModuleId;
+	private String vfModuleId;
 	
 	@SerializedName("vf-module-name")
-	public String vfModuleName;
+	private String vfModuleName;
 	
 	@SerializedName("heat-stack-id")
-	public String heatStackId;
+	private String heatStackId;
 	
 	@SerializedName("orchestration-status")
-	public String orchestrationStatus;
+	private String orchestrationStatus;
 	
 	@SerializedName("is-base-vf-module")
-	public Boolean isBaseVfModule;
+	private Boolean isBaseVfModule;
 	
 	@SerializedName("resource-version")
-	public String resourceVersion;
+	private String resourceVersion;
 	
 	@SerializedName("persona-model-id")
-	public String personaModelId;
+	private String personaModelId;
 	
 	@SerializedName("persona-model-version")
-	public String personaModelVersion;
+	private String personaModelVersion;
 	
 	@SerializedName("widget-model-id")
-	public String widgetModelId;
+	private String widgetModelId;
 	
 	@SerializedName("widget-model-version")
-	public String widgetModelVersion;
+	private String widgetModelVersion;
 	
 	@SerializedName("contrail-service-instance-fqdn")
-	public String contrailServiceInstanceFqdn;
+	private String contrailServiceInstanceFqdn;
 	
 	@SerializedName("model-invariant-id")
-	public String modelInvariantId;
+	private String modelInvariantId;
 	
 	@SerializedName("model-version-id")
-	public String modelVersionId;
+	private String modelVersionId;
+
+	public String getVfModuleId() {
+		return vfModuleId;
+	}
+
+	public String getVfModuleName() {
+		return vfModuleName;
+	}
+
+	public String getHeatStackId() {
+		return heatStackId;
+	}
+
+	public String getOrchestrationStatus() {
+		return orchestrationStatus;
+	}
+
+	public Boolean getIsBaseVfModule() {
+		return isBaseVfModule;
+	}
+
+	public String getResourceVersion() {
+		return resourceVersion;
+	}
+
+	public String getPersonaModelId() {
+		return personaModelId;
+	}
+
+	public String getPersonaModelVersion() {
+		return personaModelVersion;
+	}
+
+	public String getWidgetModelId() {
+		return widgetModelId;
+	}
+
+	public String getWidgetModelVersion() {
+		return widgetModelVersion;
+	}
+
+	public String getContrailServiceInstanceFqdn() {
+		return contrailServiceInstanceFqdn;
+	}
+
+	public String getModelInvariantId() {
+		return modelInvariantId;
+	}
+
+	public String getModelVersionId() {
+		return modelVersionId;
+	}
+
+	public void setVfModuleId(String vfModuleId) {
+		this.vfModuleId = vfModuleId;
+	}
+
+	public void setVfModuleName(String vfModuleName) {
+		this.vfModuleName = vfModuleName;
+	}
+
+	public void setHeatStackId(String heatStackId) {
+		this.heatStackId = heatStackId;
+	}
+
+	public void setOrchestrationStatus(String orchestrationStatus) {
+		this.orchestrationStatus = orchestrationStatus;
+	}
+
+	public void setIsBaseVfModule(Boolean isBaseVfModule) {
+		this.isBaseVfModule = isBaseVfModule;
+	}
+
+	public void setResourceVersion(String resourceVersion) {
+		this.resourceVersion = resourceVersion;
+	}
+
+	public void setPersonaModelId(String personaModelId) {
+		this.personaModelId = personaModelId;
+	}
+
+	public void setPersonaModelVersion(String personaModelVersion) {
+		this.personaModelVersion = personaModelVersion;
+	}
+
+	public void setWidgetModelId(String widgetModelId) {
+		this.widgetModelId = widgetModelId;
+	}
+
+	public void setWidgetModelVersion(String widgetModelVersion) {
+		this.widgetModelVersion = widgetModelVersion;
+	}
+
+	public void setContrailServiceInstanceFqdn(String contrailServiceInstanceFqdn) {
+		this.contrailServiceInstanceFqdn = contrailServiceInstanceFqdn;
+	}
+
+	public void setModelInvariantId(String modelInvariantId) {
+		this.modelInvariantId = modelInvariantId;
+	}
+
+	public void setModelVersionId(String modelVersionId) {
+		this.modelVersionId = modelVersionId;
+	}
 }
diff --git a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/PNF.java b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/PNF.java
index 56fb77362..934fb1edc 100644
--- a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/PNF.java
+++ b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/PNF.java
@@ -23,10 +23,6 @@ package org.onap.policy.aai;
 import java.io.Serializable;
 
 public class PNF implements Serializable {
-
-	/**
-	 * 
-	 */
 	private static final long serialVersionUID = -3535108358668248501L;
 
 	private String	pnfName;
diff --git a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/PNFType.java b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/PNFType.java
index 996304926..5774b364f 100644
--- a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/PNFType.java
+++ b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/PNFType.java
@@ -22,8 +22,7 @@ package org.onap.policy.aai;
 
 public enum PNFType {
 	ENODEB("eNodeB"),
-	PSERVER("pserver")
-	;
+	PSERVER("pserver");
 	
 	private String type;
 	
@@ -34,7 +33,5 @@ public enum PNFType {
 	@Override
 	public String toString() {
 		return this.type;
-		
 	}
-
 }
diff --git a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/RelatedToProperty.java b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/RelatedToProperty.java
index bb3a95f30..a55c04138 100644
--- a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/RelatedToProperty.java
+++ b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/RelatedToProperty.java
@@ -27,12 +27,9 @@ import java.util.List;
 import com.google.gson.annotations.SerializedName;
 
 public class RelatedToProperty implements Serializable {
-  
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 2088088164920423658L;
-	@SerializedName("related-to-property")
+  	private static final long serialVersionUID = 2088088164920423658L;
+
+  	@SerializedName("related-to-property")
 	private List<RelatedToPropertyItem> relatedTo = new LinkedList<>();
 
 	public List<RelatedToPropertyItem> getRelatedTo() {
diff --git a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/RelatedToPropertyItem.java b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/RelatedToPropertyItem.java
index 24466d6dc..e23f45c11 100644
--- a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/RelatedToPropertyItem.java
+++ b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/RelatedToPropertyItem.java
@@ -25,14 +25,24 @@ import java.io.Serializable;
 import com.google.gson.annotations.SerializedName;
 
 public class RelatedToPropertyItem implements Serializable {
-
-	/**
-	 * 
-	 */
 	private static final long serialVersionUID = 5644372985092588637L;
 	
 	@SerializedName("property-key")
-	public String propertyKey;
+	private String propertyKey;
 	@SerializedName("property-value")
-	public String propertyValue;
+	private String propertyValue;
+
+	public String getPropertyKey() {
+		return propertyKey;
+	}
+	public String getPropertyValue() {
+		return propertyValue;
+	}
+
+	public void setPropertyKey(String propertyKey) {
+		this.propertyKey = propertyKey;
+	}
+	public void setPropertyValue(String propertyValue) {
+		this.propertyValue = propertyValue;
+	}
 }
diff --git a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/Relationship.java b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/Relationship.java
index 07169c9ec..ba5d596ea 100644
--- a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/Relationship.java
+++ b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/Relationship.java
@@ -25,20 +25,49 @@ import java.io.Serializable;
 import com.google.gson.annotations.SerializedName;
 
 public class Relationship implements Serializable {
-	
-	/**
-	 * 
-	 */
 	private static final long serialVersionUID = -68508443869003054L;
 	
 	@SerializedName("related-to")
-	public String relatedTo;
+	private String relatedTo;
+	
 	@SerializedName("related-link")
-	public String relatedLink; 
+	private String relatedLink; 
 	
 	@SerializedName("relationship-data")
-	public RelationshipData relationshipData = new RelationshipData();
+	private RelationshipData relationshipData = new RelationshipData();
 	
 	@SerializedName("related-to-property")
-	public RelatedToProperty relatedToProperty =  new RelatedToProperty();
+	private RelatedToProperty relatedToProperty =  new RelatedToProperty();
+
+	public String getRelatedTo() {
+		return relatedTo;
+	}
+
+	public String getRelatedLink() {
+		return relatedLink;
+	}
+
+	public RelationshipData getRelationshipData() {
+		return relationshipData;
+	}
+
+	public RelatedToProperty getRelatedToProperty() {
+		return relatedToProperty;
+	}
+
+	public void setRelatedTo(String relatedTo) {
+		this.relatedTo = relatedTo;
+	}
+
+	public void setRelatedLink(String relatedLink) {
+		this.relatedLink = relatedLink;
+	}
+
+	public void setRelationshipData(RelationshipData relationshipData) {
+		this.relationshipData = relationshipData;
+	}
+
+	public void setRelatedToProperty(RelatedToProperty relatedToProperty) {
+		this.relatedToProperty = relatedToProperty;
+	}
 }
diff --git a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/RelationshipData.java b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/RelationshipData.java
index 08e41a912..be9e8bfda 100644
--- a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/RelationshipData.java
+++ b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/RelationshipData.java
@@ -27,10 +27,6 @@ import java.util.LinkedList;
 import com.google.gson.annotations.SerializedName;
 
 public class RelationshipData implements Serializable {
-
-	/**
-	 * 
-	 */
 	private static final long serialVersionUID = 6809180843309562121L;
 	@SerializedName("relationship-data")
 	private List<RelationshipDataItem> relationshipDataList = new LinkedList<>();
diff --git a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/RelationshipDataItem.java b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/RelationshipDataItem.java
index 39efdcd4b..eb3a6c85b 100644
--- a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/RelationshipDataItem.java
+++ b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/RelationshipDataItem.java
@@ -25,14 +25,24 @@ import java.io.Serializable;
 import com.google.gson.annotations.SerializedName;
 
 public class RelationshipDataItem implements Serializable {
-	
-	/**
-	 * 
-	 */
 	private static final long serialVersionUID = 550450041634939767L;
 	
 	@SerializedName("relationship-key")
-	public String relationshipKey;
+	private String relationshipKey;
 	@SerializedName("relationship-value")
-	public String relationshipValue;
+	private String relationshipValue;
+	
+	public String getRelationshipKey() {
+		return relationshipKey;
+	}
+	public String getRelationshipValue() {
+		return relationshipValue;
+	}
+	
+	public void setRelationshipKey(String relationshipKey) {
+		this.relationshipKey = relationshipKey;
+	}
+	public void setRelationshipValue(String relationshipValue) {
+		this.relationshipValue = relationshipValue;
+	}
 }
diff --git a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/RelationshipItem.java b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/RelationshipItem.java
index 939950561..681574f47 100644
--- a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/RelationshipItem.java
+++ b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/RelationshipItem.java
@@ -27,10 +27,6 @@ import java.util.LinkedList;
 import com.google.gson.annotations.SerializedName;
 
 public class RelationshipItem implements Serializable {
-	
-	/**
-	 * 
-	 */
 	private static final long serialVersionUID = 1543404460741069628L;
 	
 	@SerializedName("related-to-property")
diff --git a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/RelationshipList.java b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/RelationshipList.java
index 46e04c8fd..d181f131e 100644
--- a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/RelationshipList.java
+++ b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/RelationshipList.java
@@ -26,11 +26,8 @@ import java.util.List;
 import java.util.LinkedList; 
 
 public class RelationshipList implements Serializable {
-
-    /**
-	 * 
-	 */
 	private static final long serialVersionUID = 6115655704973981989L;
+
 	@SerializedName("relationship-list")
     private List<Relationship> relationships = new LinkedList<>();