Global Read only role, Support VID specific Roles

Issue-ID: VID-46 , VID-47
Change-Id: Ib100d20ac40a65d39e27a6e2741b19a173a2b8ea
Signed-off-by: Ofir Sonsino <os0695@att.com>

48 files changed, 2668 insertions, 1145 deletions

diff --git a/vid-app-common/src/main/java/org/ecomp/aai/model/AaiAICZones/AicZones.java b/vid-app-common/src/main/java/org/ecomp/aai/model/AaiAICZones/AicZones.java
new file mode 100644
index 000000000..ee8bcf0c8
--- /dev/null
+++ b/vid-app-common/src/main/java/org/ecomp/aai/model/AaiAICZones/AicZones.java
@@ -0,0 +1,10 @@
+package org.ecomp.aai.model.AaiAICZones;
+
+import java.util.List;
+
+import org.codehaus.jackson.annotate.JsonProperty;
+
+public class AicZones {
+	@JsonProperty("zone")
+	public List<Zone> zones;
+}
diff --git a/vid-app-common/src/main/java/org/ecomp/aai/model/AaiAICZones/Zone.java b/vid-app-common/src/main/java/org/ecomp/aai/model/AaiAICZones/Zone.java
new file mode 100644
index 000000000..00d387c2b
--- /dev/null
+++ b/vid-app-common/src/main/java/org/ecomp/aai/model/AaiAICZones/Zone.java
@@ -0,0 +1,13 @@
+package org.ecomp.aai.model.AaiAICZones;
+
+import org.codehaus.jackson.annotate.JsonIgnoreProperties;
+import org.codehaus.jackson.annotate.JsonProperty;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class Zone {
+    @JsonProperty("zone-id")
+    public String zoneId;
+    
+    @JsonProperty("zone-name")
+    public String zoneName;
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/aai/util/HttpsAuthClient.java b/vid-app-common/src/main/java/org/openecomp/aai/util/HttpsAuthClient.java
index 6a3665edb..3323b3fb4 100755
--- a/vid-app-common/src/main/java/org/openecomp/aai/util/HttpsAuthClient.java
+++ b/vid-app-common/src/main/java/org/openecomp/aai/util/HttpsAuthClient.java
@@ -80,7 +80,7 @@ public class HttpsAuthClient{
 				useClientCert = true;

 			}

 			

-		    System.setProperty("javax.net.ssl.trustStore", truststore_path);

+  		    System.setProperty("javax.net.ssl.trustStore", truststore_path);

 		    System.setProperty("javax.net.ssl.trustStorePassword", decrypted_truststore_password);

 			HttpsURLConnection.setDefaultHostnameVerifier( new HostnameVerifier(){

 			    public boolean verify(String string,SSLSession ssls) {

diff --git a/vid-app-common/src/main/java/org/openecomp/vid/aai/AaiClient.java b/vid-app-common/src/main/java/org/openecomp/vid/aai/AaiClient.java
new file mode 100644
index 000000000..af1f4042a
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/aai/AaiClient.java
@@ -0,0 +1,284 @@
+package org.openecomp.vid.aai;
+
+import org.apache.http.HttpStatus;
+import org.codehaus.jackson.map.ObjectMapper;
+import org.ecomp.aai.model.AaiAICZones.AicZones;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
+import org.openecomp.aai.util.AAIRestInterface;
+import org.apache.tiles.request.ApplicationContext;
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.openecomp.portalsdk.core.web.support.UserUtils;
+import org.openecomp.vid.aai.model.AaiGetServicesRequestModel.GetServicesAAIRespone;
+import org.openecomp.vid.aai.model.AaiGetTenatns.GetTenantsResponse;
+import org.openecomp.vid.model.SubscriberList;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import javax.servlet.ServletContext;
+import javax.ws.rs.BadRequestException;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.Response;
+import java.io.File;
+import java.io.IOException;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.UUID;
+
+
+/**
+ * Created by Oren on 7/4/17.
+ */
+public class AaiClient implements AaiClientInterface {
+
+	/**
+	 * The Constant dateFormat.
+	 */
+	final static DateFormat dateFormat = new SimpleDateFormat("HH:mm:ss:SSSS");
+	protected String fromAppId = "VidAaiController";
+	@Autowired
+	ServletContext servletContext;
+	/**
+	 * The logger
+	 */
+
+	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(AaiClient.class);
+
+
+	public AaiClient() {
+		//        certiPath = getCertificatesFile().getAbsolutePath();
+		//        depth = "0";
+	}
+
+	public AaiClient(ServletContext context) {
+		servletContext = context;
+	}
+
+
+
+	private static String checkForNull(String local) {
+		if (local != null)
+			return local;
+		else
+			return "";
+
+	}
+
+	@Override
+	public AaiResponse<SubscriberList> getAllSubscribers() {
+		String certiPath = getCertificatesFile().getAbsolutePath();
+		String depth = "0";
+		Response resp = doAaiGet(certiPath, "business/customers?subscriber-type=INFRA&depth=" + depth, false);
+		UserUtils userUtils = new UserUtils();
+		return proccessAaiResponse(resp, SubscriberList.class,null);
+	}
+
+
+	@Override
+	public AaiResponse getAllAicZones() {
+		String certiPath = getCertificatesFile().getAbsolutePath();
+		Response resp = doAaiGet(certiPath, "network/zones" , false);
+		AaiResponse aaiAicZones = proccessAaiResponse(resp, AicZones.class,null);
+		return aaiAicZones;
+	}
+
+	@Override
+	public AaiResponse getSubscriberData(String subscriberId) {
+
+		File certiPath = getCertificatesFile();
+		String depth = "2";
+		AaiResponse subscriberDataResponse;
+		Response resp = doAaiGet(certiPath.getAbsolutePath(), "business/customers/customer/" + subscriberId + "?depth=" + depth, false);
+		subscriberDataResponse = proccessAaiResponse(resp, Services.class,null);
+		return subscriberDataResponse;
+	}
+
+	@Override
+	public AaiResponse getServices() {
+		File certiPath = getCertificatesFile();
+		Response resp = doAaiGet(certiPath.getAbsolutePath(), "service-design-and-creation/services", false);
+		AaiResponse<GetServicesAAIRespone> getServicesResponse = proccessAaiResponse(resp, GetServicesAAIRespone.class,null);
+
+		return getServicesResponse;
+	}
+
+	@Override
+	public AaiResponse getTenants(String globalCustomerId, String serviceType) {
+		File certiPath = getCertificatesFile();
+		String url = "business/customers/customer/" + globalCustomerId + "/service-subscriptions/service-subscription/" + serviceType;
+
+		Response resp = doAaiGet(certiPath.getAbsolutePath(), url, false);
+		String responseAsString  = parseForTenantsByServiceSubscription(resp.readEntity(String.class));
+
+		AaiResponse<GetTenantsResponse[]> getTenantsResponse = proccessAaiResponse(resp, GetTenantsResponse[].class,responseAsString);
+		return getTenantsResponse;
+	}
+
+	private AaiResponse proccessAaiResponse(Response resp, Class classType,String responseBody) {
+		AaiResponse subscriberDataResponse;
+		if (resp == null) {
+			subscriberDataResponse = new AaiResponse<>(null, null, HttpStatus.SC_INTERNAL_SERVER_ERROR);
+			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + "Invalid response from AAI");
+		} else {
+			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + "getSubscribers() resp=" + resp.getStatusInfo().toString());
+			if (resp.getStatus() != HttpStatus.SC_OK) {
+				logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + "Invalid response from AAI");
+				subscriberDataResponse = new AaiResponse<>(null, resp.readEntity(String.class), resp.getStatus());
+			} else {
+				String finalResponse;
+				try {
+					if (responseBody != null){
+						finalResponse = responseBody;
+					}
+					else{
+						finalResponse =  resp.readEntity(String.class);;
+					}
+
+					subscriberDataResponse = new AaiResponse<>((new ObjectMapper().readValue(finalResponse, classType)), null, HttpStatus.SC_OK);
+
+				} catch (IOException e) {
+					subscriberDataResponse = new AaiResponse<>(null, null, HttpStatus.SC_INTERNAL_SERVER_ERROR);
+				}
+
+			}
+		}
+		return subscriberDataResponse;
+	}
+
+	private File getCertificatesFile() {
+		if (servletContext != null)
+			return new File(servletContext.getRealPath("/WEB-INF/cert/"));
+		return null;
+	}
+
+	@SuppressWarnings("all")
+	protected Response doAaiGet(String certiPath, String uri, boolean xml) {
+		String methodName = "getSubscriberList";
+		String transId = UUID.randomUUID().toString();
+		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start");
+
+		Response resp = null;
+		try {
+
+			AAIRestInterface restContrller = new AAIRestInterface(certiPath);
+			resp = restContrller.RestGet(fromAppId, transId, uri, xml);
+
+		} catch (WebApplicationException e) {
+			final String message = ((BadRequestException) e).getResponse().readEntity(String.class);
+			logger.info(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) + "<== " + "." + methodName + message);
+			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + "." + methodName + message);
+		} catch (Exception e) {
+			logger.info(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) + "<== " + "." + methodName + e.toString());
+			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + "." + methodName + e.toString());
+		}
+
+		return resp;
+	}
+
+	private String parseForTenantsByServiceSubscription(String resp) {
+		String tenantList = "";
+
+		try {
+			JSONParser jsonParser = new JSONParser();
+
+			JSONObject jsonObject = (JSONObject) jsonParser.parse(resp);
+
+			return parseServiceSubscriptionObjectForTenants(jsonObject);
+		} catch (Exception ex) {
+
+		}
+
+		return tenantList;
+	}
+
+
+
+	public static String parseServiceSubscriptionObjectForTenants(JSONObject jsonObject) {
+
+		JSONArray tenantArray = new JSONArray();
+		boolean bconvert = false;
+
+		try {
+			JSONObject relationShipListsObj = (JSONObject) jsonObject.get("relationship-list");
+			if (relationShipListsObj != null) {
+				JSONArray rShipArray = (JSONArray) relationShipListsObj.get("relationship");
+				if (rShipArray != null) {
+					Iterator i1 = rShipArray.iterator();
+
+					while (i1.hasNext()) {
+
+						JSONObject inner1Obj = (JSONObject) i1.next();
+
+						if (inner1Obj == null)
+							continue;
+
+						String relatedTo = checkForNull((String) inner1Obj.get("related-to"));
+						if (relatedTo.equalsIgnoreCase("tenant")) {
+							JSONObject tenantNewObj = new JSONObject();
+
+							String relatedLink = checkForNull((String) inner1Obj.get("related-link"));
+							tenantNewObj.put("link", relatedLink);
+
+							JSONArray rDataArray = (JSONArray) inner1Obj.get("relationship-data");
+							if (rDataArray != null) {
+								Iterator i2 = rDataArray.iterator();
+
+								while (i2.hasNext()) {
+									JSONObject inner2Obj = (JSONObject) i2.next();
+
+									if (inner2Obj == null)
+										continue;
+
+									String rShipKey = checkForNull((String) inner2Obj.get("relationship-key"));
+									String rShipVal = checkForNull((String) inner2Obj.get("relationship-value"));
+									if (rShipKey.equalsIgnoreCase("cloud-region.cloud-owner")) {
+										tenantNewObj.put("cloudOwner", rShipVal);
+									} else if (rShipKey.equalsIgnoreCase("cloud-region.cloud-region-id")) {
+										tenantNewObj.put("cloudRegionID", rShipVal);
+									}
+
+									if (rShipKey.equalsIgnoreCase("tenant.tenant-id")) {
+										tenantNewObj.put("tenantID", rShipVal);
+									}
+								}
+							}
+
+							JSONArray relatedTPropArray = (JSONArray) inner1Obj.get("related-to-property");
+							if (relatedTPropArray != null) {
+								Iterator i3 = relatedTPropArray.iterator();
+
+								while (i3.hasNext()) {
+									JSONObject inner3Obj = (JSONObject) i3.next();
+
+									if (inner3Obj == null)
+										continue;
+
+									String propKey = checkForNull((String) inner3Obj.get("property-key"));
+									String propVal = checkForNull((String) inner3Obj.get("property-value"));
+									if (propKey.equalsIgnoreCase("tenant.tenant-name")) {
+										tenantNewObj.put("tenantName", propVal);
+									}
+								}
+							}
+							bconvert = true;
+							tenantArray.add(tenantNewObj);
+						}
+					}
+
+				}
+			}
+		} catch (NullPointerException ex) {
+
+
+		}
+
+		if (bconvert)
+			return tenantArray.toJSONString();
+		else
+			return "";
+
+	}
+
+}
\ No newline at end of file
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/aai/AaiClientInterface.java b/vid-app-common/src/main/java/org/openecomp/vid/aai/AaiClientInterface.java
new file mode 100644
index 000000000..fdaf602f4
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/aai/AaiClientInterface.java
@@ -0,0 +1,22 @@
+package org.openecomp.vid.aai;
+
+import org.openecomp.vid.aai.model.AaiGetTenatns.GetTenantsResponse;
+import org.openecomp.vid.model.SubscriberList;
+
+import java.util.List;
+
+/**
+ * Created by Oren on 7/4/17.
+ */
+public interface AaiClientInterface {
+
+    AaiResponse<SubscriberList> getAllSubscribers();
+
+    AaiResponse getSubscriberData(String subscriberId);
+
+    AaiResponse getServices();
+
+    AaiResponse<GetTenantsResponse[]> getTenants(String globalCustomerId, String serviceType);
+    
+    AaiResponse getAllAicZones();
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/aai/AaiResponse.java b/vid-app-common/src/main/java/org/openecomp/vid/aai/AaiResponse.java
new file mode 100644
index 000000000..337d1371d
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/aai/AaiResponse.java
@@ -0,0 +1,21 @@
+package org.openecomp.vid.aai;
+
+import org.openecomp.vid.model.ProxyResponse;
+
+/**
+ * Created by Oren on 7/10/17.
+ */
+public class AaiResponse<T> extends ProxyResponse{
+
+    T t;
+
+    public AaiResponse(T t, String errorMessage, int aaiHttpCode) {
+        this.t = t;
+        this.errorMessage = errorMessage;
+        this.httpCode = aaiHttpCode;
+    }
+
+    public T getT() {
+        return t;
+    }
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/aai/ServiceInstance.java b/vid-app-common/src/main/java/org/openecomp/vid/aai/ServiceInstance.java
new file mode 100644
index 000000000..45f7947ef
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/aai/ServiceInstance.java
@@ -0,0 +1,33 @@
+package org.openecomp.vid.aai;
+
+import org.codehaus.jackson.annotate.JsonIgnoreProperties;
+import org.codehaus.jackson.annotate.JsonProperty;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class ServiceInstance {
+	
+	@JsonProperty("service-instance-id")
+	public String serviceInstanceId;
+
+	@JsonProperty("service-instance-name")
+	public String serviceInstanceName;
+	
+	@JsonProperty("persona-model-id")
+	public String personaModelId;
+	
+	@JsonProperty("persona-model-version")
+	public String personaModelVersion;
+	
+	@JsonProperty("resource-version")
+	public String resourceVersion;
+	
+	@JsonProperty("orchestration-status")
+	public String orchestrationStatus;
+
+	@JsonProperty("model-invariant-id")
+	public String modelInvariantId;
+
+	@JsonProperty("model-version-id")
+	public String modelVersionId;
+
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/aai/ServiceInstances.java b/vid-app-common/src/main/java/org/openecomp/vid/aai/ServiceInstances.java
new file mode 100644
index 000000000..063317e43
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/aai/ServiceInstances.java
@@ -0,0 +1,14 @@
+package org.openecomp.vid.aai;
+
+import org.codehaus.jackson.annotate.JsonIgnoreProperties;
+import org.codehaus.jackson.annotate.JsonProperty;
+
+import java.util.List;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class ServiceInstances {
+	
+	@JsonProperty("service-instance")
+	public List<ServiceInstance> serviceInstance;
+
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/aai/ServiceSubscription.java b/vid-app-common/src/main/java/org/openecomp/vid/aai/ServiceSubscription.java
new file mode 100644
index 000000000..6a178d970
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/aai/ServiceSubscription.java
@@ -0,0 +1,20 @@
+package org.openecomp.vid.aai;
+
+import org.codehaus.jackson.annotate.JsonIgnoreProperties;
+import org.codehaus.jackson.annotate.JsonProperty;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class ServiceSubscription {
+	
+    @JsonProperty("service-type")
+    public String serviceType;
+
+    @JsonProperty("resource-version")
+    public String resourceVersion;
+
+    @JsonProperty("service-instances")
+    public ServiceInstances serviceInstances;
+
+    @JsonProperty("is-permitted")
+    public boolean isPermitted =false;
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/aai/ServiceSubscriptions.java b/vid-app-common/src/main/java/org/openecomp/vid/aai/ServiceSubscriptions.java
new file mode 100644
index 000000000..eaadba2cc
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/aai/ServiceSubscriptions.java
@@ -0,0 +1,17 @@
+package org.openecomp.vid.aai;
+
+import org.codehaus.jackson.annotate.JsonIgnoreProperties;
+import org.codehaus.jackson.annotate.JsonProperty;
+
+import java.util.List;
+
+/**
+ * Created by Oren on 7/9/17.
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+
+public class ServiceSubscriptions {
+
+    @JsonProperty("service-subscription")
+    public List<ServiceSubscription> serviceSubscription;
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/aai/Services.java b/vid-app-common/src/main/java/org/openecomp/vid/aai/Services.java
new file mode 100644
index 000000000..e8148a92c
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/aai/Services.java
@@ -0,0 +1,24 @@
+package org.openecomp.vid.aai;
+
+import org.codehaus.jackson.annotate.JsonIgnoreProperties;
+import org.codehaus.jackson.annotate.JsonProperty;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class Services {
+    @JsonProperty("global-customer-id")
+    public String globalCustomerId;
+
+    @JsonProperty("subscriber-name")
+    public String subscriberName;
+
+    @JsonProperty("subscriber-type")
+    public String subscriberType;
+
+    @JsonProperty("resource-version")
+    public String resourceVersion;
+    
+    @JsonProperty("service-subscriptions")
+    public ServiceSubscriptions serviceSubscriptions;
+
+
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/aai/SubscriberAaiResponse.java b/vid-app-common/src/main/java/org/openecomp/vid/aai/SubscriberAaiResponse.java
new file mode 100644
index 000000000..53304e933
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/aai/SubscriberAaiResponse.java
@@ -0,0 +1,24 @@
+package org.openecomp.vid.aai;
+
+import org.openecomp.vid.model.ProxyResponse;
+import org.openecomp.vid.model.SubscriberList;
+
+/**
+ * Created by Oren on 7/5/17.
+ */
+public class SubscriberAaiResponse extends ProxyResponse {
+
+
+    private SubscriberList subscriberList;
+
+    public SubscriberAaiResponse(SubscriberList subscriberList, String errorMessage, int aaiHttpCode) {
+        this.subscriberList = subscriberList;
+        this.errorMessage = errorMessage;
+        this.httpCode = aaiHttpCode;
+    }
+
+
+    public SubscriberList getSubscriberList() {
+        return subscriberList;
+    }
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/aai/SubscriberData.java b/vid-app-common/src/main/java/org/openecomp/vid/aai/SubscriberData.java
new file mode 100644
index 000000000..efaa47885
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/aai/SubscriberData.java
@@ -0,0 +1,7 @@
+package org.openecomp.vid.aai;
+
+/**
+ * Created by Oren on 7/10/17.
+ */
+public class SubscriberData {
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/aai/SubscriberFilteredResults.java b/vid-app-common/src/main/java/org/openecomp/vid/aai/SubscriberFilteredResults.java
new file mode 100644
index 000000000..c2afee334
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/aai/SubscriberFilteredResults.java
@@ -0,0 +1,29 @@
+package org.openecomp.vid.aai;
+
+import org.openecomp.vid.model.ProxyResponse;
+import org.openecomp.vid.model.SubscriberList;
+import org.openecomp.vid.roles.RoleValidator;
+
+/**
+ * Created by Oren on 7/5/17.
+ */
+
+public class SubscriberFilteredResults extends ProxyResponse {
+
+    private SubscriberListWithFilterData subscriberList;
+
+    public SubscriberFilteredResults(RoleValidator roleValidator,SubscriberList subscribers, String errorMessage, int aaiHttpCode) {
+        this.subscriberList = new SubscriberListWithFilterData(subscribers,roleValidator);
+        this.errorMessage = errorMessage;
+        this.httpCode = aaiHttpCode;
+    }
+
+
+    public SubscriberListWithFilterData getSubscriberList() {
+        return subscriberList;
+    }
+
+    public void setSubscriberList(SubscriberListWithFilterData subscriberList) {
+        this.subscriberList = subscriberList;
+    }
+}
\ No newline at end of file
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/aai/SubscriberListWithFilterData.java b/vid-app-common/src/main/java/org/openecomp/vid/aai/SubscriberListWithFilterData.java
new file mode 100644
index 000000000..75f505f25
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/aai/SubscriberListWithFilterData.java
@@ -0,0 +1,31 @@
+package org.openecomp.vid.aai;
+
+import org.openecomp.vid.model.Subscriber;
+import org.openecomp.vid.model.SubscriberList;
+import org.openecomp.vid.roles.RoleValidator;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by Oren on 7/5/17.
+ */
+public class SubscriberListWithFilterData {
+
+    public SubscriberListWithFilterData(SubscriberList subscriberList, RoleValidator roleValidator){
+        List<Subscriber> subscribers = subscriberList.customer;
+        List<SubscriberWithFilter> subscribersWithFilter = new ArrayList<>();
+        for (Subscriber subscriber :subscribers){
+            SubscriberWithFilter subscriberWithFilter = new SubscriberWithFilter();
+            subscriberWithFilter.setIsPermitted(roleValidator.isSubscriberPermitted(subscriber.globalCustomerId));
+            subscriberWithFilter.subscriberType = subscriber.subscriberType;
+            subscriberWithFilter.resourceVersion = subscriber.resourceVersion;
+            subscriberWithFilter.subscriberName = subscriber.subscriberName;
+            subscriberWithFilter.globalCustomerId = subscriber.globalCustomerId;
+            subscribersWithFilter.add(subscriberWithFilter);
+        }
+        this.customer = subscribersWithFilter;
+     }
+
+    public List<SubscriberWithFilter> customer;
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/aai/SubscriberWithFilter.java b/vid-app-common/src/main/java/org/openecomp/vid/aai/SubscriberWithFilter.java
new file mode 100644
index 000000000..abd9c0f32
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/aai/SubscriberWithFilter.java
@@ -0,0 +1,21 @@
+package org.openecomp.vid.aai;
+
+import org.codehaus.jackson.annotate.JsonProperty;
+import org.openecomp.vid.model.Subscriber;
+
+/**
+ * Created by Oren on 7/5/17.
+ */
+public class SubscriberWithFilter extends Subscriber{
+
+    @JsonProperty("is-permitted")
+    private boolean isPermitted;
+
+    public boolean getIsPermitted() {
+        return isPermitted;
+    }
+
+    public void setIsPermitted(boolean isPermitted) {
+        this.isPermitted = isPermitted;
+    }
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/aai/exceptions/InvalidAAIResponseException.java b/vid-app-common/src/main/java/org/openecomp/vid/aai/exceptions/InvalidAAIResponseException.java
new file mode 100644
index 000000000..f84c09afa
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/aai/exceptions/InvalidAAIResponseException.java
@@ -0,0 +1,7 @@
+package org.openecomp.vid.aai.exceptions;
+
+/**
+ * Created by Oren on 7/4/17.
+ */
+public class InvalidAAIResponseException extends Exception {
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/aai/model/AaiGetServicesRequestModel/GetServicesAAIRespone.java b/vid-app-common/src/main/java/org/openecomp/vid/aai/model/AaiGetServicesRequestModel/GetServicesAAIRespone.java
new file mode 100644
index 000000000..27c38ce8a
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/aai/model/AaiGetServicesRequestModel/GetServicesAAIRespone.java
@@ -0,0 +1,11 @@
+package org.openecomp.vid.aai.model.AaiGetServicesRequestModel;
+
+import org.codehaus.jackson.annotate.JsonIgnoreProperties;
+import org.codehaus.jackson.annotate.JsonProperty;
+
+import java.util.List;
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class GetServicesAAIRespone {
+
+    public List<Service> service;
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/aai/model/AaiGetServicesRequestModel/Service.java b/vid-app-common/src/main/java/org/openecomp/vid/aai/model/AaiGetServicesRequestModel/Service.java
new file mode 100644
index 000000000..977e57e67
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/aai/model/AaiGetServicesRequestModel/Service.java
@@ -0,0 +1,21 @@
+package org.openecomp.vid.aai.model.AaiGetServicesRequestModel;
+
+import org.codehaus.jackson.annotate.JsonIgnoreProperties;
+import org.codehaus.jackson.annotate.JsonProperty;
+
+/**
+ * Created by Oren on 7/17/17.
+ */
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class Service {
+    @JsonProperty("service-id")
+    public String serviceId;
+    @JsonProperty("service-description")
+    public String serviceDescription;
+    @JsonProperty("resource-version")
+    public String resourceVersion;
+    @JsonProperty("is-permitted")
+    public boolean isPermitted;
+
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/aai/model/AaiGetTenatns/GetTenantsResponse.java b/vid-app-common/src/main/java/org/openecomp/vid/aai/model/AaiGetTenatns/GetTenantsResponse.java
new file mode 100644
index 000000000..5e88bf37e
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/aai/model/AaiGetTenatns/GetTenantsResponse.java
@@ -0,0 +1,26 @@
+package org.openecomp.vid.aai.model.AaiGetTenatns;
+
+import org.codehaus.jackson.annotate.JsonIgnoreProperties;
+import org.codehaus.jackson.annotate.JsonProperty;
+
+/**
+ * Created by Oren on 7/18/17.
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class GetTenantsResponse {
+
+    @JsonProperty("cloudRegionID")
+    public String cloudRegionId;
+
+    @JsonProperty("tenantName")
+    public String tenantName;
+
+    @JsonProperty("tenantID")
+    public String tenantID;
+
+    @JsonProperty("is-permitted")
+    public boolean isPermitted;
+
+
+
+}
\ No newline at end of file
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/aai/model/ServiceInstance.java b/vid-app-common/src/main/java/org/openecomp/vid/aai/model/ServiceInstance.java
new file mode 100644
index 000000000..9fe4c06bc
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/aai/model/ServiceInstance.java
@@ -0,0 +1,26 @@
+package org.openecomp.vid.aai.model;
+
+import org.codehaus.jackson.annotate.JsonProperty;
+
+public class ServiceInstance {
+	
+	@JsonProperty("service-instance-id")
+	public String serviceInstanceId;
+
+	@JsonProperty("service-instance-name")
+	public String serviceInstanceName;
+	
+	@JsonProperty("persona-model-id")
+	public String personaModelId;
+	
+	@JsonProperty("persona-model-version")
+	public String personaModelVersion;
+	
+	@JsonProperty("resource-version")
+	public String resourceVersion;
+	
+	@JsonProperty("orchestration-status")
+	public String orchestrationStatus;
+
+	
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/aai/model/ServiceInstances.java b/vid-app-common/src/main/java/org/openecomp/vid/aai/model/ServiceInstances.java
new file mode 100644
index 000000000..163ed0458
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/aai/model/ServiceInstances.java
@@ -0,0 +1,12 @@
+package org.openecomp.vid.aai.model;
+
+import java.util.List;
+
+import org.codehaus.jackson.annotate.JsonProperty;
+
+public class ServiceInstances {
+	
+	@JsonProperty("service-instance")
+	public List<ServiceInstance> serviceInstance;
+
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/aai/model/ServiceSubscription.java b/vid-app-common/src/main/java/org/openecomp/vid/aai/model/ServiceSubscription.java
new file mode 100644
index 000000000..02ddfd178
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/aai/model/ServiceSubscription.java
@@ -0,0 +1,17 @@
+package org.openecomp.vid.aai.model;
+
+import org.codehaus.jackson.annotate.JsonProperty;
+
+public class ServiceSubscription {
+	
+    @JsonProperty("service-type")
+    public String serviceType;
+
+    @JsonProperty("resource-version")
+    public String resourceVersion;
+
+    @JsonProperty("service-instances")
+    public ServiceInstances serviceInstances;
+
+
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/aai/model/Services.java b/vid-app-common/src/main/java/org/openecomp/vid/aai/model/Services.java
new file mode 100644
index 000000000..6e7b89070
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/aai/model/Services.java
@@ -0,0 +1,24 @@
+package org.openecomp.vid.aai.model;
+
+import java.util.List;
+
+import org.codehaus.jackson.annotate.JsonProperty;
+
+public class Services {
+    @JsonProperty("global-customer-id")
+    public String globalCustomerId;
+
+    @JsonProperty("subscriber-name")
+    public String subscriberName;
+
+    @JsonProperty("subscriber-type")
+    public String subscriberType;
+
+    @JsonProperty("resource-version")
+    public String resourceVersion;
+    
+    @JsonProperty("service-subscriptions")
+    public List<ServiceSubscription> serviceSubscriptions;
+
+
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/SecureService.java b/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/SecureService.java
new file mode 100644
index 000000000..1372472f5
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/SecureService.java
@@ -0,0 +1,9 @@
+package org.openecomp.vid.asdc.beans;
+
+/**
+ * Created by Oren on 6/27/17.
+ */
+public class SecureService extends  Service{
+
+    public boolean isPermmited = true;
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/SecureServices.java b/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/SecureServices.java
new file mode 100644
index 000000000..0d2c2fba2
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/SecureServices.java
@@ -0,0 +1,30 @@
+package org.openecomp.vid.asdc.beans;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * Created by Oren on 6/27/17.
+ */
+public class SecureServices {
+
+    private Collection<Service> services;
+    private boolean isReadOnly = true;
+
+    public void setServices(Collection<Service> services) {
+        this.services = services;
+    }
+
+    public Collection<Service> getServices() {
+
+        return services;
+    }
+    public boolean isReadOnly() {
+        return isReadOnly;
+    }
+
+    public void setReadOnly(boolean readOnly) {
+        isReadOnly = readOnly;
+    }
+
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/ToscaMetadata.java b/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/ToscaMetadata.java
index d42c1f150..41c7ca5ba 100755
--- a/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/ToscaMetadata.java
+++ b/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/ToscaMetadata.java
@@ -61,6 +61,9 @@ public class ToscaMetadata {
 	/** The resource vendor release. */

 	private String resourceVendorRelease;

 	

+	/** the resourceVendorModelNumber */

+	private String resourceVendorModelNumber;

+

 	/** The service ecomp naming. */

 	private String serviceEcompNaming;

 	

@@ -88,6 +91,11 @@ public class ToscaMetadata {
 	

 	/** The vf module model version. */

 	private String vfModuleModelVersion;

+

+        /** serviceType */

+        private String serviceType;

+        /** serviceRole */

+        private String serviceRole;

 	

 	/**

 	 * Instantiates a new tosca metadata.

@@ -458,4 +466,26 @@ public class ToscaMetadata {
 		

 		return vfModuleModelCustomizationUUID;

 	}

+

+        /** serviceType */

+        public String getServiceType() {

+                return serviceType;

+        }

+        public void setServiceType(String serviceType) {

+                this.serviceType= serviceType;

+        }

+        /** serviceRole */

+        public String getServiceRole() {

+                return serviceRole;

+        }

+        public void setServiceRole(String serviceRole) {

+                this.serviceRole= serviceRole;

+        }

+        /** resourceVendorModelNumber */

+        public String getResourceVendorModelNumber() {

+                return resourceVendorModelNumber;

+        }

+        public void setResourceVendorModelNumber(String resourceVendorModelNumber) {

+                this.resourceVendorModelNumber= resourceVendorModelNumber;

+        }

 }

diff --git a/vid-app-common/src/main/java/org/openecomp/vid/asdc/local/LocalAsdcClient.java b/vid-app-common/src/main/java/org/openecomp/vid/asdc/local/LocalAsdcClient.java
index 8538f6ba6..d73c75b38 100644
--- a/vid-app-common/src/main/java/org/openecomp/vid/asdc/local/LocalAsdcClient.java
+++ b/vid-app-common/src/main/java/org/openecomp/vid/asdc/local/LocalAsdcClient.java
@@ -264,7 +264,7 @@ public class LocalAsdcClient implements AsdcClient {
      * @see org.openecomp.vid.asdc.AsdcClient#getResourceArtifact(java.util.UUID, java.util.UUID)
      */
     public Artifact getResourceArtifact(UUID resourceUuid, UUID artifactUuid) throws AsdcCatalogException {
-        final JSONArray artifacts = getCatalog().getJSONObject("resources")
+        final  JSONArray artifacts = getCatalog().getJSONObject("resources")
                 .getJSONObject(resourceUuid.toString())
                 .getJSONArray("artifacts");
 
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/asdc/parser/ToscaParserImpl2.java b/vid-app-common/src/main/java/org/openecomp/vid/asdc/parser/ToscaParserImpl2.java
index 4819cae8f..3f0dd8c31 100644
--- a/vid-app-common/src/main/java/org/openecomp/vid/asdc/parser/ToscaParserImpl2.java
+++ b/vid-app-common/src/main/java/org/openecomp/vid/asdc/parser/ToscaParserImpl2.java
@@ -7,7 +7,6 @@ import org.openecomp.sdc.tosca.parser.impl.SdcToscaParserFactory;
 import org.openecomp.sdc.toscaparser.api.Group;
 import org.openecomp.sdc.toscaparser.api.NodeTemplate;
 import org.openecomp.sdc.toscaparser.api.Property;
-import org.openecomp.sdc.toscaparser.api.elements.constraints.Constraint;
 import org.openecomp.sdc.toscaparser.api.parameters.Input;
 import org.openecomp.vid.asdc.beans.Service;
 import org.openecomp.vid.model.*;
@@ -23,8 +22,11 @@ public class ToscaParserImpl2 {
 	public class Constants {
 		public final static String uuid = "UUID";
 		public final static String description = "description";
-		public final static String ecompGeneratedNaming = "ecompGeneratedNaming";
-		public final static String customizationUUID = "customizationUUID";
+		public final static String serviceType = "serviceType";
+        public final static String serviceRole = "serviceRole";
+        public final static String ecompGeneratedNaming = "ecompGeneratedNaming";
+
+        public final static String customizationUUID = "customizationUUID";
 		public final static String vfModuleModelVersion = "vfModuleModelVersion";
 		public final static String vfModuleModelCustomizationUUID = "vfModuleModelCustomizationUUID";
 		public final static String volume_group = "volume_group";
@@ -49,7 +51,7 @@ public class ToscaParserImpl2 {
         serviceModel.setService(extractServiceFromCsar(asdcServiceMetadata, sdcCsarHelper));
         serviceModel.setVolumeGroups(extractVolumeGroups(sdcCsarHelper));
         serviceModel.setVfModules(extractVfModuleFromCsar(sdcCsarHelper));
-        serviceModel.setVnfs(extractVnfsFromCsar(sdcCsarHelper));
+        serviceModel.setVnfs(extractVnfsFromCsar(serviceModel,sdcCsarHelper));
         serviceModel.setNetworks(extractNetworksFromCsar(sdcCsarHelper));
         return serviceModel;
     }
@@ -65,22 +67,52 @@ public class ToscaParserImpl2 {
         service.setDescription(csarHelper.getServiceMetadata().getValue(Constants.description));
         service.setInputs(inputsListToInputsMap(csarHelper.getServiceInputs()));
         service.setServiceEcompNaming(csarHelper.getServiceMetadata().getValue(Constants.ecompGeneratedNaming));
+        service.setServiceType(csarHelper.getServiceMetadata().getValue(Constants.serviceType));
+        service.setServiceRole(csarHelper.getServiceMetadata().getValue(Constants.serviceRole));
+
         return service;
     }
     
-    private Map<String, VNF> extractVnfsFromCsar(ISdcCsarHelper csarHelper) {
+    private Map<String, VNF> extractVnfsFromCsar(ServiceModel serviceModel,ISdcCsarHelper csarHelper) {
         List<NodeTemplate> nodeTemplates = csarHelper.getServiceVfList();
         Map<String, VNF> vnfsMaps = new HashMap<String, VNF>();
 
         for (NodeTemplate nodeTemplate : nodeTemplates) {
             VNF vnf = new VNF();
             populateNodeFromNodeTemplate(nodeTemplate, csarHelper, vnf);
+
             vnf.setModelCustomizationName(nodeTemplate.getName());
+            Map<String, VfModule> vfModuleHashMap = getVfModulesFromVF(csarHelper, vnf.getCustomizationUuid());
+            vnf.setVfModules(vfModuleHashMap);
+
+            Map<String, VolumeGroup> volumeGroupMap = getVolumeGroupsFromVF(csarHelper, vnf.getCustomizationUuid());
+            vnf.setVolumeGroups(volumeGroupMap);
+
             vnfsMaps.put(nodeTemplate.getName(), vnf);
         }
         return vnfsMaps;
     }
 
+    private Map<String, VfModule> getVfModulesFromVF(ISdcCsarHelper csarHelper, String vfUuid) {
+        Map<String,VfModule> vfModuleHashMap = new HashMap<String,VfModule>();
+        for (Group group : csarHelper.getVfModulesByVf(vfUuid)) {
+            vfModuleHashMap.put(group.getName(), populateVfModuleFromGroup(group));
+        }
+        return vfModuleHashMap;
+    }
+
+    private Map<String, VolumeGroup> getVolumeGroupsFromVF(ISdcCsarHelper csarHelper, String vfCustomizationUuid) {
+        Map<String,VolumeGroup> volumeGroupMap = new HashMap<String,VolumeGroup>();
+        List<Group> groups = csarHelper.getVfModulesByVf(vfCustomizationUuid);
+        for (Group group : groups) {
+            boolean isVolumeGroup = Boolean.valueOf(group.getPropertyValue(Constants.volume_group).toString());
+            if (isVolumeGroup) {
+                volumeGroupMap.put(group.getName(), populateVolumeGroupFromGroup(group));
+            }
+        }
+        return volumeGroupMap;
+    }
+
     private Map<String, Network> extractNetworksFromCsar(ISdcCsarHelper csarHelper) {
         List<NodeTemplate> nodeTemplates = csarHelper.getServiceVlList();
         Map<String, Network> networksMap = new HashMap<String, Network>();
@@ -99,25 +131,19 @@ public class ToscaParserImpl2 {
         HashMap<String, VfModule> vfModuleHashMap = new HashMap<>();
 
         for (NodeTemplate nodeTemplate : serviceVfList) {
-            List<Group> groups = csarHelper.getVfModulesByVf(nodeTemplate.getMetaData().getValue(Constants.customizationUUID));
-            for (Group group : groups) {
-                vfModuleHashMap.put(group.getName(), populateVfModuleFromGroup(group));
-            }
+            Map<String, VfModule> nodeTemplateVfModule =
+                    getVfModulesFromVF(csarHelper, nodeTemplate.getMetaData().getValue(Constants.customizationUUID));
+            vfModuleHashMap.putAll(nodeTemplateVfModule);
         }
         return vfModuleHashMap;
     }
 
-
     private Map<String, VolumeGroup> extractVolumeGroups(ISdcCsarHelper csarHelper) {
         HashMap<String, VolumeGroup> volumeGroupHashMap = new HashMap<>();
         for (NodeTemplate nodeTemplate : csarHelper.getServiceVfList()) {
-            List<Group> groups = csarHelper.getVfModulesByVf(csarHelper.getNodeTemplateCustomizationUuid(nodeTemplate));
-            for (Group group : groups) {
-                boolean isVolumeGroup = Boolean.valueOf(group.getPropertyValue(Constants.volume_group).toString());
-                if (isVolumeGroup) {
-                    volumeGroupHashMap.put(group.getName(), populateVolumeGroupFromGroup(group));
-                }
-            }
+            Map<String, VolumeGroup> nodeTemplateVolumeGroups =
+                    getVolumeGroupsFromVF(csarHelper, csarHelper.getNodeTemplateCustomizationUuid(nodeTemplate));
+            volumeGroupHashMap.putAll(nodeTemplateVolumeGroups);
         }
         return volumeGroupHashMap;
     }
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/asdc/rest/RestfulAsdcClient.java b/vid-app-common/src/main/java/org/openecomp/vid/asdc/rest/RestfulAsdcClient.java
index 5b783f5cd..67375aa6c 100755
--- a/vid-app-common/src/main/java/org/openecomp/vid/asdc/rest/RestfulAsdcClient.java
+++ b/vid-app-common/src/main/java/org/openecomp/vid/asdc/rest/RestfulAsdcClient.java
@@ -57,6 +57,7 @@ import java.util.UUID;
 /**

  * The Class RestfulAsdcClient.

  */

+@SuppressWarnings("Duplicates")

 public class RestfulAsdcClient implements AsdcClient {

 

     /**

@@ -183,6 +184,7 @@ public class RestfulAsdcClient implements AsdcClient {
      * @see org.openecomp.vid.asdc.AsdcClient#getResource(java.util.UUID)

      */

     public Resource getResource(UUID uuid) throws AsdcCatalogException {

+

         String path = VidProperties.getPropertyWithDefault(ModelConstants.ASDC_RESOURCE_API_PATH, ModelConstants.DEFAULT_ASDC_RESOURCE_API_PATH);

         try {

             return getClient()

diff --git a/vid-app-common/src/main/java/org/openecomp/vid/client/FakeHttpSession.java b/vid-app-common/src/main/java/org/openecomp/vid/client/FakeHttpSession.java
new file mode 100644
index 000000000..226e6c4d2
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/client/FakeHttpSession.java
@@ -0,0 +1,224 @@
+package org.openecomp.vid.client;
+
+import org.apache.commons.io.IOUtils;
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.json.JSONTokener;
+
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpSession;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Created by pickjonathan on 03/07/2017.
+ */
+public class FakeHttpSession implements HttpSession {
+
+    /**
+     * Setup the creation time
+     */
+    public FakeHttpSession() {
+        File file = new File("resources/roles.json");
+
+        String rolesInputStream = null;
+        try {
+            rolesInputStream = IOUtils.toString(FakeHttpSession.class.getClassLoader().getResourceAsStream("roles.json"),"UTF8");
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        JSONTokener tokener = new JSONTokener(rolesInputStream);
+        JSONObject roles = new JSONObject(tokener);
+
+        JSONArray rolesArray = roles.getJSONArray("roles");
+
+        //set permissions to the roles from file.
+        this.setAttribute("role", rolesArray);
+
+        creationTime = System.currentTimeMillis();
+    }
+
+
+    /**
+     * Setup the creation time
+     * @param id The new session id
+     */
+    public FakeHttpSession(String id)
+    {
+        this.id = id;
+        creationTime = System.currentTimeMillis();
+    }
+
+    /* (non-Javadoc)
+     * @see javax.servlet.http.HttpSession#getCreationTime()
+     */
+    public long getCreationTime()
+    {
+        return creationTime;
+    }
+
+    /* (non-Javadoc)
+     * @see javax.servlet.http.HttpSession#getId()
+     */
+    public String getId()
+    {
+        if (id == null)
+        {
+            System.out.println("Inventing data in FakeHttpSession.getId() to remain plausible.");
+            id = "fake";
+        }
+
+        return id;
+    }
+
+    /* (non-Javadoc)
+     * @see javax.servlet.http.HttpSession#getLastAccessedTime()
+     */
+    public long getLastAccessedTime()
+    {
+        return creationTime;
+    }
+
+    /* (non-Javadoc)
+     * @see javax.servlet.http.HttpSession#getServletContext()
+     */
+    public ServletContext getServletContext()
+    {
+        return null;
+    }
+
+    /* (non-Javadoc)
+     * @see javax.servlet.http.HttpSession#setMaxInactiveInterval(int)
+     */
+    public void setMaxInactiveInterval(int maxInactiveInterval)
+    {
+        this.maxInactiveInterval = maxInactiveInterval;
+    }
+
+    /* (non-Javadoc)
+     * @see javax.servlet.http.HttpSession#getMaxInactiveInterval()
+     */
+    public int getMaxInactiveInterval()
+    {
+        return maxInactiveInterval;
+    }
+
+    /**
+     * @see javax.servlet.http.HttpSession#getSessionContext()
+     * @deprecated
+     */
+    @SuppressWarnings({"UnnecessaryFullyQualifiedName"})
+    @Deprecated
+    public javax.servlet.http.HttpSessionContext getSessionContext()
+    {
+        return null;
+    }
+
+    /* (non-Javadoc)
+     * @see javax.servlet.http.HttpSession#getAttribute(java.lang.String)
+     */
+    public Object getAttribute(String name)
+    {
+        return attributes.get(name);
+    }
+
+    /* (non-Javadoc)
+     * @see javax.servlet.http.HttpSession#getValue(java.lang.String)
+     */
+    @Deprecated
+    public Object getValue(String name)
+    {
+        return attributes.get(name);
+    }
+
+    /* (non-Javadoc)
+     * @see javax.servlet.http.HttpSession#getAttributeNames()
+     */
+    public Enumeration<String> getAttributeNames()
+    {
+        return Collections.enumeration(attributes.keySet());
+    }
+
+    /* (non-Javadoc)
+     * @see javax.servlet.http.HttpSession#getValueNames()
+     */
+    @Deprecated
+    public String[] getValueNames()
+    {
+        return attributes.keySet().toArray(new String[attributes.keySet().size()]);
+    }
+
+    /* (non-Javadoc)
+     * @see javax.servlet.http.HttpSession#setAttribute(java.lang.String, java.lang.Object)
+     */
+    public void setAttribute(String name, Object value)
+    {
+        attributes.put(name, value);
+    }
+
+    /* (non-Javadoc)
+     * @see javax.servlet.http.HttpSession#putValue(java.lang.String, java.lang.Object)
+     */
+    @Deprecated
+    public void putValue(String name, Object value)
+    {
+        attributes.put(name, value);
+    }
+
+    /* (non-Javadoc)
+     * @see javax.servlet.http.HttpSession#removeAttribute(java.lang.String)
+     */
+    public void removeAttribute(String name)
+    {
+        attributes.remove(name);
+    }
+
+    /* (non-Javadoc)
+     * @see javax.servlet.http.HttpSession#removeValue(java.lang.String)
+     */
+    @Deprecated
+    public void removeValue(String name)
+    {
+        attributes.remove(name);
+    }
+
+    /* (non-Javadoc)
+     * @see javax.servlet.http.HttpSession#invalidate()
+     */
+    public void invalidate()
+    {
+    }
+
+    /* (non-Javadoc)
+     * @see javax.servlet.http.HttpSession#isNew()
+     */
+    public boolean isNew()
+    {
+        return true;
+    }
+
+    /**
+     * The session id
+     */
+    private String id = null;
+
+    /**
+     * The list of attributes
+     */
+    private Map<String, Object> attributes = new HashMap<String, Object>();
+
+    /**
+     * When were we created
+     */
+    private long creationTime;
+
+    /**
+     * How long before we timeout?
+     */
+    private int maxInactiveInterval = 30 * 60 * 1000;
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/client/HttpsBasicClient.java b/vid-app-common/src/main/java/org/openecomp/vid/client/HttpsBasicClient.java
index dc0e35590..676a7e798 100755
--- a/vid-app-common/src/main/java/org/openecomp/vid/client/HttpsBasicClient.java
+++ b/vid-app-common/src/main/java/org/openecomp/vid/client/HttpsBasicClient.java
@@ -95,7 +95,7 @@ public class HttpsBasicClient{
 			//May need to make the algorithm a parameter. MSO requires TLSv1.1	or TLSv1.2

 			ctx = SSLContext.getInstance("TLSv1.2");

 			

-			/* 

+			/*

 			KeyManagerFactory kmf = null;

 			try {

 				kmf = KeyManagerFactory.getInstance("SunX509");

@@ -113,7 +113,7 @@ public class HttpsBasicClient{
 			ctx.init(kmf.getKeyManagers(), null, null);

 			*/

 			ctx.init(null, null, null);

-			//config.getProperties().put(HTTPSProperties.PROPERTY_HTTPS_PROPERTIES, 

+			//config.getProperties().put(HTTPSProperties.PROPERTY_HTTPS_PROPERTIES,

 			//							new HTTPSProperties( , ctx));

 			

 			return ClientBuilder.newBuilder()

diff --git a/vid-app-common/src/main/java/org/openecomp/vid/controller/AaiController.java b/vid-app-common/src/main/java/org/openecomp/vid/controller/AaiController.java
index 861ddf8da..c0b6a5140 100755
--- a/vid-app-common/src/main/java/org/openecomp/vid/controller/AaiController.java
+++ b/vid-app-common/src/main/java/org/openecomp/vid/controller/AaiController.java
@@ -18,31 +18,27 @@
  * ============LICENSE_END=========================================================

  */

 

-package  org.openecomp.vid.controller;

-

-import java.io.File;

-import java.io.IOException;

-import java.text.DateFormat;

-import java.text.SimpleDateFormat;

-import java.util.Date;

-import java.util.HashMap;

-import java.util.Iterator;

-import java.util.Map;

-import java.util.UUID;

-

-import javax.servlet.ServletContext;

-import javax.servlet.http.HttpServletRequest;

-import javax.servlet.http.HttpSession;

-import javax.ws.rs.BadRequestException;

-import javax.ws.rs.DefaultValue;

-import javax.ws.rs.QueryParam;

-import javax.ws.rs.WebApplicationException;

-import javax.ws.rs.core.Response;

+package org.openecomp.vid.controller;

 

+import org.codehaus.jackson.JsonGenerationException;

+import org.codehaus.jackson.map.JsonMappingException;

+import org.codehaus.jackson.map.ObjectMapper;

 import org.json.simple.JSONArray;

 import org.json.simple.JSONObject;

 import org.json.simple.parser.JSONParser;

 import org.openecomp.aai.util.AAIRestInterface;

+import org.openecomp.portalsdk.core.controller.RestrictedBaseController;

+import org.openecomp.portalsdk.core.domain.User;

+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;

+import org.openecomp.portalsdk.core.util.SystemProperties;

+import org.openecomp.vid.aai.AaiResponse;

+import org.openecomp.vid.aai.SubscriberData;

+import org.openecomp.vid.aai.SubscriberFilteredResults;

+import org.openecomp.vid.aai.model.AaiGetTenatns.GetTenantsResponse;

+import org.openecomp.vid.roles.Role;

+import org.openecomp.vid.roles.RoleProvider;

+import org.openecomp.vid.roles.RoleValidator;

+import org.openecomp.vid.services.AaiService;

 import org.springframework.beans.factory.annotation.Autowired;

 import org.springframework.http.HttpStatus;

 import org.springframework.http.MediaType;

@@ -53,35 +49,292 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;

 import org.springframework.web.servlet.ModelAndView;

 

-import org.openecomp.portalsdk.core.controller.RestrictedBaseController;

-import org.openecomp.portalsdk.core.domain.User;

-import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;

-import org.openecomp.portalsdk.core.util.SystemProperties;

+

+import javax.servlet.ServletContext;

+import javax.servlet.http.HttpServletRequest;

+import javax.servlet.http.HttpSession;

+import javax.ws.rs.BadRequestException;

+import javax.ws.rs.DefaultValue;

+import javax.ws.rs.QueryParam;

+import javax.ws.rs.WebApplicationException;

+import javax.ws.rs.core.Response;

+import java.io.File;

+import java.io.IOException;

+import java.text.DateFormat;

+import java.text.SimpleDateFormat;

+import java.util.*;

 

 /**

  * Controller to handle a&ai requests.

  */

 

 @RestController

-public class AaiController extends RestrictedBaseController{

+public class AaiController extends RestrictedBaseController {

+	

+	public AaiController() {

+		

+	}

+public  AaiController(ServletContext servletContext) {

+	this.servletContext = servletContext;

+		

+	}

+	

+	

+	

 

-	/** The view name. */

+	/**

+	 * The Constant dateFormat.

+	 */

+	final static DateFormat dateFormat = new SimpleDateFormat("HH:mm:ss:SSSS");

+	/**

+	 * The from app id.

+	 */

+	protected String fromAppId = "VidAaiController";

+	/**

+	 * The view name.

+	 */

 	String viewName;

-

-	/** The logger. */

+	/**

+	 * The logger.

+	 */

 	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(AaiController.class);

 

-	/** The Constant dateFormat. */

-	final static DateFormat dateFormat = new SimpleDateFormat("HH:mm:ss:SSSS");

 

-	/** The from app id. */

-	protected String fromAppId = "VidAaiController";

+	/**

+	 * The model.

+	 */

+	private Map<String, Object> model = new HashMap<String, Object>();

+	/**

+	 * The servlet context.

+	 */

+	@Autowired

+	private ServletContext servletContext;

+

+	/**

+	 * aai service

+	 */

+	@Autowired

+	private AaiService aaiService;

+	

+	

+

+	/**

+	 * Return tenant details.

+	 *

+	 * @param jsonObject the json object

+	 * @return String The parsing results

+	 */

+	public static String parseCustomerObjectForTenants(JSONObject jsonObject) {

+

+		JSONArray tenantArray = new JSONArray();

+		boolean bconvert = false;

+

+		try {

+

+			JSONObject serviceSubsObj = (JSONObject) jsonObject.get("service-subscriptions");

+

+			if (serviceSubsObj != null) {

+				JSONArray srvcSubArray = (JSONArray) serviceSubsObj.get("service-subscription");

+

+				if (srvcSubArray != null) {

+					Iterator i = srvcSubArray.iterator();

+

+					while (i.hasNext()) {

+

+						JSONObject innerObj = (JSONObject) i.next();

+

+						if (innerObj == null)

+							continue;

+

+						JSONObject relationShipListsObj = (JSONObject) innerObj.get("relationship-list");

+						if (relationShipListsObj != null) {

+							JSONArray rShipArray = (JSONArray) relationShipListsObj.get("relationship");

+							if (rShipArray != null) {

+								Iterator i1 = rShipArray.iterator();

+

+								while (i1.hasNext()) {

+

+									JSONObject inner1Obj = (JSONObject) i1.next();

+

+									if (inner1Obj == null)

+										continue;

+

+									String relatedTo = checkForNull((String) inner1Obj.get("related-to"));

+									if (relatedTo.equalsIgnoreCase("tenant")) {

+										JSONObject tenantNewObj = new JSONObject();

+

+										String relatedLink = checkForNull((String) inner1Obj.get("related-link"));

+										tenantNewObj.put("link", relatedLink);

+

+										JSONArray rDataArray = (JSONArray) inner1Obj.get("relationship-data");

+										if (rDataArray != null) {

+											Iterator i2 = rDataArray.iterator();

+

+											while (i2.hasNext()) {

+												JSONObject inner2Obj = (JSONObject) i2.next();

+

+												if (inner2Obj == null)

+													continue;

+

+												String rShipKey = checkForNull((String) inner2Obj.get("relationship-key"));

+												String rShipVal = checkForNull((String) inner2Obj.get("relationship-value"));

+												if (rShipKey.equalsIgnoreCase("cloud-region.cloud-owner")) {

+													tenantNewObj.put("cloudOwner", rShipVal);

+												} else if (rShipKey.equalsIgnoreCase("cloud-region.cloud-region-id")) {

+													tenantNewObj.put("cloudRegionID", rShipVal);

+												}

+

+												if (rShipKey.equalsIgnoreCase("tenant.tenant-id")) {

+													tenantNewObj.put("tenantID", rShipVal);

+												}

+											}

+										}

+

+										JSONArray relatedTPropArray = (JSONArray) inner1Obj.get("related-to-property");

+										if (relatedTPropArray != null) {

+											Iterator i3 = relatedTPropArray.iterator();

+

+											while (i3.hasNext()) {

+												JSONObject inner3Obj = (JSONObject) i3.next();

+

+												if (inner3Obj == null)

+													continue;

+

+												String propKey = checkForNull((String) inner3Obj.get("property-key"));

+												String propVal = checkForNull((String) inner3Obj.get("property-value"));

+												if (propKey.equalsIgnoreCase("tenant.tenant-name")) {

+													tenantNewObj.put("tenantName", propVal);

+												}

+											}

+										}

+										bconvert = true;

+										tenantArray.add(tenantNewObj);

+									}

+								}

+							}

+						}

+					}

+				}

+			}

+		} catch (NullPointerException ex) {

+

+

+		}

+

+		if (bconvert)

+			return tenantArray.toJSONString();

+		else

+			return "";

+

+	}

 

-	/** The model. */

-	private Map<String,Object> model = new HashMap<String,Object>();

 

-	/** The servlet context. */

-	private @Autowired ServletContext servletContext;

+

+	/**

+	 * Retrieve the service subscription from the jsonObject.

+	 *

+	 * @param jsonObject the json object

+	 * @return String

+	 */

+	public static String parseServiceSubscriptionObjectForTenants(JSONObject jsonObject) {

+

+		JSONArray tenantArray = new JSONArray();

+		boolean bconvert = false;

+

+		try {

+			JSONObject relationShipListsObj = (JSONObject) jsonObject.get("relationship-list");

+			if (relationShipListsObj != null) {

+				JSONArray rShipArray = (JSONArray) relationShipListsObj.get("relationship");

+				if (rShipArray != null) {

+					Iterator i1 = rShipArray.iterator();

+

+					while (i1.hasNext()) {

+

+						JSONObject inner1Obj = (JSONObject) i1.next();

+

+						if (inner1Obj == null)

+							continue;

+

+						String relatedTo = checkForNull((String) inner1Obj.get("related-to"));

+						if (relatedTo.equalsIgnoreCase("tenant")) {

+							JSONObject tenantNewObj = new JSONObject();

+

+							String relatedLink = checkForNull((String) inner1Obj.get("related-link"));

+							tenantNewObj.put("link", relatedLink);

+

+							JSONArray rDataArray = (JSONArray) inner1Obj.get("relationship-data");

+							if (rDataArray != null) {

+								Iterator i2 = rDataArray.iterator();

+

+								while (i2.hasNext()) {

+									JSONObject inner2Obj = (JSONObject) i2.next();

+

+									if (inner2Obj == null)

+										continue;

+

+									String rShipKey = checkForNull((String) inner2Obj.get("relationship-key"));

+									String rShipVal = checkForNull((String) inner2Obj.get("relationship-value"));

+									if (rShipKey.equalsIgnoreCase("cloud-region.cloud-owner")) {

+										tenantNewObj.put("cloudOwner", rShipVal);

+									} else if (rShipKey.equalsIgnoreCase("cloud-region.cloud-region-id")) {

+										tenantNewObj.put("cloudRegionID", rShipVal);

+									}

+

+									if (rShipKey.equalsIgnoreCase("tenant.tenant-id")) {

+										tenantNewObj.put("tenantID", rShipVal);

+									}

+								}

+							}

+

+							JSONArray relatedTPropArray = (JSONArray) inner1Obj.get("related-to-property");

+							if (relatedTPropArray != null) {

+								Iterator i3 = relatedTPropArray.iterator();

+

+								while (i3.hasNext()) {

+									JSONObject inner3Obj = (JSONObject) i3.next();

+

+									if (inner3Obj == null)

+										continue;

+

+									String propKey = checkForNull((String) inner3Obj.get("property-key"));

+									String propVal = checkForNull((String) inner3Obj.get("property-value"));

+									if (propKey.equalsIgnoreCase("tenant.tenant-name")) {

+										tenantNewObj.put("tenantName", propVal);

+									}

+								}

+							}

+							bconvert = true;

+							tenantArray.add(tenantNewObj);

+						}

+					}

+

+				}

+			}

+		} catch (NullPointerException ex) {

+

+

+		}

+

+		if (bconvert)

+			return tenantArray.toJSONString();

+		else

+			return "";

+

+	}

+

+	/**

+	 * Check for null.

+	 *

+	 * @param local the local

+	 * @return the string

+	 */

+	private static String checkForNull(String local) {

+		if (local != null)

+			return local;

+		else

+			return "";

+

+	}

 

 	/**

 	 * Welcome method.

@@ -89,10 +342,18 @@ public class AaiController extends RestrictedBaseController{
 	 * @param request the request

 	 * @return ModelAndView The view

 	 */

-	@RequestMapping(value = {"/subscriberSearch" }, method = RequestMethod.GET)

+	@RequestMapping(value = {"/subscriberSearch"}, method = RequestMethod.GET)

 	public ModelAndView welcome(HttpServletRequest request) {

 		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== AaiController welcome start");

-		return new ModelAndView(getViewName());		

+		return new ModelAndView(getViewName());

+	}

+

+	@RequestMapping(value = {"/aai_get_aic_zones"}, method = RequestMethod.GET)

+	public  ResponseEntity<String> getAicZones(HttpServletRequest request) throws JsonGenerationException, JsonMappingException, IOException {

+		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== getAicZones controller start");

+		AaiResponse response = aaiService.getAaiZones();

+		return aaiResponseToResponseEntity(response);

+			

 	}

 

 	/* (non-Javadoc)

@@ -113,19 +374,17 @@ public class AaiController extends RestrictedBaseController{
 	 * Get services from a&ai.

 	 *

 	 * @return ResponseEntity<String> The response entity with the logged in user uuid.

-	 * @throws IOException Signals that an I/O exception has occurred.

+	 * @throws IOException          Signals that an I/O exception has occurred.

 	 * @throws InterruptedException the interrupted exception

 	 */

-	@RequestMapping(value = {"/getuserID" }, method = RequestMethod.GET)

+	@RequestMapping(value = {"/getuserID"}, method = RequestMethod.GET)

 	public ResponseEntity<String> getUserID(HttpServletRequest request) throws IOException, InterruptedException {

 

 		String userId = "";

 		HttpSession session = request.getSession();

-		if (session != null)

-		{

+		if (session != null) {

 			User user = (User) session.getAttribute(SystemProperties.getProperty(SystemProperties.USER_ATTRIBUTE_NAME));

-			if (user != null)

-			{

+			if (user != null) {

 				//userId = user.getHrid();

 				userId = user.getLoginId();

 				if (userId == null)

@@ -133,23 +392,39 @@ public class AaiController extends RestrictedBaseController{
 			}

 		}

 

-		return new ResponseEntity<String>( userId, HttpStatus.OK);

+		return new ResponseEntity<String>(userId, HttpStatus.OK);

 	}

 

-

 	/**

 	 * Get services from a&ai.

 	 *

 	 * @return ResponseEntity<String> The response entity

-	 * @throws IOException Signals that an I/O exception has occurred.

+	 * @throws IOException          Signals that an I/O exception has occurred.

 	 * @throws InterruptedException the interrupted exception

 	 */

-	@RequestMapping(value="/aai_get_services",method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) 

-	public ResponseEntity<String> doGetServices() throws IOException, InterruptedException {	

-		File certiPath = GetCertificatesPath();

-		Response resp = doAaiGet(certiPath.getAbsolutePath(), "service-design-and-creation/services", false);

+	@RequestMapping(value = "/aai_get_services", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)

+	public ResponseEntity<String> doGetServices(HttpServletRequest request) throws IOException, InterruptedException {

+	

+		RoleValidator roleValidator = new RoleValidator(new RoleProvider().getUserRoles(request));

 

-		return convertResponseToResponseEntity(resp);

+		AaiResponse subscriberList = aaiService.getServices(roleValidator);

+		ResponseEntity<String> responseEntity = aaiResponseToResponseEntity( subscriberList);

+

+		return responseEntity;

+	}

+

+

+

+	private ResponseEntity<String> aaiResponseToResponseEntity( AaiResponse aaiResponseData)

+			throws IOException, JsonGenerationException, JsonMappingException {

+		ResponseEntity<String> responseEntity;

+		ObjectMapper objectMapper = new ObjectMapper();

+		if (aaiResponseData.getHttpCode() == 200) {

+			responseEntity = new ResponseEntity<String>(objectMapper.writeValueAsString(aaiResponseData.getT()), HttpStatus.OK);

+		} else {

+			responseEntity = new ResponseEntity<String>(aaiResponseData.getErrorMessage(), HttpStatus.valueOf(aaiResponseData.getHttpCode()));

+		}

+		return responseEntity;

 	}

 

 	/**

@@ -157,41 +432,40 @@ public class AaiController extends RestrictedBaseController{
 	 *

 	 * @param serviceInstanceId the service instance Id

 	 * @return ResponseEntity The response entity

-	 * @throws IOException Signals that an I/O exception has occurred.

+	 * @throws IOException          Signals that an I/O exception has occurred.

 	 * @throws InterruptedException the interrupted exception

 	 */

-	@RequestMapping(value="/aai_get_service_instance/{service-instance-id}/{service-instance-type}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) 

-	public ResponseEntity<String> doGetServiceInstance(@PathVariable("service-instance-id") String serviceInstanceId,@PathVariable("service-instance-type") String serviceInstanceType) throws IOException, InterruptedException {	

+	@RequestMapping(value = "/aai_get_service_instance/{service-instance-id}/{service-instance-type}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)

+	public ResponseEntity<String> doGetServiceInstance(@PathVariable("service-instance-id") String serviceInstanceId, @PathVariable("service-instance-type") String serviceInstanceType) throws IOException, InterruptedException {

 		File certiPath = GetCertificatesPath();

-		Response resp=null;

+		Response resp = null;

 

-		if(serviceInstanceType.equalsIgnoreCase("Service Instance Id")){

-			resp = doAaiGet( certiPath.getAbsolutePath(), 

-					"search/nodes-query?search-node-type=service-instance&filter=service-instance-id:EQUALS:" 

+		if (serviceInstanceType.equalsIgnoreCase("Service Instance Id")) {

+			resp = doAaiGet(certiPath.getAbsolutePath(),

+					"search/nodes-query?search-node-type=service-instance&filter=service-instance-id:EQUALS:"

 							+ serviceInstanceId, false);

 		} else {

-			resp = doAaiGet( certiPath.getAbsolutePath(), 

-					"search/nodes-query?search-node-type=service-instance&filter=service-instance-name:EQUALS:" 

+			resp = doAaiGet(certiPath.getAbsolutePath(),

+					"search/nodes-query?search-node-type=service-instance&filter=service-instance-name:EQUALS:"

 							+ serviceInstanceId, false);

 		}

 		return convertResponseToResponseEntity(resp);

 	}

 

-

 	/**

 	 * Get services from a&ai.

 	 *

-	 * @param globalCustomerId the global customer id

+	 * @param globalCustomerId      the global customer id

 	 * @param serviceSubscriptionId the service subscription id

 	 * @return ResponseEntity The response entity

-	 * @throws IOException Signals that an I/O exception has occurred.

+	 * @throws IOException          Signals that an I/O exception has occurred.

 	 * @throws InterruptedException the interrupted exception

 	 */

-	@RequestMapping(value="/aai_get_service_subscription/{global-customer-id}/{service-subscription-id}",method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) 

+	@RequestMapping(value = "/aai_get_service_subscription/{global-customer-id}/{service-subscription-id}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)

 	public ResponseEntity<String> doGetServices(@PathVariable("global-customer-id") String globalCustomerId,

-			@PathVariable("service-subscription-id") String serviceSubscriptionId) throws IOException, InterruptedException {	

+			@PathVariable("service-subscription-id") String serviceSubscriptionId) throws IOException, InterruptedException {

 		File certiPath = GetCertificatesPath();

-		Response resp = doAaiGet(certiPath.getAbsolutePath(), "business/customers/customer/" + globalCustomerId 

+		Response resp = doAaiGet(certiPath.getAbsolutePath(), "business/customers/customer/" + globalCustomerId

 				+ "/service-subscriptions/service-subscription/" + serviceSubscriptionId + "?depth=0", false);

 		return convertResponseToResponseEntity(resp);

 	}

@@ -201,23 +475,22 @@ public class AaiController extends RestrictedBaseController{
 	 *

 	 * @param fullSet the full set

 	 * @return ResponseEntity The response entity

-	 * @throws IOException Signals that an I/O exception has occurred.

+	 * @throws IOException          Signals that an I/O exception has occurred.

 	 * @throws InterruptedException the interrupted exception

 	 */

-	@RequestMapping(value="/aai_get_subscribers",method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)  	

-	public ResponseEntity<String> doGetSubscriberList(@DefaultValue("n") @QueryParam("fullSet") String fullSet) throws IOException, InterruptedException {

-		Response resp = getSubscribers(false);

-		return convertResponseToResponseEntity(resp);

+	@RequestMapping(value = "/aai_get_subscribers", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)

+	public ResponseEntity<String> doGetSubscriberList(HttpServletRequest request,@DefaultValue("n") @QueryParam("fullSet") String fullSet) throws IOException, InterruptedException {

+		return getFullSubscriberList(request);

 	}

 

 	/**

 	 * Obtain the Target Prov Status from the System.Properties file.

 	 *

 	 * @return ResponseEntity The response entity

-	 * @throws IOException Signals that an I/O exception has occurred.

+	 * @throws IOException          Signals that an I/O exception has occurred.

 	 * @throws InterruptedException the interrupted exception

-	 */	

-	@RequestMapping(value="/get_system_prop_vnf_prov_status",method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)  	

+	 */

+	@RequestMapping(value = "/get_system_prop_vnf_prov_status", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)

 	public ResponseEntity<String> getTargetProvStatus() throws IOException, InterruptedException {

 		String p = SystemProperties.getProperty("aai.vnf.provstatus");

 		return new ResponseEntity<String>(p, HttpStatus.OK);

@@ -225,17 +498,27 @@ public class AaiController extends RestrictedBaseController{
 

 	/**

 	 * Obtain the full subscriber list from a&ai.

+	 * <p>

+	 * g @return ResponseEntity The response entity

 	 *

-	 * @return ResponseEntity The response entity

-	 * @throws IOException Signals that an I/O exception has occurred.

+	 * @throws IOException          Signals that an I/O exception has occurred.

 	 * @throws InterruptedException the interrupted exception

 	 */

-	@RequestMapping(value="/aai_get_full_subscribers",method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)  	

-	public ResponseEntity<String> getFullSubscriberList() throws IOException, InterruptedException {

-		Response resp = getSubscribers(true);

-		return convertResponseToResponseEntity(resp);

-	}

+	@RequestMapping(value = "/aai_get_full_subscribers", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)

+	public ResponseEntity<String> getFullSubscriberList(HttpServletRequest request) throws IOException, InterruptedException {

+		ObjectMapper objectMapper = new ObjectMapper();

+		ResponseEntity<String> responseEntity;

+		RoleValidator roleValidator = new RoleValidator(new RoleProvider().getUserRoles(request));

+		SubscriberFilteredResults subscriberList = aaiService.getFullSubscriberList(roleValidator);

+		if (subscriberList.getHttpCode() == 200) {

+			responseEntity = new ResponseEntity<String>(objectMapper.writeValueAsString(subscriberList.getSubscriberList()), HttpStatus.OK);

+		} else {

+			responseEntity = new ResponseEntity<String>(subscriberList.getErrorMessage(), HttpStatus.valueOf(subscriberList.getHttpCode()));

+		}

+

 

+		return responseEntity;

+	}

 

 	/**

 	 * Refresh the subscriber list from a&ai.

@@ -243,7 +526,7 @@ public class AaiController extends RestrictedBaseController{
 	 * @return ResponseEntity The response entity

 	 * @throws IOException Signals that an I/O exception has occurred.

 	 */

-	@RequestMapping(value="/aai_refresh_subscribers",method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)  	

+	@RequestMapping(value = "/aai_refresh_subscribers", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)

 	public ResponseEntity<String> doRefreshSubscriberList() throws IOException {

 		Response resp = getSubscribers(false);

 		return convertResponseToResponseEntity(resp);

@@ -255,7 +538,7 @@ public class AaiController extends RestrictedBaseController{
 	 * @return ResponseEntity The response entity

 	 * @throws IOException Signals that an I/O exception has occurred.

 	 */

-	@RequestMapping(value="/aai_refresh_full_subscribers",method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)  	

+	@RequestMapping(value = "/aai_refresh_full_subscribers", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)

 	public ResponseEntity<String> doRefreshFullSubscriberList() throws IOException {

 		Response resp = getSubscribers(false);

 		return convertResponseToResponseEntity(resp);

@@ -267,75 +550,88 @@ public class AaiController extends RestrictedBaseController{
 	 * @param subscriberId the subscriber id

 	 * @return ResponseEntity The response entity

 	 */

-	@RequestMapping(value="/aai_sub_details/{subscriberId}", method = RequestMethod.GET)

-	public ResponseEntity<String> GetSubscriber(@PathVariable("subscriberId") String subscriberId) {

-		Response resp = getSubscriberDetails(subscriberId);

-		return convertResponseToResponseEntity(resp);

+	@RequestMapping(value = "/aai_sub_details/{subscriberId}", method = RequestMethod.GET)

+	public ResponseEntity<String> GetSubscriberDetails(HttpServletRequest request,@PathVariable("subscriberId") String subscriberId) throws IOException {

+		ObjectMapper objectMapper = new ObjectMapper();

+		ResponseEntity responseEntity;

+		List<Role> roles = new RoleProvider().getUserRoles(request);

+		RoleValidator roleValidator = new RoleValidator(roles);

+		AaiResponse<SubscriberData> subscriberData = aaiService.getSubscriberData(subscriberId,roleValidator);

+		String httpMessage = subscriberData.getT() != null ?

+				objectMapper.writeValueAsString(subscriberData.getT()) :

+					subscriberData.getErrorMessage();

+

+				responseEntity = new ResponseEntity<String>(httpMessage, HttpStatus.valueOf(subscriberData.getHttpCode()));

+				return responseEntity;

 	}

 

 	/**

 	 * Issue a named query to a&ai.

 	 *

-	 * @param namedQueryId the named query id

+	 * @param namedQueryId     the named query id

 	 * @param globalCustomerId the global customer id

-	 * @param serviceType the service type

-	 * @param serviceInstance the service instance

+	 * @param serviceType      the service type

+	 * @param serviceInstance  the service instance

 	 * @return ResponseEntity The response entity

 	 */

-	@RequestMapping(value="/aai_sub_viewedit/{namedQueryId}/{globalCustomerId}/{serviceType}/{serviceInstance}", method = RequestMethod.GET)

+	@RequestMapping(value = "/aai_sub_viewedit/{namedQueryId}/{globalCustomerId}/{serviceType}/{serviceInstance}", method = RequestMethod.GET)

 	public ResponseEntity<String> viewEditGetComponentList(

 			@PathVariable("namedQueryId") String namedQueryId,

 			@PathVariable("globalCustomerId") String globalCustomerId,

 			@PathVariable("serviceType") String serviceType,

-			@PathVariable("serviceInstance") String serviceInstance) { 

+			@PathVariable("serviceInstance") String serviceInstance) {

 

 		String componentListPayload = getComponentListPutPayload(namedQueryId, globalCustomerId, serviceType, serviceInstance);

 		File certiPath = GetCertificatesPath();

 

-		Response resp = doAaiPost(certiPath.getAbsolutePath(), "search/named-query", componentListPayload, false); 

-        return convertResponseToResponseEntity(resp);

+		Response resp = doAaiPost(certiPath.getAbsolutePath(), "search/named-query", componentListPayload, false);

+		return convertResponseToResponseEntity(resp);

 	}

 

+

+	//	@RequestMapping(value="/aai_get_tenants/{global-customer-id}", method = RequestMethod.GET)

+	//	public ResponseEntity<String> viewEditGetComponentList(

+	//			@PathVariable("global-customer-id") String globalCustomerId) {

+	//		return new ResponseEntity<String>(getTenants(globalCustomerId), HttpStatus.OK);

+	//	}

+

 	/**

 	 * Issue a named query to a&ai.

 	 *

-	 * @param namedQueryId the named query id

+	 * @param namedQueryId     the named query id

 	 * @param globalCustomerId the global customer id

-	 * @param serviceType the service type

+	 * @param serviceType      the service type

 	 * @return ResponseEntity The response entity

 	 */

-	@RequestMapping(value="/aai_get_models_by_service_type/{namedQueryId}/{globalCustomerId}/{serviceType}", method = RequestMethod.GET)

+	@RequestMapping(value = "/aai_get_models_by_service_type/{namedQueryId}/{globalCustomerId}/{serviceType}", method = RequestMethod.GET)

 	public ResponseEntity<String> viewEditGetComponentList(

 			@PathVariable("namedQueryId") String namedQueryId,

 			@PathVariable("globalCustomerId") String globalCustomerId,

-			@PathVariable("serviceType") String serviceType) { 

+			@PathVariable("serviceType") String serviceType) {

 

 		String componentListPayload = getModelsByServiceTypePayload(namedQueryId, globalCustomerId, serviceType);

 		File certiPath = GetCertificatesPath();

 

-		Response resp = doAaiPost(certiPath.getAbsolutePath(), "search/named-query", componentListPayload, false); 

-        return convertResponseToResponseEntity(resp);

+		Response resp = doAaiPost(certiPath.getAbsolutePath(), "search/named-query", componentListPayload, false);

+		return convertResponseToResponseEntity(resp);

 	}

-	

+

 	/**

 	 * Parses the for tenants.

 	 *

 	 * @param resp the resp

 	 * @return the string

 	 */

-	private String parseForTenants(String resp)

-	{

+	private String parseForTenants(String resp) {

 		String tenantList = "";

 

-		try

-		{

+		try {

 			JSONParser jsonParser = new JSONParser();

 

 			JSONObject jsonObject = (JSONObject) jsonParser.parse(resp);

 

-			return  parseCustomerObjectForTenants(jsonObject);

-		}

-		catch (Exception ex) {

+			return parseCustomerObjectForTenants(jsonObject);

+		} catch (Exception ex) {

 

 		}

 

@@ -348,51 +644,59 @@ public class AaiController extends RestrictedBaseController{
 	 * @param resp the resp

 	 * @return the string

 	 */

-	private String parseForTenantsByServiceSubscription(String resp)

-	{

+	private String parseForTenantsByServiceSubscription(String resp) {

 		String tenantList = "";

 

-		try

-		{

+		try {

 			JSONParser jsonParser = new JSONParser();

 

 			JSONObject jsonObject = (JSONObject) jsonParser.parse(resp);

 

-			return  parseServiceSubscriptionObjectForTenants(jsonObject);

-		}

-		catch (Exception ex) {

+			return parseServiceSubscriptionObjectForTenants(jsonObject);

+		} catch (Exception ex) {

 

 		}

 

 		return tenantList;

 	}

 

-

-	//	@RequestMapping(value="/aai_get_tenants/{global-customer-id}", method = RequestMethod.GET)

-	//	public ResponseEntity<String> viewEditGetComponentList(

-	//			@PathVariable("global-customer-id") String globalCustomerId) {

-	//		return new ResponseEntity<String>(getTenants(globalCustomerId), HttpStatus.OK);

-	//	}

-

 	/**

 	 * Obtain tenants for a given service type.

 	 *

 	 * @param globalCustomerId the global customer id

-	 * @param serviceType the service type

+	 * @param serviceType      the service type

 	 * @return ResponseEntity The response entity

 	 */

-	@RequestMapping(value="/aai_get_tenants/{global-customer-id}/{service-type}", method = RequestMethod.GET)

-	public ResponseEntity<String> viewEditGetTenantsFromServiceType(

+	@RequestMapping(value = "/aai_get_tenants/{global-customer-id}/{service-type}", method = RequestMethod.GET)

+	public ResponseEntity<String> viewEditGetTenantsFromServiceType(HttpServletRequest request,

 			@PathVariable("global-customer-id") String globalCustomerId, @PathVariable("service-type") String serviceType) {

-        return getTenantsFromServiceType(globalCustomerId, serviceType);

+

+		ResponseEntity responseEntity;

+		try {

+			ObjectMapper objectMapper = new ObjectMapper();

+			List<Role> roles = new RoleProvider().getUserRoles(request);

+			RoleValidator roleValidator = new RoleValidator(roles);

+			AaiResponse<GetTenantsResponse[]> response = aaiService.getTenants(globalCustomerId, serviceType, roleValidator);

+			if (response.getHttpCode() == 200) {

+				responseEntity = new ResponseEntity<String>(objectMapper.writeValueAsString(response.getT()), HttpStatus.OK);

+			} else {

+				responseEntity = new ResponseEntity<String>(response.getErrorMessage(), HttpStatus.valueOf(response.getHttpCode()));

+			}

+		}

+		catch (Exception e){

+			responseEntity = new ResponseEntity<String>("Unable to proccess getTenants reponse", HttpStatus.INTERNAL_SERVER_ERROR);

+		}

+		return responseEntity;

 	}

 

-	private ResponseEntity<String> convertResponseToResponseEntity(Response resp) { 

+

+	private ResponseEntity<String> convertResponseToResponseEntity(Response resp) {

 		ResponseEntity<String> respEnt;

-		if (resp == null) { 

+		ObjectMapper objectMapper = new ObjectMapper();

+		if (resp == null) {

 			respEnt = new ResponseEntity<String>("Failed to fetch data from A&AI, check server logs for details.", HttpStatus.INTERNAL_SERVER_ERROR);

-		} else { 

-			respEnt = new ResponseEntity<String>((String)resp.readEntity(String.class), HttpStatus.valueOf(resp.getStatus()));

+		} else {

+			respEnt = new ResponseEntity<String>(resp.readEntity(String.class), HttpStatus.valueOf(resp.getStatus()));

 		}

 		return respEnt;

 	}

@@ -403,18 +707,17 @@ public class AaiController extends RestrictedBaseController{
 	 * @param globalCustomerId the global customer id

 	 * @return the tenants

 	 */

-	private ResponseEntity<String> getTenants(String globalCustomerId)

-	{

+	private ResponseEntity<String> getTenants(String globalCustomerId) {

 		File certiPath = GetCertificatesPath();

-        Response resp = doAaiGet(certiPath.getAbsolutePath(), "business/customers/customer/" + globalCustomerId, false);

-        

-        ResponseEntity<String> respEnt;

-        if (resp.getStatus() >= 200 && resp.getStatus() <= 299) { 

-            respEnt = new ResponseEntity<String>(parseForTenants((String)resp.readEntity(String.class)), HttpStatus.OK);

-        } else {

-            respEnt = new ResponseEntity<String>((String)resp.readEntity(String.class), HttpStatus.valueOf(resp.getStatus()));

-        }

-        return respEnt;

+		Response resp = doAaiGet(certiPath.getAbsolutePath(), "business/customers/customer/" + globalCustomerId, false);

+

+		ResponseEntity<String> respEnt;

+		if (resp.getStatus() >= 200 && resp.getStatus() <= 299) {

+			respEnt = new ResponseEntity<String>(parseForTenants((String) resp.readEntity(String.class)), HttpStatus.OK);

+		} else {

+			respEnt = new ResponseEntity<String>((String) resp.readEntity(String.class), HttpStatus.valueOf(resp.getStatus()));

+		}

+		return respEnt;

 

 	}

 

@@ -422,23 +725,27 @@ public class AaiController extends RestrictedBaseController{
 	 * Gets the tenants from service type.

 	 *

 	 * @param globalCustomerId the global customer id

-	 * @param serviceType the service type

+	 * @param serviceType      the service type

 	 * @return the tenants from service type

 	 */

-	private ResponseEntity<String> getTenantsFromServiceType(String globalCustomerId, String serviceType)

-	{

+	private ResponseEntity<String> getTenantsFromServiceType(String globalCustomerId, String serviceType) {

+

+

+

+

+

 		File certiPath = GetCertificatesPath();

-        String url = "business/customers/customer/" + globalCustomerId + "/service-subscriptions/service-subscription/" + serviceType;

+		String url = "business/customers/customer/" + globalCustomerId + "/service-subscriptions/service-subscription/" + serviceType;

+

+		Response resp = doAaiGet(certiPath.getAbsolutePath(), url, false);

 

-        Response resp = doAaiGet(certiPath.getAbsolutePath(), url, false);

-        

-        ResponseEntity<String> respEnt;

-        if (resp.getStatus() >= 200 && resp.getStatus() <= 299) { 

-            respEnt = new ResponseEntity<String>(parseForTenantsByServiceSubscription((String)resp.readEntity(String.class)), HttpStatus.OK);

-        } else {

-            respEnt = new ResponseEntity<String>((String)resp.readEntity(String.class), HttpStatus.valueOf(resp.getStatus()));

-        }

-        return respEnt;

+		ResponseEntity<String> respEnt;

+		if (resp.getStatus() >= 200 && resp.getStatus() <= 299) {

+			respEnt = new ResponseEntity<String>(parseForTenantsByServiceSubscription((String) resp.readEntity(String.class)), HttpStatus.OK);

+		} else {

+			respEnt = new ResponseEntity<String>((String) resp.readEntity(String.class), HttpStatus.valueOf(resp.getStatus()));

+		}

+		return respEnt;

 

 	}

 

@@ -447,45 +754,40 @@ public class AaiController extends RestrictedBaseController{
 	 *

 	 * @return the services

 	 */

-	private Response getServices()

-	{

+	private Response getServices() {

 		File certiPath = GetCertificatesPath();

-        Response resp  = doAaiGet(certiPath.getAbsolutePath(), "service-design-and-creation/services", false);

-        logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + "getServices() resp=" + resp.getStatusInfo());

+		Response resp = doAaiGet(certiPath.getAbsolutePath(), "service-design-and-creation/services", false);

+		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + "getServices() resp=" + resp.getStatusInfo());

 

 		//model.put("aai_get_services", resp);

 		return resp;

 	}

 

-

 	/**

 	 * Gets the subscribers.

 	 *

 	 * @param isFullSet the is full set

 	 * @return the subscribers

 	 */

-	private Response getSubscribers(boolean isFullSet)

-	{

+	private Response getSubscribers(boolean isFullSet) {

+

 		File certiPath = GetCertificatesPath();

 		String depth = "0";

 

-        Response resp = doAaiGet(certiPath.getAbsolutePath(), "business/customers?subscriber-type=INFRA&depth=" + depth, false);

-        if (resp != null) { 

-        	logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + "getSubscribers() resp=" + resp.getStatusInfo().toString());

-        }

+		Response resp = doAaiGet(certiPath.getAbsolutePath(), "business/customers?subscriber-type=INFRA&depth=" + depth, false);

+		if (resp != null) {

+			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + "getSubscribers() resp=" + resp.getStatusInfo().toString());

+		}

 		return resp;

 	}

 

-	

-	

 	/**

 	 * Gets the subscriber details.

 	 *

 	 * @param subscriberId the subscriber id

 	 * @return the subscriber details

 	 */

-	private Response getSubscriberDetails(String subscriberId)

-	{

+	private Response getSubscriberDetails(String subscriberId) {

 		File certiPath = GetCertificatesPath();

 		Response resp = doAaiGet(certiPath.getAbsolutePath(), "business/customers/customer/" + subscriberId + "?depth=2", false);

 		//String resp = doAaiGet(certiPath.getAbsolutePath(), "business/customers/customer/" + subscriberId, false);

@@ -498,10 +800,9 @@ public class AaiController extends RestrictedBaseController{
 	 *

 	 * @return the file

 	 */

-	private File GetCertificatesPath()

-	{

+	private File GetCertificatesPath() {

 		if (servletContext != null)

-			return new File( servletContext.getRealPath("/WEB-INF/cert/") );

+			return new File(servletContext.getRealPath("/WEB-INF/cert/"));

 		return null;

 	}

 

@@ -509,12 +810,12 @@ public class AaiController extends RestrictedBaseController{
 	 * Send a GET request to a&ai.

 	 *

 	 * @param certiPath the certi path

-	 * @param uri the uri

-	 * @param xml the xml

+	 * @param uri       the uri

+	 * @param xml       the xml

 	 * @return String The response

 	 */

 	protected Response doAaiGet(String certiPath, String uri, boolean xml) {

-		String methodName = "getSubscriberList";		

+		String methodName = "getSubscriberList";

 		String transId = UUID.randomUUID().toString();

 		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start");

 

@@ -526,11 +827,11 @@ public class AaiController extends RestrictedBaseController{
 

 		} catch (WebApplicationException e) {

 			final String message = ((BadRequestException) e).getResponse().readEntity(String.class);

-			logger.info(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) +  "<== " + "." + methodName + message);

-			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) +  "<== " + "." + methodName + message);

+			logger.info(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) + "<== " + "." + methodName + message);

+			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + "." + methodName + message);

 		} catch (Exception e) {

-			logger.info(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) +  "<== " + "." + methodName + e.toString());

-			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) +  "<== " + "." + methodName + e.toString());

+			logger.info(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) + "<== " + "." + methodName + e.toString());

+			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + "." + methodName + e.toString());

 		}

 

 		return resp;

@@ -540,13 +841,13 @@ public class AaiController extends RestrictedBaseController{
 	 * Send a POST request to a&ai.

 	 *

 	 * @param certiPath the certi path

-	 * @param uri the uri

-	 * @param payload the payload

-	 * @param xml the xml

+	 * @param uri       the uri

+	 * @param payload   the payload

+	 * @param xml       the xml

 	 * @return String The response

 	 */

 	protected Response doAaiPost(String certiPath, String uri, String payload, boolean xml) {

-		String methodName = "getSubscriberList";		

+		String methodName = "getSubscriberList";

 		String transId = UUID.randomUUID().toString();

 		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start");

 

@@ -557,8 +858,8 @@ public class AaiController extends RestrictedBaseController{
 			resp = restContrller.RestPost(fromAppId, transId, uri, payload, xml);

 

 		} catch (Exception e) {

-			logger.info(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) +  "<== " + "." + methodName + e.toString());

-			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) +  "<== " + "." + methodName + e.toString());

+			logger.info(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) + "<== " + "." + methodName + e.toString());

+			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + "." + methodName + e.toString());

 		}

 

 		return resp;

@@ -567,14 +868,14 @@ public class AaiController extends RestrictedBaseController{
 	/**

 	 * Gets the component list put payload.

 	 *

-	 * @param namedQueryId the named query id

+	 * @param namedQueryId     the named query id

 	 * @param globalCustomerId the global customer id

-	 * @param serviceType the service type

-	 * @param serviceInstance the service instance

+	 * @param serviceType      the service type

+	 * @param serviceInstance  the service instance

 	 * @return the component list put payload

 	 */

 	private String getComponentListPutPayload(String namedQueryId, String globalCustomerId, String serviceType, String serviceInstance) {

-		return 

+		return

 				"		{" +

 				"    \"instance-filters\": {" +

 				"        \"instance-filter\": [" +

@@ -599,9 +900,10 @@ public class AaiController extends RestrictedBaseController{
 				"}";

 

 	}

+

 	private String getModelsByServiceTypePayload(String namedQueryId, String globalCustomerId, String serviceType) {

 		// TODO Auto-generated method stub

-		return 			"		{" +

+		return "		{" +

 		"    \"instance-filters\": {" +

 		"        \"instance-filter\": [" +

 		"            {" +

@@ -620,246 +922,6 @@ public class AaiController extends RestrictedBaseController{
 		"        }" +

 		"    }" +

 		"}";

-	

-	}

-

-	/**

-	 * Return tenant details.

-	 *

-	 * @param jsonObject the json object

-	 * @return String The parsing results

-	 */

-	public static String parseCustomerObjectForTenants(JSONObject jsonObject) {

-

-		JSONArray tenantArray = new JSONArray();

-		boolean bconvert = false;

-

-		try {

-

-			JSONObject serviceSubsObj = (JSONObject) jsonObject.get("service-subscriptions");

-

-			if (serviceSubsObj != null)

-			{

-				JSONArray srvcSubArray = (JSONArray) serviceSubsObj.get("service-subscription");

-

-				if (srvcSubArray != null)

-				{

-					Iterator i = srvcSubArray.iterator();

-

-					while (i.hasNext()) {

-

-						JSONObject innerObj = (JSONObject) i.next();

-

-						if (innerObj == null)

-							continue;

-

-						JSONObject relationShipListsObj = (JSONObject) innerObj.get("relationship-list");

-						if (relationShipListsObj != null)

-						{

-							JSONArray rShipArray = (JSONArray) relationShipListsObj.get("relationship");

-							if (rShipArray != null)

-							{

-								Iterator i1 = rShipArray.iterator();

-

-								while (i1.hasNext()) {

-

-									JSONObject inner1Obj = (JSONObject) i1.next();

-

-									if (inner1Obj == null)

-										continue;

-

-									String relatedTo = checkForNull((String)inner1Obj.get("related-to"));

-									if (relatedTo.equalsIgnoreCase("tenant"))

-									{

-										JSONObject tenantNewObj = new JSONObject();

-

-										String relatedLink = checkForNull((String) inner1Obj.get("related-link"));

-										tenantNewObj.put("link", relatedLink);

-

-										JSONArray rDataArray = (JSONArray) inner1Obj.get("relationship-data");

-										if (rDataArray != null)

-										{

-											Iterator i2 = rDataArray.iterator();

-

-											while (i2.hasNext()) {

-												JSONObject inner2Obj = (JSONObject) i2.next();

-

-												if (inner2Obj == null)

-													continue;

-

-												String rShipKey = checkForNull((String)inner2Obj.get("relationship-key"));

-												String rShipVal = checkForNull((String)inner2Obj.get("relationship-value"));

-												if (rShipKey.equalsIgnoreCase("cloud-region.cloud-owner"))

-												{

-													tenantNewObj.put("cloudOwner", rShipVal);

-												}

-												else if (rShipKey.equalsIgnoreCase("cloud-region.cloud-region-id"))

-												{

-													tenantNewObj.put("cloudRegionID", rShipVal);

-												}

-

-												if (rShipKey.equalsIgnoreCase("tenant.tenant-id"))

-												{

-													tenantNewObj.put("tenantID", rShipVal);

-												}

-											}

-										}

-

-										JSONArray relatedTPropArray = (JSONArray) inner1Obj.get("related-to-property");

-										if (relatedTPropArray != null)

-										{

-											Iterator i3 = relatedTPropArray.iterator();

-

-											while (i3.hasNext()) {

-												JSONObject inner3Obj = (JSONObject) i3.next();

-

-												if (inner3Obj == null)

-													continue;

-

-												String propKey = checkForNull((String)inner3Obj.get("property-key"));

-												String propVal = checkForNull((String)inner3Obj.get("property-value"));

-												if (propKey.equalsIgnoreCase("tenant.tenant-name"))

-												{

-													tenantNewObj.put("tenantName", propVal);

-												}

-											}

-										}

-										bconvert = true;

-										tenantArray.add(tenantNewObj);

-									}

-								}

-							}

-						}

-					}

-				}

-			}

-		} catch (NullPointerException ex) {

-

-

-		}

-

-		if (bconvert)

-			return tenantArray.toJSONString();

-		else

-			return "";

-

-	}

-

-

-	/**

-	 * Retrieve the service subscription from the jsonObject.

-	 *

-	 * @param jsonObject the json object

-	 * @return String

-	 */

-	public static String parseServiceSubscriptionObjectForTenants(JSONObject jsonObject) {

-

-		JSONArray tenantArray = new JSONArray();

-		boolean bconvert = false;

-

-		try {

-			JSONObject relationShipListsObj = (JSONObject) jsonObject.get("relationship-list");

-			if (relationShipListsObj != null)

-			{

-				JSONArray rShipArray = (JSONArray) relationShipListsObj.get("relationship");

-				if (rShipArray != null)

-				{

-					Iterator i1 = rShipArray.iterator();

-

-					while (i1.hasNext()) {

-

-						JSONObject inner1Obj = (JSONObject) i1.next();

-

-						if (inner1Obj == null)

-							continue;

-

-						String relatedTo = checkForNull((String)inner1Obj.get("related-to"));

-						if (relatedTo.equalsIgnoreCase("tenant"))

-						{

-							JSONObject tenantNewObj = new JSONObject();

-

-							String relatedLink = checkForNull((String) inner1Obj.get("related-link"));

-							tenantNewObj.put("link", relatedLink);

-

-							JSONArray rDataArray = (JSONArray) inner1Obj.get("relationship-data");

-							if (rDataArray != null)

-							{

-								Iterator i2 = rDataArray.iterator();

-

-								while (i2.hasNext()) {

-									JSONObject inner2Obj = (JSONObject) i2.next();

-

-									if (inner2Obj == null)

-										continue;

-

-									String rShipKey = checkForNull((String)inner2Obj.get("relationship-key"));

-									String rShipVal = checkForNull((String)inner2Obj.get("relationship-value"));

-									if (rShipKey.equalsIgnoreCase("cloud-region.cloud-owner"))

-									{

-										tenantNewObj.put("cloudOwner", rShipVal);

-									}

-									else if (rShipKey.equalsIgnoreCase("cloud-region.cloud-region-id"))

-									{

-										tenantNewObj.put("cloudRegionID", rShipVal);

-									}

-

-									if (rShipKey.equalsIgnoreCase("tenant.tenant-id"))

-									{

-										tenantNewObj.put("tenantID", rShipVal);

-									}

-								}

-							}

-

-							JSONArray relatedTPropArray = (JSONArray) inner1Obj.get("related-to-property");

-							if (relatedTPropArray != null)

-							{

-								Iterator i3 = relatedTPropArray.iterator();

-

-								while (i3.hasNext()) {

-									JSONObject inner3Obj = (JSONObject) i3.next();

-

-									if (inner3Obj == null)

-										continue;

-

-									String propKey = checkForNull((String)inner3Obj.get("property-key"));

-									String propVal = checkForNull((String)inner3Obj.get("property-value"));

-									if (propKey.equalsIgnoreCase("tenant.tenant-name"))

-									{

-										tenantNewObj.put("tenantName", propVal);

-									}

-								}

-							}

-							bconvert = true;

-							tenantArray.add(tenantNewObj);

-						}

-					}

-

-				}

-			}

-		} catch (NullPointerException ex) {

-

-

-		}

-

-		if (bconvert)

-			return tenantArray.toJSONString();

-		else

-			return "";

-

-	}

-

-	/**

-	 * Check for null.

-	 *

-	 * @param local the local

-	 * @return the string

-	 */

-	private static String checkForNull(String local)

-	{

-		if (local != null)

-			return local;

-		else

-			return "";

 

 	}

 }

diff --git a/vid-app-common/src/main/java/org/openecomp/vid/controller/MsoController.java b/vid-app-common/src/main/java/org/openecomp/vid/controller/MsoController.java
index f051ed389..56fbd4cbd 100755
--- a/vid-app-common/src/main/java/org/openecomp/vid/controller/MsoController.java
+++ b/vid-app-common/src/main/java/org/openecomp/vid/controller/MsoController.java
@@ -21,106 +21,80 @@
 package org.openecomp.vid.controller;

 

 

-import java.io.BufferedReader;

-import java.io.IOException;

-import java.io.InputStreamReader;

-import java.io.OutputStream;

-import java.io.PrintWriter;

-import java.io.StringWriter;

-import java.text.DateFormat;

-import java.text.SimpleDateFormat;

-import java.util.ArrayList;

-//import java.util.UUID;

-import java.util.Date;

-import java.util.Iterator;

-import java.util.List;

-import java.util.Map;

-import java.util.Scanner;

-import java.util.stream.Collectors;

-

-import javax.servlet.http.HttpServletRequest;

-import javax.servlet.http.HttpServletResponse;

-

-import org.codehaus.jackson.JsonEncoding;

-import org.codehaus.jackson.JsonFactory;

-import org.codehaus.jackson.JsonGenerator;

-import org.codehaus.jackson.JsonParser;

-import org.codehaus.jackson.JsonToken;

+import com.fasterxml.jackson.databind.ObjectMapper;

 import org.glassfish.jersey.client.ClientResponse;

 import org.json.simple.JSONArray;

 import org.json.simple.JSONObject;

 import org.json.simple.parser.JSONParser;

-import org.openecomp.vid.domain.mso.CloudConfiguration;

-import org.openecomp.vid.domain.mso.ModelInfo;

-import org.openecomp.vid.domain.mso.ModelInfo.ModelType;

-import org.openecomp.vid.domain.mso.RequestInfo;

-import org.openecomp.vid.domain.mso.RequestParameters;

+import org.openecomp.portalsdk.core.controller.RestrictedBaseController;

+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;

+import org.openecomp.portalsdk.core.util.SystemProperties;

 import org.openecomp.vid.model.ExceptionResponse;

-import org.openecomp.vid.mso.MsoProperties;

-import org.openecomp.vid.mso.MsoResponseWrapper;

-import org.openecomp.vid.mso.MsoRestInterfaceFactory;

-import org.openecomp.vid.mso.MsoRestInterfaceIfc;

-import org.openecomp.vid.mso.MsoUtil;

-import org.openecomp.vid.mso.RestObject;

-import org.openecomp.vid.mso.rest.RelatedModel;

+import org.openecomp.vid.mso.*;

 import org.openecomp.vid.mso.rest.RequestDetails;

+import org.openecomp.vid.roles.RoleProvider;

+import org.openecomp.vid.roles.RoleValidator;

 import org.springframework.http.HttpStatus;

-//import org.springframework.http.ResponseEntity;

-//import org.springframework.http.RequestEntity;

 import org.springframework.http.ResponseEntity;

-import org.springframework.web.bind.annotation.ExceptionHandler;

-import org.springframework.web.bind.annotation.PathVariable;

-import org.springframework.web.bind.annotation.RequestBody;

-import org.springframework.web.bind.annotation.RequestMapping;

-import org.springframework.web.bind.annotation.RequestMethod;

-import org.springframework.web.bind.annotation.RestController;

-import org.springframework.web.servlet.ModelAndView;

+import org.springframework.web.bind.annotation.*;

 

-import org.openecomp.portalsdk.core.controller.RestrictedBaseController;

-import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;

-import org.openecomp.portalsdk.core.util.SystemProperties;

-import com.fasterxml.jackson.databind.ObjectMapper;

-import com.fasterxml.jackson.databind.ObjectReader;

-import com.fasterxml.jackson.databind.DeserializationFeature;

+import javax.servlet.http.HttpServletRequest;

+import javax.servlet.http.HttpServletResponse;

+import javax.servlet.http.HttpSession;

+import java.io.IOException;

+import java.io.PrintWriter;

+import java.io.StringWriter;

+import java.text.DateFormat;

+import java.text.SimpleDateFormat;

+import java.util.ArrayList;

+import java.util.Date;

+import java.util.List;

+import java.util.Map;

 

 /**

  * The Class MsoController.

  */

 @RestController

 @RequestMapping("mso")

-public class MsoController extends RestrictedBaseController{

-	

-	/** The view name. */

-	String viewName;

-	

-	/** The logger. */

-	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(MsoController.class);

-	

-	/** The Constant dateFormat. */

-	final static DateFormat dateFormat = new SimpleDateFormat("HH:mm:ss:SSSS");

-	

-	/** The Constant SVC_INSTANCE_ID. */

-	public final static String SVC_INSTANCE_ID = "<service_instance_id>";

-	

-	/** The Constant VNF_INSTANCE_ID. */

-	public final static String VNF_INSTANCE_ID = "<vnf_instance_id>";

-	

-	/**

-	 * Welcome.

-	 *

-	 * @param request the request

-	 * @return the model and view

-	 

-	public ModelAndView welcome(HttpServletRequest request) {

-		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== MsoController welcome start");

-		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + " MSO_SERVER_URL=" +

-				 SystemProperties.getProperty(MsoProperties.MSO_SERVER_URL) );

-		return new ModelAndView(getViewName());		

-	}

-	*/

+public class MsoController extends RestrictedBaseController {

+

+    /**

+     * The Constant SVC_INSTANCE_ID.

+     */

+    public final static String SVC_INSTANCE_ID = "<service_instance_id>";

+    /**

+     * The Constant VNF_INSTANCE_ID.

+     */

+    public final static String VNF_INSTANCE_ID = "<vnf_instance_id>";

+    /**

+     * The Constant dateFormat.

+     */

+    final static DateFormat dateFormat = new SimpleDateFormat("HH:mm:ss:SSSS");

+    /**

+     * The view name.

+     */

+    String viewName;

+    /**

+     * The logger.

+     */

+    EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(MsoController.class);

+

+    /**

+     * Welcome.

+     *

+     * @param request the request

+     * @return the model and view

+

+    public ModelAndView welcome(HttpServletRequest request) {

+    logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== MsoController welcome start");

+    logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + " MSO_SERVER_URL=" +

+    SystemProperties.getProperty(MsoProperties.MSO_SERVER_URL) );

+    return new ModelAndView(getViewName());

+    }

+     */

 

 	/* (non-Javadoc)

-	 * @see org.openecomp.portalsdk.core.controller.RestrictedBaseController#getViewName()

+     * @see org.openecomp.portalsdk.core.controller.RestrictedBaseController#getViewName()

 	 

 	public String getViewName() {

 		return viewName;

@@ -128,504 +102,538 @@ public class MsoController extends RestrictedBaseController{
 	*/

 

 	/* (non-Javadoc)

-	 * @see org.openecomp.portalsdk.core.controller.RestrictedBaseController#setViewName(java.lang.String)

+     * @see org.openecomp.portalsdk.core.controller.RestrictedBaseController#setViewName(java.lang.String)

 	 

 	public void setViewName(String viewName) {

 		this.viewName = viewName;

 	}

 	*/

 

-	/**

-	 * Creates the svc instance.

-	 *

-	 * @param request the request

-	 * @return the response entity

-	 * @throws Exception the exception

-	 */

-	@RequestMapping(value = "/mso_create_svc_instance", method = RequestMethod.POST)

-	public ResponseEntity<String> createSvcInstance(HttpServletRequest request, @RequestBody RequestDetails mso_request) throws Exception {

-		String methodName = "createSvcInstance";

-		

-		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start" );

-		

+    /**

+     * Creates the svc instance.

+     *

+     * @param request the request

+     * @return the response entity

+     * @throws Exception the exception

+     */

+    @RequestMapping(value = "/mso_create_svc_instance", method = RequestMethod.POST)

+    public ResponseEntity<String> createSvcInstance(HttpServletRequest request, @RequestBody RequestDetails mso_request) throws Exception {

+

+

+        String methodName = "createSvcInstance";

+

+        logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start");

+

+        if (!userIsPermmited(request, mso_request)) {

+            return new ResponseEntity<String>(HttpStatus.FORBIDDEN);

+        }

 //		mso_request = retrieveRequestObject (request, mso_request);

 

-		String p = SystemProperties.getProperty(MsoProperties.MSO_REST_API_SVC_INSTANCE);

-	    

-		MsoResponseWrapper w = createInstance(mso_request, p);

-		// always return OK, the MSO status code is embedded in the body

-		

-        return ( new ResponseEntity<String>(w.getResponse(), HttpStatus.OK) );

-	

-	}

-	

-	/**

-	 * Creates the vnf.

-	 *

-	 * @param serviceInstanceId the service instance id

-	 * @param request the request

-	 * @return the response entity

-	 * @throws Exception the exception

-	 */

-	@RequestMapping(value="/mso_create_vnf_instance/{serviceInstanceId}", method = RequestMethod.POST)  	

-	public ResponseEntity<String> createVnf(@PathVariable("serviceInstanceId") String serviceInstanceId, HttpServletRequest request, @RequestBody RequestDetails mso_request) throws Exception {

-		

-		String methodName = "createVnf";		

-		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start");

-		

-		//RequestDetails mso_request = retrieveRequestObject (request);

-	    String p = SystemProperties.getProperty(MsoProperties.MSO_REST_API_VNF_INSTANCE);

-	    

-	    if ( p == null || p.isEmpty()) {

-	    	throw new Exception ( "Vnf instance path is not defined");

-	    }

-	    // /serviceInstances/v2/<service_instance_id>/vnfs

-	    String vnf_path = p.replaceFirst(SVC_INSTANCE_ID, serviceInstanceId );

-	    MsoResponseWrapper w = createInstance(mso_request, vnf_path);

-

-		// always return OK, the MSO status code is embedded in the body

-		

-        return ( new ResponseEntity<String>(w.getResponse(), HttpStatus.OK) );

-	

-	}

-	

-	/**

-	 * Creates the nw instance.

-	 *

-	 * @param serviceInstanceId the service instance id

-	 * @param request the request

-	 * @return the response entity

-	 * @throws Exception the exception

-	 */

-	@RequestMapping(value = "/mso_create_nw_instance/{serviceInstanceId}", method = RequestMethod.POST)

-	public ResponseEntity<String> createNwInstance(@PathVariable("serviceInstanceId") String serviceInstanceId, HttpServletRequest request, @RequestBody RequestDetails mso_request) throws Exception {

-	

-		String methodName = "createNwInstance";		

-		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start, serviceInstanceId = " + serviceInstanceId  );

-		

-		//RequestDetails mso_request = retrieveRequestObject (request);

-		

-	    String p = SystemProperties.getProperty(MsoProperties.MSO_REST_API_NETWORK_INSTANCE);

-	    

-	    if ( p == null || p.isEmpty()) {

-	    	throw new Exception ( "Network instance path is not defined");

-	    }

-	    // /serviceInstances/v2/<serviceInstanceId>/networks/

-	    

-	    String nw_path = p.replaceFirst(SVC_INSTANCE_ID, serviceInstanceId );

-	    MsoResponseWrapper w = createInstance(mso_request, nw_path);

-	   

-		// always return OK, the MSO status code is embedded in the body

-		

-        return ( new ResponseEntity<String>(w.getResponse(), HttpStatus.OK) );

-	

-	}

-	

-	/**

-	 * Creates the volume group instance.

-	 *

-	 * @param serviceInstanceId the service instance id

-	 * @param vnfInstanceId the vnf instance id

-	 * @param request the request

-	 * @return the response entity

-	 * @throws Exception the exception

-	 */

-	@RequestMapping(value = "/mso_create_volumegroup_instance/{serviceInstanceId}/vnfs/{vnfInstanceId}", method = RequestMethod.POST)

-	public ResponseEntity<String> createVolumeGroupInstance(@PathVariable("serviceInstanceId") String serviceInstanceId, @PathVariable("vnfInstanceId") String vnfInstanceId, 

-			HttpServletRequest request, @RequestBody RequestDetails mso_request) throws Exception {

-		String methodName = "createVolumeGroupInstance";

-		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start");

-		

-		//RequestDetails mso_request = retrieveRequestObject (request);

-		String p = SystemProperties.getProperty(MsoProperties.MSO_REST_API_VOLUME_GROUP_INSTANCE);

-	    

-	    if ( p == null || p.isEmpty()) {

-	    	throw new Exception ( "Volume group instance path is not defined");

-	    }

-	    String path = p.replaceFirst(SVC_INSTANCE_ID, serviceInstanceId);

-	    path = path.replaceFirst(VNF_INSTANCE_ID, vnfInstanceId);

-	    

-	    MsoResponseWrapper w = createInstance(mso_request, path);

-        

-		// always return OK, the MSO status code is embedded in the body

-        return ( new ResponseEntity<String>(w.getResponse(), HttpStatus.OK) );

-	}

-	

-	/**

-	 * Creates the vf module instance.

-	 *

-	 * @param serviceInstanceId the service instance id

-	 * @param vnfInstanceId the vnf instance id

-	 * @param request the request

-	 * @return the response entity

-	 * @throws Exception the exception

-	 */

-	@RequestMapping(value = "/mso_create_vfmodule_instance/{serviceInstanceId}/vnfs/{vnfInstanceId}", method = RequestMethod.POST)

-	public ResponseEntity<String> createVfModuleInstance(@PathVariable("serviceInstanceId") String serviceInstanceId, 

-			@PathVariable("vnfInstanceId") String vnfInstanceId, HttpServletRequest request, @RequestBody RequestDetails mso_request) throws Exception {

-		String methodName = "createVfModuleInstance";		

-		

-		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start");

-		//RequestDetails mso_request = retrieveRequestObject (request);

-	    String p = SystemProperties.getProperty(MsoProperties.MSO_REST_API_VF_MODULE_INSTANCE);

-	    

-	    if ( p == null || p.isEmpty()) {

-	    	throw new Exception ( "VF module instance path is not defined");

-	    }

-	    // /serviceInstances/v2/<serviceInstanceId>/vnfs/<vnfInstanceId>/vfmodules

-	    String path = p.replaceFirst(SVC_INSTANCE_ID, serviceInstanceId);

-	    path = path.replaceFirst(VNF_INSTANCE_ID, vnfInstanceId);

-	    

-	    MsoResponseWrapper w = createInstance(mso_request, path);

-		

-		// always return OK, the MSO status code is embedded in the body

-		

-        return ( new ResponseEntity<String>(w.getResponse(), HttpStatus.OK) );

-	}

-	

-	/**

-	 * Creates the instance.

-	 *

-	 * @param request the request

-	 * @param path the path

-	 * @return the mso response wrapper

-	 * @throws ClientHandlerException the client handler exception

-	 * @throws Exception the exception

-	 */

-	protected MsoResponseWrapper createInstance(RequestDetails request, String path) throws Exception {

-		String methodName = "createInstance";	

-		logger.debug(dateFormat.format(new Date()) + "<== " + methodName + " start");

-		

-		try {

-			MsoRestInterfaceIfc restController = MsoRestInterfaceFactory.getInstance();

-			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " calling Post, request = (" + request + ")");	

-			

-			RestObject<String> restObjStr = new RestObject<String>();

-			String str = new String();

-			restObjStr.set(str);

-			restController.<String>Post(str, request, "", path, restObjStr );

-			MsoResponseWrapper w = MsoUtil.wrapResponse (restObjStr);

-			

-			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " w=" + w.getResponse());

-			return w;

-		} catch (Exception e) {

-			logger.info(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) +  "<== " + "." + methodName + e.toString());

-			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) +  "<== " + "." + methodName + e.toString());

-			throw e;

-		}

-	}

-	

-	/**

-	 * Delete svc instance.

-	 *

-	 * @param serviceInstanceId the service instance id

-	 * @param request the request

-	 * @return the response entity

-	 * @throws Exception the exception

-	 */

-	@RequestMapping(value = "/mso_delete_svc_instance/{serviceInstanceId}", method = RequestMethod.POST)

-	public ResponseEntity<String> deleteSvcInstance(@PathVariable("serviceInstanceId") String serviceInstanceId,

-			HttpServletRequest request, @RequestBody RequestDetails mso_request) throws Exception {

-		

-		String methodName = "deleteSvcInstance";	

-		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start");

-		

-		//RequestDetails mso_request = retrieveRequestObject (request);

-	    String p = SystemProperties.getProperty(MsoProperties.MSO_REST_API_SVC_INSTANCE);

-	    String path = p + "/" + serviceInstanceId;

-	    MsoResponseWrapper w = deleteInstance ( mso_request, path );

-	  

-		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " w=" + w.getResponse());

-		// always return OK, the MSO status code is embedded in the body

-  		

-        return ( new ResponseEntity<String>(w.getResponse(), HttpStatus.OK) );

-	    

-	}

-	

-	/**

-	 * Delete vnf.

-	 *

-	 * @param serviceInstanceId the service instance id

-	 * @param vnfInstanceId the vnf instance id

-	 * @param request the request

-	 * @return the response entity

-	 * @throws Exception the exception

-	 */

-	@RequestMapping(value = "/mso_delete_vnf_instance/{serviceInstanceId}/vnfs/{vnfInstanceId}", method = RequestMethod.POST)

-	

-	public ResponseEntity<String> deleteVnf(@PathVariable("serviceInstanceId") String serviceInstanceId, @PathVariable("vnfInstanceId") String vnfInstanceId, 

-			HttpServletRequest request, @RequestBody RequestDetails mso_request) throws Exception {

-		String methodName = "deleteVnf";		

-		

-		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start");

-		

-		//RequestDetails mso_request = retrieveRequestObject (request);

-	    String p = SystemProperties.getProperty(MsoProperties.MSO_REST_API_VNF_INSTANCE);

-	    if ( p == null || p.isEmpty()) {

-	    	throw new Exception ( "Vnf instance path is not defined");

-	    }

-	    // /serviceInstances/v2/<service_instance_id>/vnfs/

-	    String vnf_path = p.replaceFirst(SVC_INSTANCE_ID, vnfInstanceId );

-	    MsoResponseWrapper w = deleteInstance ( mso_request, vnf_path + "/" + vnfInstanceId );

-	    

-		// always return OK, the MSO status code is embedded in the body

-        return ( new ResponseEntity<String>(w.getResponse(), HttpStatus.OK) );

-		

-	}

-							  

-  							/**

-  							 * Delete vf module.

-  							 *

-  							 * @param serviceInstanceId the service instance id

-  							 * @param vnfInstanceId the vnf instance id

-  							 * @param vfModuleId the vf module id

-  							 * @param request the request

-  							 * @return the response entity

-  							 * @throws Exception the exception

-  							 */

-  							//mso_delete_vf_module/bc305d54-75b4-431b-adb2-eb6b9e546014/vnfs/fe9000-0009-9999/vfmodules/abeeee-abeeee-abeeee

-	@RequestMapping(value = "/mso_delete_vfmodule_instance/{serviceInstanceId}/vnfs/{vnfInstanceId}/vfModules/{vfModuleId}", method = RequestMethod.POST)

-	public ResponseEntity<String> deleteVfModule (

-			@PathVariable("serviceInstanceId") String serviceInstanceId, @PathVariable("vnfInstanceId") String vnfInstanceId,

-			@PathVariable("vfModuleId") String vfModuleId, HttpServletRequest request, @RequestBody RequestDetails mso_request) throws Exception {

-		

-		String methodName = "deleteVfModule";

-		

-		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start");

-		

-		//RequestDetails mso_request = new RequestDetails();

-		//mso_request = retrieveRequestObject (request);

-	    String p = SystemProperties.getProperty(MsoProperties.MSO_REST_API_VF_MODULE_INSTANCE);

-	    if ( p == null || p.isEmpty()) {

-	    	throw new Exception ( "VF Module instance path is not defined");

-	    }

-	    // /serviceInstances/v2/<serviceInstanceId>/vnfs/<vnfInstanceId>/vfmodules

-	    String path = p.replaceFirst(SVC_INSTANCE_ID, serviceInstanceId );

-	    path = path.replaceFirst(VNF_INSTANCE_ID, vnfInstanceId );

-	    MsoResponseWrapper w = deleteInstance ( mso_request, path + "/" + vfModuleId);

-	    

-		// always return OK, the MSO status code is embedded in the body

-        return ( new ResponseEntity<String>(w.getResponse(), HttpStatus.OK) );

+        String p = SystemProperties.getProperty(MsoProperties.MSO_REST_API_SVC_INSTANCE);

+        String userId = "";

+        HttpSession session = request.getSession();

+        System.out.println((new ObjectMapper().writeValueAsString(session.getAttribute("roles"))));

+        MsoResponseWrapper w = createInstance(mso_request, p);

+        return (new ResponseEntity<String>(w.getResponse(), HttpStatus.OK));

+        // always return OK, the MSO status code is embedded in the body

 

-	}

 

-	/**

-	 * Delete volume group instance.

-	 *

-	 * @param serviceInstanceId the service instance id

-	 * @param vnfInstanceId the vnf instance id

-	 * @param volumeGroupId the volume group id

-	 * @param request the request

-	 * @return the response entity

-	 * @throws Exception the exception

-	 */

-	@RequestMapping(value = "/mso_delete_volumegroup_instance/{serviceInstanceId}/vnfs/{vnfInstanceId}/volumeGroups/{volumeGroupId}", method = RequestMethod.POST)

-	public ResponseEntity<String> deleteVolumeGroupInstance (

-			@PathVariable("serviceInstanceId") String serviceInstanceId, @PathVariable("vnfInstanceId") String vnfInstanceId, @PathVariable("volumeGroupId") String volumeGroupId,

-			HttpServletRequest request, @RequestBody RequestDetails mso_request) throws Exception {

-		

-		String methodName = "deleteVolumeGroupInstance";		

-		

-		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start");

-		//RequestDetails mso_request = retrieveRequestObject (request);

-		

-	    String p = SystemProperties.getProperty(MsoProperties.MSO_REST_API_VOLUME_GROUP_INSTANCE);

-	    if ( p == null || p.isEmpty()) {

-	    	throw new Exception ( "Volume group instance path is not defined");

-	    }

-	    // /serviceInstances/v2/{serviceInstanceId}/volumeGroups

-	    String path = p.replaceFirst(SVC_INSTANCE_ID, serviceInstanceId );

-	    path = path.replaceFirst(VNF_INSTANCE_ID, vnfInstanceId );

-	    MsoResponseWrapper w = deleteInstance ( mso_request, path + "/" + volumeGroupId);

-	    

-		// always return OK, the MSO status code is embedded in the body

-        return ( new ResponseEntity<String>(w.getResponse(), HttpStatus.OK) );

-	}

-	

-	/**

-	 * Delete nw instance.

-	 *

-	 * @param serviceInstanceId the service instance id

-	 * @param networkInstanceId the network instance id

-	 * @param request the request

-	 * @return the response entity

-	 * @throws Exception the exception

-	 */

-	@RequestMapping(value = "/mso_delete_nw_instance/{serviceInstanceId}/networks/{networkInstanceId}", method = RequestMethod.POST)

-	public ResponseEntity<String> deleteNwInstance(@PathVariable("serviceInstanceId") String serviceInstanceId,

-		@PathVariable("networkInstanceId") String networkInstanceId, HttpServletRequest request, @RequestBody RequestDetails mso_request) throws Exception {

-	

-		String methodName = "deleteNwInstance";		

-		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start");

-		

-		//RequestDetails mso_request = retrieveRequestObject (request);

-		

-	    String p = SystemProperties.getProperty(MsoProperties.MSO_REST_API_NETWORK_INSTANCE);

-	    if ( p == null || p.isEmpty()) {

-	    	throw new Exception ( "Network instance path is not defined");

-	    }

-	    // /serviceInstances/v2/<service_instance_id>/networks

-	    String path = p.replaceFirst(SVC_INSTANCE_ID, serviceInstanceId );

-	    MsoResponseWrapper w = deleteInstance ( mso_request, path + "/" + networkInstanceId);

-	    

-		// always return OK, the MSO status code is embedded in the body

-        return ( new ResponseEntity<String>(w.getResponse(), HttpStatus.OK) );

-	    

-	}

-	

-	/**

-	 * Delete instance.

-	 *

-	 * @param request the request

-	 * @param path the path

-	 * @return the mso response wrapper

-	 * @throws Exception the exception

-	 */

-	protected  MsoResponseWrapper deleteInstance(RequestDetails request, String path) throws Exception {

-		String methodName = "deleteInstance";	

-		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start");

-		

-		try {

-			MsoRestInterfaceIfc restController = MsoRestInterfaceFactory.getInstance();

-			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " calling Delete, path =[" + path + "]");

-		

-			RestObject<String> restObjStr = new RestObject<String>();

-			String str = new String();

-			restObjStr.set(str);

-			restController.<String>Delete(str, request, "", path, restObjStr );

-			MsoResponseWrapper w = MsoUtil.wrapResponse (restObjStr);

-			

-			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " w=" + w.getResponse());

-			return w;

-

-		} catch (Exception e) {

-			logger.info(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) +  "<== " + "." + methodName + e.toString());

-			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) +  "<== " + "." + methodName + e.toString());

-			throw e;

-		}

-		

-	}

-	

-	/**

-	 * Gets the orchestration request.

-	 *

-	 * @param requestId the request id

-	 * @param request the request

-	 * @return the orchestration request

-	 * @throws Exception the exception

-	 */

-	@RequestMapping(value = "/mso_get_orch_req/{requestId}", method = RequestMethod.GET)

-	public ResponseEntity<String> getOrchestrationRequest(@PathVariable("requestId") String requestId,

-			HttpServletRequest request) throws Exception {

-		

-		String methodName = "getOrchestrationRequest";		

-		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start");

-		MsoResponseWrapper w = null;

-		try {

-			MsoRestInterfaceIfc restController = MsoRestInterfaceFactory.getInstance();

-		    String p = SystemProperties.getProperty(MsoProperties.MSO_REST_API_GET_ORC_REQ);

-		    String path = p + "/" + requestId;

-		    

-		    RestObject<String> restObjStr = new RestObject<String>();

-			String str = new String();

-			restObjStr.set(str);

-

-		    restController.<String>Get(str, "", path, restObjStr);

-		    

-		    w = MsoUtil.wrapResponse (restObjStr);

-			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " w=" + w.getResponse());

-			// always return OK, the MSO status code is embedded in the body

-	  		

-		} catch (Exception e) {

-			logger.info(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) +  "<== " + "." + methodName + e.toString());

-			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) +  "<== " + "." + methodName + e.toString());

-			throw e;

-		}

-		// always return OK, the MSO status code is embedded in the body

-  		return ( new ResponseEntity<String>(w.getResponse(), HttpStatus.OK) );

-	}

-	

-	

-	/**

-	 * Gets the orchestration requests.

-	 *

-	 * @param filterString the filter string

-	 * @param request the request

-	 * @return the orchestration requests

-	 * @throws Exception the exception

-	 */

-	@RequestMapping(value = "/mso_get_orch_reqs/{filterString}", method = RequestMethod.GET)

-	public ResponseEntity<String> getOrchestrationRequests(@PathVariable("filterString") String filterString,

-			HttpServletRequest request) throws Exception {

-		

-		String methodName = "getOrchestrationRequests";		

-		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start");

-		MsoResponseWrapper w = null;

-		try {

-			MsoRestInterfaceIfc restController = MsoRestInterfaceFactory.getInstance();

-		    String p = SystemProperties.getProperty(MsoProperties.MSO_REST_API_GET_ORC_REQS);

-		    String path = p + filterString;

-		    

-		    RestObject<String> restObjStr = new RestObject<String>();

-			String str = new String();

-			restObjStr.set(str);

-

-		    restController.<String>Get(str, "", path, restObjStr);

-		   

-		    w = MsoUtil.wrapResponse (restObjStr);

-		    logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " w=" + w.getResponse());

-		} catch (Exception e) {

-			logger.info(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) +  "<== " + "." + methodName + e.toString());

-			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) +  "<== " + "." + methodName + e.toString());

-			throw e;

-		}

-		// always return OK, the MSO status code is embedded in the body

-  		return ( new ResponseEntity<String>(w.getResponse(), HttpStatus.OK) );

-	}

-	 	

-	/**

-	 * Gets the orchestration requests for svc instance.

-	 *

-	 * @param svc_instance_id the svc instance id

-	 * @return the orchestration requests for svc instance

-	 * @throws Exception the exception

-	 */

-	public MsoResponseWrapper getOrchestrationRequestsForSvcInstance (String svc_instance_id) throws Exception {

-		

-		String methodName = "getOrchestrationRequestsForSvcInstance";		

-		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start");

-		MsoResponseWrapper w = null;

-		

-		try {

-			MsoRestInterfaceIfc restController = MsoRestInterfaceFactory.getInstance();

-		    String p = SystemProperties.getProperty(MsoProperties.MSO_REST_API_GET_ORC_REQS);

-		    String path = p + svc_instance_id;

-		    

-		    RestObject<String> restObjStr = new RestObject<String>();

-			String str = new String();

-			restObjStr.set(str);

-			

-			restController.<String>Get(str, "", path, restObjStr);

-			w = MsoUtil.wrapResponse (restObjStr);

-		    logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " w=" + w.getResponse());

-		

-		} catch (Exception e) {

-			logger.info(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) +  "<== " + "." + methodName + e.toString());

-			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) +  "<== " + "." + methodName + e.toString());

-			throw e;

-		}

-		return w;

-	}

-	

-	/**

-	 * Exception handler.

-	 *

-	 * @param e the e

-	 * @param response the response

-	 * @throws IOException Signals that an I/O exception has occurred.

-	 */

-	@ExceptionHandler(Exception.class)

-	private void exceptionHandler(Exception e, HttpServletResponse response) throws IOException {

+    }

+

+    private boolean userIsPermmited(HttpServletRequest request, RequestDetails mso_request) {

+

+        RoleValidator roleValidator = new RoleValidator(new RoleProvider().getUserRoles(request));

+        boolean isPermitted = roleValidator.isMsoRequestValid(mso_request);

+        if (!isPermitted) {

+            return false;

+        } else {

+            return true;

+        }

+    }

+

+    /**

+     * Creates the vnf.

+     *

+     * @param serviceInstanceId the service instance id

+     * @param request           the request

+     * @return the response entity

+     * @throws Exception the exception

+     */

+    @RequestMapping(value = "/mso_create_vnf_instance/{serviceInstanceId}", method = RequestMethod.POST)

+    public ResponseEntity<String> createVnf(@PathVariable("serviceInstanceId") String serviceInstanceId, HttpServletRequest request, @RequestBody RequestDetails mso_request) throws Exception {

+//        if (!userIsPermmited(request, mso_request)) {

+            String instanceId = (String) ((Map)((Map)((ArrayList)((Map) mso_request.getAdditionalProperties().get("requestDetails")).get("relatedInstanceList")).get(0)).get("relatedInstance")).get("instanceId");

+            ResponseEntity<String> a = new AaiController(request.getServletContext()).doGetServiceInstance(instanceId,"Service Instance id");

+//            return new ResponseEntity<String>(HttpStatus.FORBIDDEN);

+//        }

+        String methodName = "createVnf";

+        logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start");

+

+        //RequestDetails mso_request = retrieveRequestObject (request);

+        String p = SystemProperties.getProperty(MsoProperties.MSO_REST_API_VNF_INSTANCE);

+

+        if (p == null || p.isEmpty()) {

+            throw new Exception("Vnf instance path is not defined");

+        }

+        // /serviceInstances/v2/<service_instance_id>/vnfs

+        String vnf_path = p.replaceFirst(SVC_INSTANCE_ID, serviceInstanceId);

+        MsoResponseWrapper w = createInstance(mso_request, vnf_path);

+

+        // always return OK, the MSO status code is embedded in the body

+

+        return (new ResponseEntity<String>(w.getResponse(), HttpStatus.OK));

+

+    }

+

+    /**

+     * Creates the nw instance.

+     *

+     * @param serviceInstanceId the service instance id

+     * @param request           the request

+     * @return the response entity

+     * @throws Exception the exception

+     */

+    @RequestMapping(value = "/mso_create_nw_instance/{serviceInstanceId}", method = RequestMethod.POST)

+    public ResponseEntity<String> createNwInstance(@PathVariable("serviceInstanceId") String serviceInstanceId, HttpServletRequest request, @RequestBody RequestDetails mso_request) throws Exception {

+

+        String methodName = "createNwInstance";

+        logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start, serviceInstanceId = " + serviceInstanceId);

+

+        //RequestDetails mso_request = retrieveRequestObject (request);

+

+        String p = SystemProperties.getProperty(MsoProperties.MSO_REST_API_NETWORK_INSTANCE);

+

+        if (p == null || p.isEmpty()) {

+            throw new Exception("Network instance path is not defined");

+        }

+        // /serviceInstances/v2/<serviceInstanceId>/networks/

+

+        String nw_path = p.replaceFirst(SVC_INSTANCE_ID, serviceInstanceId);

+        MsoResponseWrapper w = createInstance(mso_request, nw_path);

+

+        // always return OK, the MSO status code is embedded in the body

+

+        return (new ResponseEntity<String>(w.getResponse(), HttpStatus.OK));

+

+    }

+

+    /**

+     * Creates the volume group instance.

+     *

+     * @param serviceInstanceId the service instance id

+     * @param vnfInstanceId     the vnf instance id

+     * @param request           the request

+     * @return the response entity

+     * @throws Exception the exception

+     */

+    @RequestMapping(value = "/mso_create_volumegroup_instance/{serviceInstanceId}/vnfs/{vnfInstanceId}", method = RequestMethod.POST)

+    public ResponseEntity<String> createVolumeGroupInstance(@PathVariable("serviceInstanceId") String serviceInstanceId, @PathVariable("vnfInstanceId") String vnfInstanceId,

+                                                            HttpServletRequest request, @RequestBody RequestDetails mso_request) throws Exception {

+        String methodName = "createVolumeGroupInstance";

+        if (!userIsPermmited(request, mso_request)) {

+            return new ResponseEntity<String>(HttpStatus.FORBIDDEN);

+        }

+        logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start");

+

+        //RequestDetails mso_request = retrieveRequestObject (request);

+        String p = SystemProperties.getProperty(MsoProperties.MSO_REST_API_VOLUME_GROUP_INSTANCE);

+

+        if (p == null || p.isEmpty()) {

+            throw new Exception("Volume group instance path is not defined");

+        }

+        String path = p.replaceFirst(SVC_INSTANCE_ID, serviceInstanceId);

+        path = path.replaceFirst(VNF_INSTANCE_ID, vnfInstanceId);

+

+        MsoResponseWrapper w = createInstance(mso_request, path);

+

+        // always return OK, the MSO status code is embedded in the body

+        return (new ResponseEntity<String>(w.getResponse(), HttpStatus.OK));

+    }

+

+    /**

+     * Creates the vf module instance.

+     *

+     * @param serviceInstanceId the service instance id

+     * @param vnfInstanceId     the vnf instance id

+     * @param request           the request

+     * @return the response entity

+     * @throws Exception the exception

+     */

+    @RequestMapping(value = "/mso_create_vfmodule_instance/{serviceInstanceId}/vnfs/{vnfInstanceId}", method = RequestMethod.POST)

+    public ResponseEntity<String> createVfModuleInstance(@PathVariable("serviceInstanceId") String serviceInstanceId,

+                                                         @PathVariable("vnfInstanceId") String vnfInstanceId, HttpServletRequest request, @RequestBody RequestDetails mso_request) throws Exception {

+        String methodName = "createVfModuleInstance";

+

+        logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start");

+        if (!userIsPermmited(request, mso_request)) {

+            return new ResponseEntity<String>(HttpStatus.FORBIDDEN);

+        }

+        //RequestDetails mso_request = retrieveRequestObject (request);

+        String p = SystemProperties.getProperty(MsoProperties.MSO_REST_API_VF_MODULE_INSTANCE);

+

+        if (p == null || p.isEmpty()) {

+            throw new Exception("VF module instance path is not defined");

+        }

+        // /serviceInstances/v2/<serviceInstanceId>/vnfs/<vnfInstanceId>/vfmodules

+        String path = p.replaceFirst(SVC_INSTANCE_ID, serviceInstanceId);

+        path = path.replaceFirst(VNF_INSTANCE_ID, vnfInstanceId);

+

+        MsoResponseWrapper w = createInstance(mso_request, path);

+

+        // always return OK, the MSO status code is embedded in the body

+

+        return (new ResponseEntity<String>(w.getResponse(), HttpStatus.OK));

+    }

+

+    /**

+     * Creates the instance.

+     *

+     * @param request the request

+     * @param path    the path

+     * @return the mso response wrapper

+     * @throws Exception the exception

+     */

+    protected MsoResponseWrapper createInstance(RequestDetails request, String path) throws Exception {

+        String methodName = "createInstance";

+        logger.debug(dateFormat.format(new Date()) + "<== " + methodName + " start");

+

+        try {

+            MsoRestInterfaceIfc restController = MsoRestInterfaceFactory.getInstance();

+            logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " calling Post, request = (" + request + ")");

+

+            RestObject<String> restObjStr = new RestObject<String>();

+            String str = new String();

+            restObjStr.set(str);

+            restController.<String>Post(str, request, "", path, restObjStr);

+            MsoResponseWrapper w = MsoUtil.wrapResponse(restObjStr);

+

+            logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " w=" + w.getResponse());

+            return w;

+        } catch (Exception e) {

+            logger.info(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) + "<== " + "." + methodName + e.toString());

+            logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + "." + methodName + e.toString());

+            throw e;

+        }

+    }

+

+    /**

+     * Delete svc instance.

+     *

+     * @param serviceInstanceId the service instance id

+     * @param request           the request

+     * @return the response entity

+     * @throws Exception the exception

+     */

+    @RequestMapping(value = "/mso_delete_svc_instance/{serviceInstanceId}", method = RequestMethod.POST)

+    public ResponseEntity<String> deleteSvcInstance(@PathVariable("serviceInstanceId") String serviceInstanceId,

+                                                    HttpServletRequest request, @RequestBody RequestDetails mso_request) throws Exception {

+

+        String methodName = "deleteSvcInstance";

+        logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start");

+

+        //RequestDetails mso_request = retrieveRequestObject (request);

+        String p = SystemProperties.getProperty(MsoProperties.MSO_REST_API_SVC_INSTANCE);

+        String path = p + "/" + serviceInstanceId;

+        MsoResponseWrapper w = deleteInstance(mso_request, path);

+

+        logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " w=" + w.getResponse());

+        // always return OK, the MSO status code is embedded in the body

+

+        return (new ResponseEntity<String>(w.getResponse(), HttpStatus.OK));

+

+    }

+

+    /**

+     * Delete vnf.

+     *

+     * @param serviceInstanceId the service instance id

+     * @param vnfInstanceId     the vnf instance id

+     * @param request           the request

+     * @return the response entity

+     * @throws Exception the exception

+     */

+    @RequestMapping(value = "/mso_delete_vnf_instance/{serviceInstanceId}/vnfs/{vnfInstanceId}", method = RequestMethod.POST)

+

+    public ResponseEntity<String> deleteVnf(@PathVariable("serviceInstanceId") String serviceInstanceId, @PathVariable("vnfInstanceId") String vnfInstanceId,

+                                            HttpServletRequest request, @RequestBody RequestDetails mso_request) throws Exception {

+        String methodName = "deleteVnf";

+

+        logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start");

+        if (!userIsPermmited(request, mso_request)) {

+            return new ResponseEntity<String>(HttpStatus.FORBIDDEN);

+        }

+        //RequestDetails mso_request = retrieveRequestObject (request);

+        String p = SystemProperties.getProperty(MsoProperties.MSO_REST_API_VNF_INSTANCE);

+        if (p == null || p.isEmpty()) {

+            throw new Exception("Vnf instance path is not defined");

+        }

+        // /serviceInstances/v2/<service_instance_id>/vnfs/

+        String vnf_path = p.replaceFirst(SVC_INSTANCE_ID, vnfInstanceId);

+        MsoResponseWrapper w = deleteInstance(mso_request, vnf_path + "/" + vnfInstanceId);

+

+        // always return OK, the MSO status code is embedded in the body

+        return (new ResponseEntity<String>(w.getResponse(), HttpStatus.OK));

+

+    }

+

+    /**

+     * Delete vf module.

+     *

+     * @param serviceInstanceId the service instance id

+     * @param vnfInstanceId     the vnf instance id

+     * @param vfModuleId        the vf module id

+     * @param request           the request

+     * @return the response entity

+     * @throws Exception the exception

+     */

+    //mso_delete_vf_module/bc305d54-75b4-431b-adb2-eb6b9e546014/vnfs/fe9000-0009-9999/vfmodules/abeeee-abeeee-abeeee

+    @RequestMapping(value = "/mso_delete_vfmodule_instance/{serviceInstanceId}/vnfs/{vnfInstanceId}/vfModules/{vfModuleId}", method = RequestMethod.POST)

+    public ResponseEntity<String> deleteVfModule(

+            @PathVariable("serviceInstanceId") String serviceInstanceId, @PathVariable("vnfInstanceId") String vnfInstanceId,

+            @PathVariable("vfModuleId") String vfModuleId, HttpServletRequest request, @RequestBody RequestDetails mso_request) throws Exception {

+

+        String methodName = "deleteVfModule";

+

+        logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start");

+        if (!userIsPermmited(request, mso_request)) {

+            return new ResponseEntity<String>(HttpStatus.FORBIDDEN);

+        }

+        //RequestDetails mso_request = new RequestDetails();

+        //mso_request = retrieveRequestObject (request);

+        String p = SystemProperties.getProperty(MsoProperties.MSO_REST_API_VF_MODULE_INSTANCE);

+        if (p == null || p.isEmpty()) {

+            throw new Exception("VF Module instance path is not defined");

+        }

+        // /serviceInstances/v2/<serviceInstanceId>/vnfs/<vnfInstanceId>/vfmodules

+        String path = p.replaceFirst(SVC_INSTANCE_ID, serviceInstanceId);

+        path = path.replaceFirst(VNF_INSTANCE_ID, vnfInstanceId);

+        MsoResponseWrapper w = deleteInstance(mso_request, path + "/" + vfModuleId);

+

+        // always return OK, the MSO status code is embedded in the body

+        return (new ResponseEntity<String>(w.getResponse(), HttpStatus.OK));

+

+    }

+

+    /**

+     * Delete volume group instance.

+     *

+     * @param serviceInstanceId the service instance id

+     * @param vnfInstanceId     the vnf instance id

+     * @param volumeGroupId     the volume group id

+     * @param request           the request

+     * @return the response entity

+     * @throws Exception the exception

+     */

+    @RequestMapping(value = "/mso_delete_volumegroup_instance/{serviceInstanceId}/vnfs/{vnfInstanceId}/volumeGroups/{volumeGroupId}", method = RequestMethod.POST)

+    public ResponseEntity<String> deleteVolumeGroupInstance(

+            @PathVariable("serviceInstanceId") String serviceInstanceId, @PathVariable("vnfInstanceId") String vnfInstanceId, @PathVariable("volumeGroupId") String volumeGroupId,

+            HttpServletRequest request, @RequestBody RequestDetails mso_request) throws Exception {

+

+        String methodName = "deleteVolumeGroupInstance";

+

+        logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start");

+        if (!userIsPermmited(request, mso_request)) {

+            return new ResponseEntity<String>(HttpStatus.FORBIDDEN);

+        }

+        String p = SystemProperties.getProperty(MsoProperties.MSO_REST_API_VOLUME_GROUP_INSTANCE);

+        if (p == null || p.isEmpty()) {

+            throw new Exception("Volume group instance path is not defined");

+        }

+        // /serviceInstances/v2/{serviceInstanceId}/volumeGroups

+        String path = p.replaceFirst(SVC_INSTANCE_ID, serviceInstanceId);

+        path = path.replaceFirst(VNF_INSTANCE_ID, vnfInstanceId);

+        MsoResponseWrapper w = deleteInstance(mso_request, path + "/" + volumeGroupId);

+

+        // always return OK, the MSO status code is embedded in the body

+        return (new ResponseEntity<String>(w.getResponse(), HttpStatus.OK));

+    }

+

+    /**

+     * Delete nw instance.

+     *

+     * @param serviceInstanceId the service instance id

+     * @param networkInstanceId the network instance id

+     * @param request           the request

+     * @return the response entity

+     * @throws Exception the exception

+     */

+    @RequestMapping(value = "/mso_delete_nw_instance/{serviceInstanceId}/networks/{networkInstanceId}", method = RequestMethod.POST)

+    public ResponseEntity<String> deleteNwInstance(@PathVariable("serviceInstanceId") String serviceInstanceId,

+                                                   @PathVariable("networkInstanceId") String networkInstanceId, HttpServletRequest request, @RequestBody RequestDetails mso_request) throws Exception {

+

+        String methodName = "deleteNwInstance";

+        logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start");

+

+        //RequestDetails mso_request = retrieveRequestObject (request);

+        if (!userIsPermmited(request, mso_request)) {

+            return new ResponseEntity<String>(HttpStatus.FORBIDDEN);

+        }

+        String p = SystemProperties.getProperty(MsoProperties.MSO_REST_API_NETWORK_INSTANCE);

+        if (p == null || p.isEmpty()) {

+            throw new Exception("Network instance path is not defined");

+        }

+        // /serviceInstances/v2/<service_instance_id>/networks

+        String path = p.replaceFirst(SVC_INSTANCE_ID, serviceInstanceId);

+        MsoResponseWrapper w = deleteInstance(mso_request, path + "/" + networkInstanceId);

+

+        // always return OK, the MSO status code is embedded in the body

+        return (new ResponseEntity<String>(w.getResponse(), HttpStatus.OK));

+

+    }

+

+    /**

+     * Delete instance.

+     *

+     * @param request the request

+     * @param path    the path

+     * @return the mso response wrapper

+     * @throws Exception the exception

+     */

+    protected MsoResponseWrapper deleteInstance(RequestDetails request, String path) throws Exception {

+        String methodName = "deleteInstance";

+        logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start");

+

+        try {

+            MsoRestInterfaceIfc restController = MsoRestInterfaceFactory.getInstance();

+            logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " calling Delete, path =[" + path + "]");

+

+            RestObject<String> restObjStr = new RestObject<String>();

+            String str = new String();

+            restObjStr.set(str);

+            restController.<String>Delete(str, request, "", path, restObjStr);

+            MsoResponseWrapper w = MsoUtil.wrapResponse(restObjStr);

+

+            logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " w=" + w.getResponse());

+            return w;

+

+        } catch (Exception e) {

+            logger.info(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) + "<== " + "." + methodName + e.toString());

+            logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + "." + methodName + e.toString());

+            throw e;

+        }

+

+    }

+

+    /**

+     * Gets the orchestration request.

+     *

+     * @param requestId the request id

+     * @param request   the request

+     * @return the orchestration request

+     * @throws Exception the exception

+     */

+    @RequestMapping(value = "/mso_get_orch_req/{requestId}", method = RequestMethod.GET)

+    public ResponseEntity<String> getOrchestrationRequest(@PathVariable("requestId") String requestId,

+                                                          HttpServletRequest request) throws Exception {

+

+        String methodName = "getOrchestrationRequest";

+        logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start");

+        MsoResponseWrapper w = null;

+        try {

+            MsoRestInterfaceIfc restController = MsoRestInterfaceFactory.getInstance();

+            String p = SystemProperties.getProperty(MsoProperties.MSO_REST_API_GET_ORC_REQ);

+            String path = p + "/" + requestId;

+

+            RestObject<String> restObjStr = new RestObject<String>();

+            String str = new String();

+            restObjStr.set(str);

+

+            restController.<String>Get(str, "", path, restObjStr);

+

+            w = MsoUtil.wrapResponse(restObjStr);

+            logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " w=" + w.getResponse());

+            // always return OK, the MSO status code is embedded in the body

+

+        } catch (Exception e) {

+            logger.info(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) + "<== " + "." + methodName + e.toString());

+            logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + "." + methodName + e.toString());

+            throw e;

+        }

+        // always return OK, the MSO status code is embedded in the body

+        return (new ResponseEntity<String>(w.getResponse(), HttpStatus.OK));

+    }

+

+

+    /**

+     * Gets the orchestration requests.

+     *

+     * @param filterString the filter string

+     * @param request      the request

+     * @return the orchestration requests

+     * @throws Exception the exception

+     */

+    @RequestMapping(value = "/mso_get_orch_reqs/{filterString}", method = RequestMethod.GET)

+    public ResponseEntity<String> getOrchestrationRequests(@PathVariable("filterString") String filterString,

+                                                           HttpServletRequest request) throws Exception {

+

+        String methodName = "getOrchestrationRequests";

+        logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start");

+        MsoResponseWrapper w = null;

+        try {

+            MsoRestInterfaceIfc restController = MsoRestInterfaceFactory.getInstance();

+            String p = SystemProperties.getProperty(MsoProperties.MSO_REST_API_GET_ORC_REQS);

+            String path = p + filterString;

+

+            RestObject<String> restObjStr = new RestObject<String>();

+            String str = new String();

+            restObjStr.set(str);

+

+            restController.<String>Get(str, "", path, restObjStr);

+

+            w = MsoUtil.wrapResponse(restObjStr);

+            logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " w=" + w.getResponse());

+        } catch (Exception e) {

+            logger.info(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) + "<== " + "." + methodName + e.toString());

+            logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + "." + methodName + e.toString());

+            throw e;

+        }

+        // always return OK, the MSO status code is embedded in the body

+        return (new ResponseEntity<String>(w.getResponse(), HttpStatus.OK));

+    }

+

+    /**

+     * Gets the orchestration requests for svc instance.

+     *

+     * @param svc_instance_id the svc instance id

+     * @return the orchestration requests for svc instance

+     * @throws Exception the exception

+     */

+    public MsoResponseWrapper getOrchestrationRequestsForSvcInstance(String svc_instance_id) throws Exception {

+

+        String methodName = "getOrchestrationRequestsForSvcInstance";

+        logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start");

+        MsoResponseWrapper w = null;

+

+        try {

+            MsoRestInterfaceIfc restController = MsoRestInterfaceFactory.getInstance();

+            String p = SystemProperties.getProperty(MsoProperties.MSO_REST_API_GET_ORC_REQS);

+            String path = p + svc_instance_id;

+

+            RestObject<String> restObjStr = new RestObject<String>();

+            String str = new String();

+            restObjStr.set(str);

+

+            restController.<String>Get(str, "", path, restObjStr);

+            w = MsoUtil.wrapResponse(restObjStr);

+            logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " w=" + w.getResponse());

+

+        } catch (Exception e) {

+            logger.info(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) + "<== " + "." + methodName + e.toString());

+            logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + "." + methodName + e.toString());

+            throw e;

+        }

+        return w;

+    }

+

+    /**

+     * Exception handler.

+     *

+     * @param e        the e

+     * @param response the response

+     * @throws IOException Signals that an I/O exception has occurred.

+     */

+    @ExceptionHandler(Exception.class)

+    private void exceptionHandler(Exception e, HttpServletResponse response) throws IOException {

 

 		/*

 		 * The following "logger.error" lines "should" be sufficient for logging the exception.

@@ -633,129 +641,126 @@ public class MsoController extends RestrictedBaseController{
 		 * logger statements in this class. Thus the temporary "e.printStackTrace" statement

 		 * is also included.

 		 */

-		

-		String methodName = "exceptionHandler";	

-		logger.error(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) +  "<== " + "." + methodName + e.toString());

-		StringWriter sw = new StringWriter();

-				e.printStackTrace(new PrintWriter(sw));

-		logger.error(EELFLoggerDelegate.errorLogger, sw.toString());

+

+        String methodName = "exceptionHandler";

+        logger.error(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) + "<== " + "." + methodName + e.toString());

+        StringWriter sw = new StringWriter();

+        e.printStackTrace(new PrintWriter(sw));

+        logger.error(EELFLoggerDelegate.errorLogger, sw.toString());

 

 		/*

 		 *  Temporary - IF the above  mentioned "logger.error" glitch is resolved ...

 		 *  this statement could be removed since it would then likely result in duplicate

 		 *  trace output. 

 		 */

-		e.printStackTrace(System.err);

+        e.printStackTrace(System.err);

 

-		response.setContentType("application/json; charset=UTF-8");

-		response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);

+        response.setContentType("application/json; charset=UTF-8");

+        response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);

 

-		ExceptionResponse exceptionResponse = new ExceptionResponse();

-		exceptionResponse.setException(e.getClass().toString().replaceFirst("^.*\\.", ""));

-		exceptionResponse.setMessage(e.getMessage());

+        ExceptionResponse exceptionResponse = new ExceptionResponse();

+        exceptionResponse.setException(e.getClass().toString().replaceFirst("^.*\\.", ""));

+        exceptionResponse.setMessage(e.getMessage());

 

-		response.getWriter().write(new ObjectMapper().writeValueAsString(exceptionResponse));

+        response.getWriter().write(new ObjectMapper().writeValueAsString(exceptionResponse));

 

-		response.flushBuffer();

+        response.flushBuffer();

 

-	}

+    }

 

-	/**

-	 * Parses the orchestration requests for svc instance.

-	 *

-	 * @param resp the resp

-	 * @return the list

-	 * @throws ParseException the parse exception

-	 * @throws Exception the exception

-	 */

-	@SuppressWarnings("unchecked")

-	public List<JSONObject> parseOrchestrationRequestsForSvcInstance ( ClientResponse resp ) throws org.json.simple.parser.ParseException, Exception {

-		

-		String methodName = "parseOrchestrationRequestsForSvcInstance";

-		

-		ArrayList<JSONObject> json_list = new ArrayList<JSONObject>();

-		

-		String rlist_str = resp.readEntity (String.class);

-		logger.debug (EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) +  "<== " + "." + methodName + " Response string: " + rlist_str);

-		

-		JSONParser parser = new JSONParser();

-		try {

-			Object obj = parser.parse(rlist_str);

-			

-			JSONObject jsonObject = (JSONObject) obj;

-		

-			JSONArray requestList = (JSONArray) jsonObject.get("requestList");

-			

-			if ( requestList != null && ! (requestList.isEmpty()) )

-				for ( Object container : requestList) {

-			

-					JSONObject containerJsonObj = (JSONObject) container;

-					//logger.debug(dateFormat.format(new Date()) +  "<== " + "." + methodName + " reqJsonObj: " + containerJsonObj.toJSONString());

-					JSONObject reqJsonObj = (JSONObject) containerJsonObj.get("request");

-					

-					//logger.debug(dateFormat.format(new Date()) +  "<== " + "." + methodName + " reqJsonObj.requestId: " + 

-						//	reqJsonObj.get("requestId") );

-					JSONObject result = new JSONObject();

-					

-					result.put("requestId", reqJsonObj.get ("requestId"));

-					if ( reqJsonObj.get("requestType") != null ) {

-						result.put("requestType", (reqJsonObj.get("requestType").toString()));

-					}

-					JSONObject req_status = (JSONObject)reqJsonObj.get("requestStatus");

-					if ( req_status != null ) {

-						result.put("timestamp", (req_status.get("timestamp")));

-						result.put("requestState", (req_status.get("requestState")));

-						result.put("statusMessage", (req_status.get("statusMessage")));

-						result.put("percentProgress", (req_status.get("percentProgress")));

-					} 

-					json_list.add (result);

-				}

-		} catch (org.json.simple.parser.ParseException pe) {

-			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) +  "<== " + "." + methodName + " Parse exception: " + pe.toString());

-			throw pe;

-		} catch (Exception e) {

-			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) +  "<== " + "." + methodName + " Exception: " + e.toString());

-			throw e;

-		}

-		return ( json_list );

-	} 

-	

-	/**

-	 * Retrieve request object.

-	 *

-	 * @param request the request

-	 * @return the request details

-	 * @throws Exception the exception

-	 */

-	public RequestDetails retrieveRequestObject ( HttpServletRequest request, @RequestBody RequestDetails mso_request ) throws Exception {

-			

-		String methodName = "retrieveRequestObject";

-		logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start" );

-		

-		ObjectMapper mapper = new ObjectMapper();

-		//JSON from String to Object

-		//RequestDetails mso_request;

-		

-		try {

-			//mso_request = new RequestDetails();

-			//mso_request = mapper.readValue(request.getInputStream(), RequestDetails.class);

-		}

-		catch ( Exception e ) {

-			logger.error(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) + "<== " + methodName + " Unable to read json object RequestDetails e=" + e.getMessage());

-			throw e;

-		}

-		if ( mso_request == null) {

-			logger.error(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) + "<== " + methodName + " mso_request is null");

-			throw new Exception ("RequestDetails is missing");

-		}

-		try {

-			String json_req = mapper.writeValueAsString(mso_request);

-			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " request=[" + json_req + "]");

-		}

-		catch ( Exception e ) {

-			logger.error(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) + "<== " + methodName + " Unable to convert RequestDetails to json string e=" + e.getMessage());

-			throw e;

-		}

-		return (mso_request);

-	}

+    /**

+     * Parses the orchestration requests for svc instance.

+     *

+     * @param resp the resp

+     * @return the list

+     * @throws Exception the exception

+     */

+    @SuppressWarnings("unchecked")

+    public List<JSONObject> parseOrchestrationRequestsForSvcInstance(ClientResponse resp) throws org.json.simple.parser.ParseException, Exception {

+

+        String methodName = "parseOrchestrationRequestsForSvcInstance";

+

+        ArrayList<JSONObject> json_list = new ArrayList<JSONObject>();

+

+        String rlist_str = resp.readEntity(String.class);

+        logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + "." + methodName + " Response string: " + rlist_str);

+

+        JSONParser parser = new JSONParser();

+        try {

+            Object obj = parser.parse(rlist_str);

+

+            JSONObject jsonObject = (JSONObject) obj;

+

+            JSONArray requestList = (JSONArray) jsonObject.get("requestList");

+

+            if (requestList != null && !(requestList.isEmpty()))

+                for (Object container : requestList) {

+

+                    JSONObject containerJsonObj = (JSONObject) container;

+                    //logger.debug(dateFormat.format(new Date()) +  "<== " + "." + methodName + " reqJsonObj: " + containerJsonObj.toJSONString());

+                    JSONObject reqJsonObj = (JSONObject) containerJsonObj.get("request");

+

+                    //logger.debug(dateFormat.format(new Date()) +  "<== " + "." + methodName + " reqJsonObj.requestId: " +

+                    //	reqJsonObj.get("requestId") );

+                    JSONObject result = new JSONObject();

+

+                    result.put("requestId", reqJsonObj.get("requestId"));

+                    if (reqJsonObj.get("requestType") != null) {

+                        result.put("requestType", (reqJsonObj.get("requestType").toString()));

+                    }

+                    JSONObject req_status = (JSONObject) reqJsonObj.get("requestStatus");

+                    if (req_status != null) {

+                        result.put("timestamp", (req_status.get("timestamp")));

+                        result.put("requestState", (req_status.get("requestState")));

+                        result.put("statusMessage", (req_status.get("statusMessage")));

+                        result.put("percentProgress", (req_status.get("percentProgress")));

+                    }

+                    json_list.add(result);

+                }

+        } catch (org.json.simple.parser.ParseException pe) {

+            logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + "." + methodName + " Parse exception: " + pe.toString());

+            throw pe;

+        } catch (Exception e) {

+            logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + "." + methodName + " Exception: " + e.toString());

+            throw e;

+        }

+        return (json_list);

+    }

+

+    /**

+     * Retrieve request object.

+     *

+     * @param request the request

+     * @return the request details

+     * @throws Exception the exception

+     */

+    public RequestDetails retrieveRequestObject(HttpServletRequest request, @RequestBody RequestDetails mso_request) throws Exception {

+

+        String methodName = "retrieveRequestObject";

+        logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start");

+

+        ObjectMapper mapper = new ObjectMapper();

+        //JSON from String to Object

+        //RequestDetails mso_request;

+

+        try {

+            //mso_request = new RequestDetails();

+            //mso_request = mapper.readValue(request.getInputStream(), RequestDetails.class);

+        } catch (Exception e) {

+            logger.error(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) + "<== " + methodName + " Unable to read json object RequestDetails e=" + e.getMessage());

+            throw e;

+        }

+        if (mso_request == null) {

+            logger.error(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) + "<== " + methodName + " mso_request is null");

+            throw new Exception("RequestDetails is missing");

+        }

+        try {

+            String json_req = mapper.writeValueAsString(mso_request);

+            logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " request=[" + json_req + "]");

+        } catch (Exception e) {

+            logger.error(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) + "<== " + methodName + " Unable to convert RequestDetails to json string e=" + e.getMessage());

+            throw e;

+        }

+        return (mso_request);

+    }

 }

diff --git a/vid-app-common/src/main/java/org/openecomp/vid/controller/VidController.java b/vid-app-common/src/main/java/org/openecomp/vid/controller/VidController.java
index 9972ae5d3..838793a76 100755
--- a/vid-app-common/src/main/java/org/openecomp/vid/controller/VidController.java
+++ b/vid-app-common/src/main/java/org/openecomp/vid/controller/VidController.java
@@ -24,18 +24,22 @@ import org.openecomp.portalsdk.core.controller.RestrictedBaseController;
 import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;

 import org.openecomp.sdc.tosca.parser.exceptions.SdcToscaParserException;

 import org.openecomp.vid.asdc.AsdcCatalogException;

+import org.openecomp.vid.asdc.beans.SecureServices;

 import org.openecomp.vid.exceptions.VidServiceUnavailableException;

 import org.openecomp.vid.model.ServiceModel;

+import org.openecomp.vid.roles.Role;

+import org.openecomp.vid.roles.RoleProvider;

+import org.openecomp.vid.roles.RoleValidator;

+import org.openecomp.vid.services.VidService;

 import org.springframework.beans.factory.annotation.Autowired;

 import org.springframework.web.bind.annotation.PathVariable;

 import org.springframework.web.bind.annotation.RequestMapping;

 import org.springframework.web.bind.annotation.RequestMethod;

 import org.springframework.web.bind.annotation.RestController;

 import org.springframework.web.servlet.ModelAndView;

-import org.openecomp.vid.services.*;

 

 import javax.servlet.http.HttpServletRequest;

-import java.util.Collection;

+import java.util.List;

 import java.util.Map;

 

 //import org.openecomp.vid.model.Service;

@@ -61,10 +65,15 @@ public class VidController extends RestrictedBaseController {
 	 * @throws VidServiceUnavailableException the vid service unavailable exception

 	 */

 	@RequestMapping(value={"/rest/models/services"}, method = RequestMethod.GET)

-	public Collection<org.openecomp.vid.asdc.beans.Service> getServices(HttpServletRequest request) throws VidServiceUnavailableException {

+	public SecureServices getServices(HttpServletRequest request) throws VidServiceUnavailableException {

 		try {

+			SecureServices secureServices = new SecureServices();

+			RoleProvider roleProvider = new RoleProvider();

 			Map<String, String[]> requestParams = request.getParameterMap();

-			return service.getServices(requestParams);

+			List<Role> roles = new RoleProvider().getUserRoles(request);

+			secureServices.setServices(service.getServices(requestParams));

+			secureServices.setReadOnly(roleProvider.userPermissionIsReadOnly(roles));

+			return secureServices;

 		} catch (AsdcCatalogException e) {

 			LOG.error("Failed to retrieve service definitions from SDC", e);

 			throw new VidServiceUnavailableException("Failed to retrieve service definitions from SDC", e);

@@ -83,8 +92,9 @@ public class VidController extends RestrictedBaseController {
 	 * @throws VidServiceUnavailableException the vid service unavailable exception

 	 */

 	@RequestMapping(value={"/rest/models/services/{uuid}"}, method = RequestMethod.GET)

-	public ServiceModel getServices(@PathVariable("uuid") String uuid) throws VidServiceUnavailableException {

+	public ServiceModel getServices(@PathVariable("uuid") String uuid, HttpServletRequest request) throws VidServiceUnavailableException {

 		try {

+//			RoleValidator roleValidator = new RoleValidator(new RoleProvider().getUserRoles(request));

 			return service.getService(uuid);

 		} catch (AsdcCatalogException e) {

 			LOG.error("Failed to retrieve service definitions from SDC", e);

diff --git a/vid-app-common/src/main/java/org/openecomp/vid/controller/WebConfig.java b/vid-app-common/src/main/java/org/openecomp/vid/controller/WebConfig.java
index 9a258a109..1e13d0eb6 100644
--- a/vid-app-common/src/main/java/org/openecomp/vid/controller/WebConfig.java
+++ b/vid-app-common/src/main/java/org/openecomp/vid/controller/WebConfig.java
@@ -4,13 +4,17 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.commons.io.IOUtils;
 import org.json.JSONObject;
 import org.json.JSONTokener;
+import org.openecomp.vid.aai.AaiClient;
+import org.openecomp.vid.aai.AaiClientInterface;
 import org.openecomp.vid.asdc.AsdcClient;
 import org.openecomp.vid.asdc.local.LocalAsdcClient;
 import org.openecomp.vid.asdc.memory.InMemoryAsdcClient;
-import org.openecomp.vid.asdc.rest.RestfulAsdcClient;
 import org.openecomp.vid.asdc.parser.ToscaParserImpl2;
+import org.openecomp.vid.asdc.rest.RestfulAsdcClient;
 import org.openecomp.vid.properties.AsdcClientConfiguration;
 import org.openecomp.vid.properties.AsdcClientConfiguration.AsdcClientType;
+import org.openecomp.vid.services.AaiService;
+import org.openecomp.vid.services.AaiServiceImpl;
 import org.openecomp.vid.services.VidService;
 import org.openecomp.vid.services.VidServiceImpl;
 import org.springframework.context.annotation.Bean;
@@ -40,12 +44,24 @@ public class WebConfig {
         return new ObjectMapper();
     }
 
+
+
     @Bean
     public VidService vidService(AsdcClient asdcClient) {
         return new VidServiceImpl(asdcClient);
     }
 
     @Bean
+    public AaiService getAaiService(){
+        return new AaiServiceImpl();
+    }
+
+    @Bean
+    public AaiClientInterface getAaiClientInterface(){
+        return new AaiClient();
+    }
+
+    @Bean
     public AsdcClient asdcClient(AsdcClientConfiguration asdcClientConfig) throws IOException {
         switch (asdcClientConfig.getAsdcClientType()) {
             case IN_MEMORY:
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/model/ModelUtil.java b/vid-app-common/src/main/java/org/openecomp/vid/model/ModelUtil.java
new file mode 100644
index 000000000..f0208185a
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/model/ModelUtil.java
@@ -0,0 +1,45 @@
+/**
+ * 
+ */
+package org.openecomp.vid.model;
+
+/**
+ * The Class ModelUtil.
+ *
+ */
+public class ModelUtil {
+	/**
+	 * Gets the tags for the given element according to the configured namespace
+	 * @param namespaces the namespace list from the configuration
+	 * @param constantValue the constant portion of the tag name, i.e. resource.vf...
+	 * @return the tags
+	 */
+	public static String[] getTags ( String[] namespaces, String constantValue ) {
+		String[] tags;
+		if ( namespaces == null || namespaces.length == 0 ) {
+			return null;
+		}
+		int le = namespaces.length;
+		tags = new String[le];
+		for ( int i = 0; i < le; i++ ) {
+			tags[i] = namespaces[i] + constantValue;
+		}
+		return (tags);
+	}
+	/**
+	 * Determine if a note template type matches a set of configurable tags
+	 * @param type the node template type
+	 * @param tags the model configurable namespaces
+	 * @return true if type starts with a tag in the array, false otherwise
+	 */
+	public static boolean isType ( String type, String[] tags ) {
+		if ( (tags != null) && (tags.length > 0) ) {
+			for ( int i = 0; i < tags.length; i++ ) {
+				if ( type.startsWith (tags[i]) ) {
+					return (true);
+				}
+			}
+		}
+		return (false);
+	}
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/model/ProxyResponse.java b/vid-app-common/src/main/java/org/openecomp/vid/model/ProxyResponse.java
new file mode 100644
index 000000000..132c54ad9
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/model/ProxyResponse.java
@@ -0,0 +1,21 @@
+package org.openecomp.vid.model;
+
+/**
+ * Created by Oren on 7/10/17.
+ */
+public class ProxyResponse {
+
+    protected String errorMessage;
+
+    protected int httpCode;
+
+    public String getErrorMessage() {
+        return errorMessage;
+    }
+
+
+    public int getHttpCode() {
+        return httpCode;
+    }
+
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/model/Service.java b/vid-app-common/src/main/java/org/openecomp/vid/model/Service.java
index f3c6e4da4..c6269b978 100755
--- a/vid-app-common/src/main/java/org/openecomp/vid/model/Service.java
+++ b/vid-app-common/src/main/java/org/openecomp/vid/model/Service.java
@@ -48,6 +48,12 @@ public class Service {
 	

 	/** The category. */

 	private String category;

+

+	/** The Service Type. */

+	private String serviceType;

+

+	/** The Service Role */

+	private String serviceRole;

 	

 	/** The description. */

 	private String description;

@@ -238,6 +244,23 @@ public class Service {
 		

 		return (service.getUuid().equals(getUuid()));

 	}

+

+	public String getServiceType() {

+		return serviceType;

+	}

+

+	public void setServiceType(String serviceType) {

+		this.serviceType = serviceType;

+	}

+

+	public String getServiceRole() {

+		return serviceRole;

+	}

+

+	public void setServiceRole(String serviceRole) {

+		this.serviceRole = serviceRole;

+	}

+

 	/*public static void extractVfModuleCustomizationUUID (Service s, String vnfCustomizationName, VfModule vfMod ) {

 		

 		//Look for vnfCustomizationName..vfModuleCustomizationName

diff --git a/vid-app-common/src/main/java/org/openecomp/vid/model/Subscriber.java b/vid-app-common/src/main/java/org/openecomp/vid/model/Subscriber.java
new file mode 100644
index 000000000..c5db6fdae
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/model/Subscriber.java
@@ -0,0 +1,26 @@
+package org.openecomp.vid.model;
+
+
+import org.codehaus.jackson.annotate.JsonProperty;
+
+/**
+ * Created by Oren on 7/4/17.
+ */
+public class Subscriber {
+
+    @JsonProperty("global-customer-id")
+    public String globalCustomerId;
+
+    @JsonProperty("subscriber-name")
+    public String subscriberName;
+
+    @JsonProperty("subscriber-type")
+    public String subscriberType;
+
+    @JsonProperty("resource-version")
+    public String resourceVersion;
+
+
+
+
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/model/SubscriberList.java b/vid-app-common/src/main/java/org/openecomp/vid/model/SubscriberList.java
new file mode 100644
index 000000000..7f593e4de
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/model/SubscriberList.java
@@ -0,0 +1,15 @@
+package org.openecomp.vid.model;
+
+import org.openecomp.portalsdk.core.web.support.UserUtils;
+
+import java.util.List;
+
+/**
+ * Created by Oren on 7/4/17.
+ */
+public class SubscriberList {
+
+    public List<Subscriber> customer;
+
+
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/roles/EcompRole.java b/vid-app-common/src/main/java/org/openecomp/vid/roles/EcompRole.java
new file mode 100644
index 000000000..5242f5aaa
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/roles/EcompRole.java
@@ -0,0 +1,5 @@
+package org.openecomp.vid.roles;
+
+public enum EcompRole {
+	READ;
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/roles/Role.java b/vid-app-common/src/main/java/org/openecomp/vid/roles/Role.java
new file mode 100644
index 000000000..d4ded5303
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/roles/Role.java
@@ -0,0 +1,48 @@
+package org.openecomp.vid.roles;
+
+
+/**
+ * Created by Oren on 7/1/17.
+ */
+public class Role {
+
+    private EcompRole ecompRole;
+
+    private String subscribeName;
+
+    private String serviceType;
+
+    private String tenant;
+
+    public Role(EcompRole ecompRole, String serviceName, String serviceType, String tenant) {
+        this.ecompRole = ecompRole;
+        this.subscribeName = serviceName;
+        this.serviceType = serviceType;
+        this.tenant = tenant;
+    }
+
+    public EcompRole getEcompRole() {
+        return ecompRole;
+    }
+
+
+    public String getSubscribeName() {
+        return subscribeName;
+    }
+
+    public void setSubscribeName(String subscribeName) {
+        this.subscribeName = subscribeName;
+    }
+
+    public String getServiceType() {
+        return serviceType;
+    }
+
+
+    public String getTenant() {
+        return tenant;
+    }
+
+
+
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/roles/RoleProvider.java b/vid-app-common/src/main/java/org/openecomp/vid/roles/RoleProvider.java
new file mode 100644
index 000000000..99645a105
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/roles/RoleProvider.java
@@ -0,0 +1,62 @@
+package org.openecomp.vid.roles;
+
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.openecomp.portalsdk.core.web.support.UserUtils;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * Created by Oren on 7/1/17.
+ */
+public class RoleProvider {
+
+    private static final EELFLoggerDelegate LOG = EELFLoggerDelegate.getLogger(RoleProvider.class);
+    final String readPermissionString = "read";
+
+    public static List<String> extractRoleFromSession(HttpServletRequest request) {
+
+        return new ArrayList<String>();
+
+    }
+
+    public List<Role> getUserRoles(HttpServletRequest request) {
+        List<Role> roleList = new ArrayList<>();
+        HashMap roles = UserUtils.getRoles(request);
+        for (Object role : roles.keySet()) {
+            org.openecomp.portalsdk.core.domain.Role sdkRol = (org.openecomp.portalsdk.core.domain.Role) roles.get(role);
+            try {
+                if (sdkRol.getName().contains(readPermissionString))
+                    continue;
+                String[] roleParts = splitRole((sdkRol.getName()));
+                roleList.add(createRoleFromStringArr(roleParts));
+            } catch (Exception e) {
+                LOG.error("Failed to parse permission", e);
+
+            }
+        }
+
+        return roleList;
+    }
+
+    public String[] splitRole(String roleAsString) {
+        return roleAsString.split("_");
+    }
+
+    public boolean userPermissionIsReadOnly(List<Role> roles) {
+
+        return (!(roles.size() > 0));
+    }
+
+    public Role createRoleFromStringArr(String[] roleParts) {
+        if (roleParts.length > 2) {
+            return new Role(EcompRole.READ, roleParts[0], roleParts[1], roleParts[2]);
+        } else {
+            return new Role(EcompRole.READ, roleParts[0], roleParts[1], null);
+        }
+    }
+
+}
+
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/roles/RoleValidator.java b/vid-app-common/src/main/java/org/openecomp/vid/roles/RoleValidator.java
new file mode 100644
index 000000000..e26c52315
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/roles/RoleValidator.java
@@ -0,0 +1,57 @@
+package org.openecomp.vid.roles;
+
+import org.openecomp.vid.mso.rest.RequestDetails;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by Oren on 7/12/17.
+ */
+public class RoleValidator {
+
+    private List<Role> userRoles;
+
+    public RoleValidator(List<Role> roles) {
+        this.userRoles = roles;
+    }
+
+    public boolean isSubscriberPermitted(String subscriberName) {
+        for (Role role : userRoles) {
+            if (role.getSubscribeName().equals(subscriberName))
+                return true;
+        }
+        return false;
+    }
+
+    public boolean isServicePermitted(String subscriberName, String serviceType) {
+        for (Role role : userRoles) {
+            if (role.getSubscribeName().equals(subscriberName) && role.getServiceType().equals(serviceType))
+                return true;
+        }
+        return false;
+    }
+
+    public boolean isMsoRequestValid(RequestDetails mso_request) {
+        try {
+            String globalSubscriberIdRequested = (String) ((Map) ((Map) mso_request.getAdditionalProperties().get("requestDetails")).get("subscriberInfo")).get("globalSubscriberId");
+            String serviceType = (String) ((Map) ((Map) mso_request.getAdditionalProperties().get("requestDetails")).get("requestParameters")).get("subscriptionServiceType");
+            return isServicePermitted(globalSubscriberIdRequested, serviceType);
+        } catch (Exception e) {
+            //Until we'll get the exact information regarding the tenants and the global customer id, we'll return true on unknown requests to mso
+            return true;
+        }
+//        return false;
+    }
+
+    public boolean isTenantPermitted(String globalCustomerId, String serviceType, String tenant) {
+        for (Role role : userRoles) {
+            if (role.getSubscribeName().equals(globalCustomerId)
+                    && role.getServiceType().equals(serviceType)
+                    && (role.getTenant() == null || role.getTenant().equals(tenant))) {
+                return true;
+            }
+        }
+        return false;
+    }
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/services/AaiService.java b/vid-app-common/src/main/java/org/openecomp/vid/services/AaiService.java
new file mode 100644
index 000000000..274419fb8
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/services/AaiService.java
@@ -0,0 +1,25 @@
+package org.openecomp.vid.services;
+
+import org.openecomp.vid.aai.AaiResponse;
+import org.openecomp.vid.aai.SubscriberFilteredResults;
+import org.openecomp.vid.aai.model.AaiGetTenatns.GetTenantsResponse;
+import org.openecomp.vid.roles.RoleValidator;
+
+import java.util.List;
+
+/**
+ * Created by Oren on 7/4/17.
+ */
+public interface AaiService {
+
+
+    SubscriberFilteredResults getFullSubscriberList(RoleValidator roleValidator);
+
+    AaiResponse getSubscriberData(String subscriberId, RoleValidator roleValidator);
+
+    AaiResponse getServices(RoleValidator roleValidator);
+    
+    AaiResponse getAaiZones();
+
+    AaiResponse<GetTenantsResponse[]> getTenants(String globalCustomerId, String serviceType, RoleValidator roleValidator);
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/services/AaiServiceImpl.java b/vid-app-common/src/main/java/org/openecomp/vid/services/AaiServiceImpl.java
new file mode 100644
index 000000000..38b670fe5
--- /dev/null
+++ b/vid-app-common/src/main/java/org/openecomp/vid/services/AaiServiceImpl.java
@@ -0,0 +1,70 @@
+package org.openecomp.vid.services;
+
+import org.ecomp.aai.model.AaiAICZones.AicZones;
+import org.openecomp.vid.aai.*;
+import org.openecomp.vid.aai.model.AaiGetServicesRequestModel.*;
+import org.openecomp.vid.aai.model.AaiGetTenatns.GetTenantsResponse;
+import org.openecomp.vid.model.*;
+import org.openecomp.vid.roles.RoleValidator;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
+
+/**
+ * Created by Oren on 7/4/17.
+ */
+public class AaiServiceImpl implements AaiService {
+
+
+    @Autowired
+    private AaiClientInterface aaiClient;
+
+
+    @Override
+    public SubscriberFilteredResults getFullSubscriberList(RoleValidator roleValidator) {
+        AaiResponse<SubscriberList> subscriberResponse = aaiClient.getAllSubscribers();
+        SubscriberFilteredResults subscriberFilteredResults =
+                new SubscriberFilteredResults(roleValidator,subscriberResponse.getT(),
+                        subscriberResponse.getErrorMessage(),
+                        subscriberResponse.getHttpCode());
+
+        return subscriberFilteredResults;
+    }
+
+    @Override
+    public AaiResponse getSubscriberData(String subscriberId, RoleValidator roleProvider) {
+        AaiResponse<Services> subscriberResponse = aaiClient.getSubscriberData(subscriberId);
+        String subscriberGlobalId = subscriberResponse.getT().globalCustomerId;
+        for (ServiceSubscription serviceSubscription : subscriberResponse.getT().serviceSubscriptions.serviceSubscription) {
+            String serviceType = serviceSubscription.serviceType;
+            serviceSubscription.isPermitted = roleProvider.isServicePermitted(subscriberGlobalId,serviceType);;
+        }
+        return subscriberResponse;
+
+    }
+
+    @Override
+    public AaiResponse getServices(RoleValidator roleValidator) {
+        AaiResponse<GetServicesAAIRespone> subscriberResponse = aaiClient.getServices();
+        for (org.openecomp.vid.aai.model.AaiGetServicesRequestModel.Service service :subscriberResponse.getT().service){
+            service.isPermitted = true;
+        }
+        return subscriberResponse;
+    }
+
+    @Override
+    public AaiResponse<GetTenantsResponse[]> getTenants(String globalCustomerId, String serviceType, RoleValidator roleValidator) {
+        AaiResponse<GetTenantsResponse[]> aaiGetTenantsResponse = aaiClient.getTenants(globalCustomerId,serviceType);
+        GetTenantsResponse[] tenants = aaiGetTenantsResponse.getT();
+        for (int i=0;i<tenants.length;i++){
+            tenants[i].isPermitted = roleValidator.isTenantPermitted(globalCustomerId,serviceType, tenants[i].tenantID);
+        }
+        return aaiGetTenantsResponse;
+    }
+
+	@Override
+	public AaiResponse getAaiZones() {
+		AaiResponse<AicZones> response = aaiClient.getAllAicZones();
+		return response;
+	}
+}
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/services/VidServiceImpl.java b/vid-app-common/src/main/java/org/openecomp/vid/services/VidServiceImpl.java
index 9844842f8..f647af456 100644
--- a/vid-app-common/src/main/java/org/openecomp/vid/services/VidServiceImpl.java
+++ b/vid-app-common/src/main/java/org/openecomp/vid/services/VidServiceImpl.java
@@ -14,9 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import java.nio.file.Path;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
-import java.util.Collection;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
 
 /**
  * The Class VidController.