AT&T 1712 and 1802 release code

This is code from AT&T's 1712 and 1802 releases.

Change-Id: Ie1e85851e94bc66c4d9514a0226c221939531a04
Issue-ID: SO-425
Signed-off-by: Rob Daugherty <rd472p@att.com>

5 files changed, 328 insertions, 0 deletions

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/adapter/vnf/AdapterRestClient.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/adapter/vnf/AdapterRestClient.java
new file mode 100644
index 0000000000..3e315a5f04
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/adapter/vnf/AdapterRestClient.java
@@ -0,0 +1,89 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.mso.client.adapter.vnf;
+
+import java.net.URI;
+import java.security.GeneralSecurityException;
+import java.util.Map;
+import java.util.Optional;
+import java.util.UUID;
+
+import javax.ws.rs.client.ClientResponseFilter;
+import javax.ws.rs.ext.ContextResolver;
+
+import org.apache.commons.codec.binary.Base64;
+import org.openecomp.mso.bpmn.common.util.CryptoUtils;
+import org.openecomp.mso.client.ResponseExceptionMapperImpl;
+import org.openecomp.mso.client.policy.JettisonStyleMapperProvider;
+import org.openecomp.mso.client.policy.RestClient;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+public class AdapterRestClient extends RestClient {
+
+	private final AdapterRestProperties props;
+	public AdapterRestClient(AdapterRestProperties props, URI uri) {
+		super(props, UUID.randomUUID(), Optional.of(uri));
+		this.props = props;
+	}
+
+	public AdapterRestClient(AdapterRestProperties props, URI uri, String accept, String contentType) {
+		super(props, UUID.randomUUID(), Optional.of(uri), accept, contentType);
+		this.props = props;
+	}
+
+	@Override
+	protected void initializeHeaderMap(Map<String, String> headerMap) {
+		headerMap.put("Authorization",
+				this.getBasicAuth(props.getAuth(), props.getKey()));
+	}
+
+	@Override
+	protected Optional<ClientResponseFilter> addResponseFilter() {
+		return Optional.of(new ResponseExceptionMapperImpl());
+	}
+
+	@Override
+	public RestClient addRequestId(UUID requestId) {
+		return null;
+	}
+
+	@Override
+	protected ContextResolver<ObjectMapper> getMapper() {
+		return new JettisonStyleMapperProvider();
+	}
+	
+	private String getBasicAuth(String encryptedAuth, String msoKey) {
+		if ((encryptedAuth == null || encryptedAuth.isEmpty()) || (msoKey == null || msoKey.isEmpty())) {
+			return null;
+		}
+		try {
+			String auth = CryptoUtils.decrypt(encryptedAuth, msoKey);
+			byte[] encoded = Base64.encodeBase64(auth.getBytes());
+			String encodedString = new String(encoded);
+			encodedString = "Basic " + encodedString;
+			return encodedString;
+		} catch (GeneralSecurityException e) {
+			this.logger.warn(e.getMessage(), e);
+			return null;
+		}
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/adapter/vnf/AdapterRestProperties.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/adapter/vnf/AdapterRestProperties.java
new file mode 100644
index 0000000000..af429db1f2
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/adapter/vnf/AdapterRestProperties.java
@@ -0,0 +1,29 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.mso.client.adapter.vnf;
+
+import org.openecomp.mso.client.RestProperties;
+
+public interface AdapterRestProperties extends RestProperties {
+
+	public String getAuth();
+	public String getKey();
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/adapter/vnf/VnfAdapterClient.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/adapter/vnf/VnfAdapterClient.java
new file mode 100644
index 0000000000..5ee38fe0fb
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/adapter/vnf/VnfAdapterClient.java
@@ -0,0 +1,48 @@
+/*-

+ * ============LICENSE_START=======================================================

+ * ONAP - SO

+ * ================================================================================

+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.

+ * ================================================================================

+ * Licensed under the Apache License, Version 2.0 (the "License");

+ * you may not use this file except in compliance with the License.

+ * You may obtain a copy of the License at

+ *

+ *      http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing, software

+ * distributed under the License is distributed on an "AS IS" BASIS,

+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+ * See the License for the specific language governing permissions and

+ * limitations under the License.

+ * ============LICENSE_END=========================================================

+ */

+

+package org.openecomp.mso.client.adapter.vnf;

+

+import org.openecomp.mso.adapters.vnfrest.CreateVfModuleRequest;

+import org.openecomp.mso.adapters.vnfrest.CreateVfModuleResponse;

+import org.openecomp.mso.adapters.vnfrest.DeleteVfModuleRequest;

+import org.openecomp.mso.adapters.vnfrest.DeleteVfModuleResponse;

+import org.openecomp.mso.adapters.vnfrest.QueryVfModuleResponse;

+import org.openecomp.mso.adapters.vnfrest.RollbackVfModuleRequest;

+import org.openecomp.mso.adapters.vnfrest.RollbackVfModuleResponse;

+import org.openecomp.mso.adapters.vnfrest.UpdateVfModuleRequest;

+import org.openecomp.mso.adapters.vnfrest.UpdateVfModuleResponse;

+

+public interface VnfAdapterClient {

+

+	CreateVfModuleResponse createVfModule(String aaiVnfId, CreateVfModuleRequest req);

+

+	RollbackVfModuleResponse rollbackVfModule(String aaiVnfId, String aaiVfModuleId, RollbackVfModuleRequest req);

+

+	DeleteVfModuleResponse deleteVfModule(String aaiVnfId, String aaiVfModuleId, DeleteVfModuleRequest req);

+

+	UpdateVfModuleResponse updateVfModule(String aaiVnfId, String aaiVfModuleId, UpdateVfModuleRequest req);

+

+	QueryVfModuleResponse queryVfModule(String aaiVnfId, String aaiVfModuleId, String cloudSiteId, String tenantId,

+			String vfModuleName, boolean skipAAI, String requestId, String serviceInstanceId);

+

+	String healthCheck();

+

+}

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/adapter/vnf/VnfAdapterClientImpl.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/adapter/vnf/VnfAdapterClientImpl.java
new file mode 100644
index 0000000000..2b391d302d
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/adapter/vnf/VnfAdapterClientImpl.java
@@ -0,0 +1,106 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.mso.client.adapter.vnf;
+
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.UriBuilder;
+
+import org.openecomp.mso.adapters.vnfrest.CreateVfModuleRequest;
+import org.openecomp.mso.adapters.vnfrest.CreateVfModuleResponse;
+import org.openecomp.mso.adapters.vnfrest.DeleteVfModuleRequest;
+import org.openecomp.mso.adapters.vnfrest.DeleteVfModuleResponse;
+import org.openecomp.mso.adapters.vnfrest.QueryVfModuleResponse;
+import org.openecomp.mso.adapters.vnfrest.RollbackVfModuleRequest;
+import org.openecomp.mso.adapters.vnfrest.RollbackVfModuleResponse;
+import org.openecomp.mso.adapters.vnfrest.UpdateVfModuleRequest;
+import org.openecomp.mso.adapters.vnfrest.UpdateVfModuleResponse;
+
+public class VnfAdapterClientImpl implements VnfAdapterClient {
+
+	private static final String VF_MODULES = "/vf-modules/";
+
+	private final VnfAdapterRestProperties props;
+	public VnfAdapterClientImpl() {
+		this.props = new VnfAdapterRestProperties();
+	}
+	
+	@Override
+	public CreateVfModuleResponse createVfModule(String aaiVnfId, CreateVfModuleRequest req) {
+		return new AdapterRestClient(this.props, this.getUri("/" + aaiVnfId + "/vf-modules").build()).post(req,
+				CreateVfModuleResponse.class);
+	}
+
+	@Override
+	public RollbackVfModuleResponse rollbackVfModule(String aaiVnfId, String aaiVfModuleId,
+			RollbackVfModuleRequest req) {
+		return new AdapterRestClient(this.props,
+				this.getUri("/" + aaiVnfId + VF_MODULES + aaiVfModuleId + "/rollback").build()).delete(req,
+						RollbackVfModuleResponse.class);
+	}
+
+	@Override
+	public DeleteVfModuleResponse deleteVfModule(String aaiVnfId, String aaiVfModuleId, DeleteVfModuleRequest req) {
+		return new AdapterRestClient(this.props, this.getUri("/" + aaiVnfId + VF_MODULES + aaiVfModuleId).build())
+				.delete(req, DeleteVfModuleResponse.class);
+	}
+
+	@Override
+	public UpdateVfModuleResponse updateVfModule(String aaiVnfId, String aaiVfModuleId, UpdateVfModuleRequest req) {
+		return new AdapterRestClient(this.props, this.getUri("/" + aaiVnfId + VF_MODULES + aaiVfModuleId).build())
+				.put(req, UpdateVfModuleResponse.class);
+	}
+
+	@Override
+	public QueryVfModuleResponse queryVfModule(String aaiVnfId, String aaiVfModuleId, String cloudSiteId,
+			String tenantId, String vfModuleName, boolean skipAAI, String requestId, String serviceInstanceId) {
+		UriBuilder builder = this.getUri("/" + aaiVnfId + VF_MODULES + aaiVfModuleId);
+		if (cloudSiteId != null) {
+			builder.queryParam("cloudSiteId", cloudSiteId);
+		}
+		if (tenantId != null) {
+			builder.queryParam("tenantId", tenantId);
+		}
+		if (vfModuleName != null) {
+			builder.queryParam("vfModuleName", vfModuleName);
+		}
+
+		builder.queryParam("skipAAI", skipAAI);
+
+		if (requestId != null) {
+			builder.queryParam("msoRequest.requestId", requestId);
+		}
+		if (serviceInstanceId != null) {
+			builder.queryParam("msoRequest.serviceInstanceId", serviceInstanceId);
+		}
+		return new AdapterRestClient(this.props, builder.build(), MediaType.APPLICATION_JSON, MediaType.APPLICATION_JSON)
+				.get(QueryVfModuleResponse.class);
+	}
+
+	@Override
+	public String healthCheck() {
+		return new AdapterRestClient(this.props, this.getUri("/healthcheck").build()).get(String.class);
+	}
+
+	public UriBuilder getUri(String path) {
+		return UriBuilder.fromPath(path);
+	}
+
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/adapter/vnf/VnfAdapterRestProperties.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/adapter/vnf/VnfAdapterRestProperties.java
new file mode 100644
index 0000000000..e342aeedac
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/adapter/vnf/VnfAdapterRestProperties.java
@@ -0,0 +1,56 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.mso.client.adapter.vnf;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Map;
+
+import org.openecomp.mso.bpmn.core.PropertyConfiguration;
+import org.openecomp.mso.client.adapter.vnf.AdapterRestProperties;
+
+public class VnfAdapterRestProperties implements AdapterRestProperties {
+
+	private final Map<String, String> props;
+	
+	public VnfAdapterRestProperties() {
+		this.props = PropertyConfiguration.getInstance().getProperties("mso.bpmn.urn.properties");
+	}
+	
+	@Override
+	public String getAuth() {
+		return props.get("mso.adapters.po.auth");
+	}
+	@Override
+	public String getKey() {
+		return props.get("mso.msoKey");
+	}
+	@Override
+	public URL getEndpoint() throws MalformedURLException {
+		return new URL(props.get("mso.adapters.vnf.rest.endpoint"));
+	}
+
+	@Override
+	public String getSystemName() {
+		return "MSO";
+	}
+
+}