Merging in bug fixes

Change-Id: I85da90b9ba0d03149f42035a820c76ef0285e413
Signed-off-by: Patrick Brady <pb071s@att.com>
Issue: APPC-100

4 files changed, 327 insertions, 3 deletions

diff --git a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/src/main/java/org/openecomp/appc/mdsal/impl/Constants.java b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/src/main/java/org/openecomp/appc/mdsal/impl/Constants.java
index a367bdc89..711ec1d4e 100644
--- a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/src/main/java/org/openecomp/appc/mdsal/impl/Constants.java
+++ b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/src/main/java/org/openecomp/appc/mdsal/impl/Constants.java
@@ -80,6 +80,21 @@ public class Constants {
      */
 
     public static final String CONFIG_URL = "https://localhost:8443/restconf/config";
+    public static final String CONFIG_URL_DEFAULT = "https://localhost:8443/restconf/config";
+
+    public static final String CONFIG_URL_PROPERTY = "appc.LCM.provider.url";
+
+    public static final String CONFIG_PATH = "/restconf/config";
+
+    /**
+     * Restconf authentication user property name
+     */
+    public static final String CONFIG_USER_PROPERTY = "appc.LCM.provider.user";
+
+    /**
+     * Restconf authentication password property name
+     */
+    public static final String CONFIG_PASS_PROPERTY = "appc.LCM.provider.pass";
 
     /**
      * Content for blueprint.xml used while creation of OSGI bundle.
diff --git a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/src/main/java/org/openecomp/appc/mdsal/impl/MDSALStoreImpl.java b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/src/main/java/org/openecomp/appc/mdsal/impl/MDSALStoreImpl.java
index 091c770fd..b90d9c0e5 100644
--- a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/src/main/java/org/openecomp/appc/mdsal/impl/MDSALStoreImpl.java
+++ b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/src/main/java/org/openecomp/appc/mdsal/impl/MDSALStoreImpl.java
@@ -24,6 +24,8 @@
 
 package org.openecomp.appc.mdsal.impl;
 
+import org.openecomp.appc.configuration.Configuration;
+import org.openecomp.appc.configuration.ConfigurationFactory;
 import org.openecomp.appc.exceptions.APPCException;
 import org.openecomp.appc.mdsal.MDSALStore;
 import org.openecomp.appc.mdsal.exception.MDSALStoreException;
@@ -38,6 +40,7 @@ import org.osgi.framework.FrameworkUtil;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.util.Date;
+import java.util.Properties;
 import java.util.jar.Attributes;
 import java.util.jar.JarEntry;
 import java.util.jar.JarOutputStream;
@@ -50,9 +53,20 @@ public class MDSALStoreImpl implements MDSALStore{
 
     private static final EELFLogger logger = EELFManager.getInstance().getLogger(MDSALStoreImpl.class);
 
+    private static final Configuration configuration = ConfigurationFactory.getConfiguration();
+
     MDSALStoreImpl(){
-        ConfigOperation.setUrl(Constants.CONFIG_URL);
-        ConfigOperation.setAuthentication(null,null);
+        String configUrl = null;
+        String user =null;
+        String password = null;
+        Properties properties = configuration.getProperties();
+        if (properties != null) {
+            configUrl= properties.getProperty(  Constants.CONFIG_URL_PROPERTY , Constants.CONFIG_URL_DEFAULT);
+            user  = properties.getProperty(Constants.CONFIG_USER_PROPERTY);
+            password = properties.getProperty(Constants.CONFIG_PASS_PROPERTY);
+        }
+        ConfigOperation.setUrl(configUrl);
+        ConfigOperation.setAuthentication(user,password);
     }
 
 
diff --git a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/src/main/java/org/openecomp/appc/mdsal/operation/ConfigOperation.java~ccmerge b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/src/main/java/org/openecomp/appc/mdsal/operation/ConfigOperation.java~ccmerge
new file mode 100644
index 000000000..c1695d467
--- /dev/null
+++ b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/src/main/java/org/openecomp/appc/mdsal/operation/ConfigOperation.java~ccmerge
@@ -0,0 +1,295 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : APPC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
+ * 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.
+ * 
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.appc.mdsal.operation;
+
+import org.openecomp.appc.exceptions.APPCException;
+import org.openecomp.appc.mdsal.impl.Constants;
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.commons.codec.binary.Base64;
+import org.apache.http.HttpHeaders;
+import org.apache.http.HttpResponse;
+import org.apache.http.HttpVersion;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpPut;
+import org.apache.http.conn.ClientConnectionManager;
+import org.apache.http.conn.scheme.PlainSocketFactory;
+import org.apache.http.conn.scheme.Scheme;
+import org.apache.http.conn.scheme.SchemeRegistry;
+import org.apache.http.conn.ssl.SSLSocketFactory;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager;
+import org.apache.http.params.BasicHttpParams;
+import org.apache.http.params.HttpParams;
+import org.apache.http.params.HttpProtocolParams;
+import org.apache.http.protocol.HTTP;
+
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.MalformedURLException;
+import java.net.Socket;
+import java.net.URL;
+import java.security.*;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+import java.util.ArrayList;
+import java.util.Iterator;
+
+import org.apache.commons.io.IOUtils;
+
+/**
+ * Provides method to store configuration to MD-SAL store. It also exposes doPut operation which can be used to invoke REST Put operation.
+*/
+public class ConfigOperation {
+    private static final EELFLogger LOG = EELFManager.getInstance().getLogger(ConfigOperation.class);
+
+    private static URL url;
+    private static String basicAuth;
+
+    ConfigOperation(){}
+
+    private static ConfigOperationRequestFormatter requestFormatter = new ConfigOperationRequestFormatter();
+
+    private static ObjectMapper mapper = new ObjectMapper();
+
+    /**
+     * This method stores configuration JSON to MD-SAL store. Following input parameters are expected as input
+     * @param configJson - configuration JSON as String. This value will be stored in  MD-SAL store
+     * @param module - Module name that contains yang Schema
+     * @param containerName - yang container name which will be used as base container.
+     * @param subModules - Sub modules list if any. Order of sub module is top to bottom.
+     * @throws APPCException
+     */
+    public static void storeConfig(String configJson , String module, String containerName, String... subModules ) throws APPCException {
+        if (configJson == null) {
+            throw new APPCException("Provided message was null");
+        }
+        LOG.debug("Config JSON: " + configJson +"\n"
+                +"module" + module +"\n"
+                +"containerName" + containerName +"\n"
+                +"subModules length : " + subModules.length );
+
+        int httpCode;
+        String respBody ;
+        try {
+            String path = requestFormatter.buildPath(url, module, containerName, subModules);
+            LOG.debug("Configuration Path : " + path);
+            URL serviceUrl = new URL(url.getProtocol(), url.getHost(), url.getPort(), path);
+            HttpResponse response = doPut(serviceUrl , configJson);
+            httpCode = response.getStatusLine().getStatusCode();
+            respBody = IOUtils.toString(response.getEntity().getContent());
+        } catch (IOException e) {
+            LOG.error("Error while storing configuration json "+e.getMessage(), e);
+            throw new APPCException(e);
+        }
+
+        if (httpCode < 200 || httpCode >= 300 ) {
+            try {
+                LOG.debug("Config operation Error response code: " + httpCode);
+                ArrayList<String> errorMessage = new ArrayList<>();
+                JsonNode responseJson = toJsonNodeFromJsonString(respBody);
+                if(responseJson!=null && responseJson.get("errors")!=null) {
+                    JsonNode errors = responseJson.get("errors").get("error");
+                for (Iterator<JsonNode> i = errors.elements();i.hasNext();){
+                    JsonNode error = i.next();
+                    errorMessage.add(error.get("error-message").textValue());
+                }
+                }
+                throw new APPCException("Failed to load config JSON to MD SAL store. Error code:" + httpCode +" Error Message:" + errorMessage.toString());
+            } catch (Exception e) {
+                LOG.error("Error while loading config JSON to MD SAL store. Error code:" + httpCode +" Error Message:" + e.getMessage(), e);
+                throw new APPCException("Error while loading config JSON to MD SAL store. Error code:" + httpCode +" Error Message:" + e.getMessage(),e);
+            }
+        }else{
+            LOG.debug("Config operation successful. Response code: " + httpCode);
+        }
+    }
+
+    /**
+     * This is Generic method that can be used to perform REST Put operation
+     * @param url - Destination URL for put
+     * @param body - payload for put action which will be sent as request body.
+     * @return - HttpResponse object which is returned from put REST call.
+     * @throws APPCException
+     */
+    public static HttpResponse doPut (URL url, String body) throws APPCException {
+        HttpPut put;
+        try {
+            put = new HttpPut(url.toExternalForm());
+            put.setHeader(HttpHeaders.CONTENT_TYPE, Constants.OPERATION_APPLICATION_JSON);
+            put.setHeader(HttpHeaders.ACCEPT, Constants.OPERATION_APPLICATION_JSON);
+
+            if (basicAuth != null) {
+                put.setHeader(HttpHeaders.AUTHORIZATION, "Basic " + basicAuth);
+            }
+
+            StringEntity entity = new StringEntity(body);
+            entity.setContentType(Constants.OPERATION_APPLICATION_JSON);
+            put.setEntity(new StringEntity(body));
+        } catch (UnsupportedEncodingException e) {
+            throw new APPCException(e);
+        }
+
+        HttpClient client = getHttpClient();
+
+        try {
+            return client.execute(put);
+        } catch (IOException e) {
+            throw new APPCException(e);
+        }
+
+    }
+
+    /**
+     * Updates the static var URL and returns the value;
+     *
+     * @return The new value of URL
+     */
+    public static String getUrl() {
+        return url.toExternalForm();
+    }
+
+    public static void setUrl(String newUrl) {
+        try {
+            url = new URL(newUrl);
+        } catch (MalformedURLException e) {
+            LOG.error("Malformed URL " +newUrl + e.getMessage(), e);
+        }
+    }
+
+    /**
+     * Sets the basic authentication header for the given user and password. If either entry is null then set basic auth
+     * to null
+     *
+     * @param user     The user with optional domain name (for AAF)
+     * @param password The password for the user
+     * @return The new value of the basic auth string that will be used in the request headers
+     */
+    public static String setAuthentication(String user, String password) {
+        if (user != null && password != null) {
+            String authStr = user + ":" + password;
+            basicAuth = new String(Base64.encodeBase64(authStr.getBytes()));
+        } else {
+            basicAuth = null;
+        }
+        return basicAuth;
+    }
+
+    @SuppressWarnings("deprecation")
+    private static HttpClient getHttpClient() throws APPCException {
+        HttpClient client;
+        if (url.getProtocol().equals(Constants.OPERATION_HTTPS)) {
+            try {
+                KeyStore trustStore = KeyStore.getInstance(KeyStore.getDefaultType());
+                trustStore.load(null, null);
+                MySSLSocketFactory sf = new MySSLSocketFactory(trustStore);
+                sf.setHostnameVerifier(MySSLSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER);
+
+                HttpParams params = new BasicHttpParams();
+                HttpProtocolParams.setVersion(params, HttpVersion.HTTP_1_1);
+                HttpProtocolParams.setContentCharset(params, HTTP.UTF_8);
+
+                SchemeRegistry registry = new SchemeRegistry();
+                registry.register(new Scheme("http", PlainSocketFactory.getSocketFactory(), 80));
+                registry.register(new Scheme(Constants.OPERATION_HTTPS, sf, 443));
+                registry.register(new Scheme(Constants.OPERATION_HTTPS, sf, 8443));
+                registry.register(new Scheme("http", sf, 8181));
+
+                ClientConnectionManager ccm = new ThreadSafeClientConnManager(params, registry);
+                client = new DefaultHttpClient(ccm, params);
+            } catch (Exception e) {
+                LOG.error("Error creating HTTP Client. Creating default client." ,  e);
+                client = new DefaultHttpClient();
+            }
+        } else if ("http".equals(url.getProtocol())) {
+            client = new DefaultHttpClient();
+        } else {
+            throw new APPCException(
+                    "The provider.topology.url property is invalid. The url did not start with http[s]");
+        }
+        return client;
+    }
+
+    @SuppressWarnings("deprecation")
+    private static class MySSLSocketFactory extends SSLSocketFactory {
+        private SSLContext sslContext = SSLContext.getInstance("TLS");
+
+        private MySSLSocketFactory(KeyStore truststore) throws NoSuchAlgorithmException, KeyManagementException,
+                KeyStoreException, UnrecoverableKeyException {
+            super(truststore);
+
+            TrustManager tm = new X509TrustManager() {
+                @Override
+                public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException {
+                    LOG.debug("Inside checkClientTrusted");
+                }
+
+                @Override
+                public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException {
+                    LOG.debug("Inside checkServerTrusted");
+                }
+
+                @Override
+                public X509Certificate[] getAcceptedIssuers() {
+                    return new X509Certificate[1];
+                }
+            };
+
+            sslContext.init(null, new TrustManager[]{
+                    tm
+            }, null);
+        }
+
+        @Override
+        public Socket createSocket(Socket socket, String host, int port, boolean autoClose)
+                throws IOException  {
+            return sslContext.getSocketFactory().createSocket(socket, host, port, autoClose);
+        }
+
+        @Override
+        public Socket createSocket() throws IOException {
+            return sslContext.getSocketFactory().createSocket();
+        }
+    }
+
+    private static JsonNode toJsonNodeFromJsonString(String jsonStr) {
+        JsonNode jsonNode = null;
+        if(jsonStr != null) {
+            try {
+                jsonNode = mapper.readTree(jsonStr);
+            } catch (IOException e) {
+                LOG.warn(String.format("Could not map %s to jsonNode.", jsonStr), e);
+            }
+        }
+        return jsonNode;
+    }
+
+}
diff --git a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/src/main/java/org/openecomp/appc/mdsal/operation/ConfigOperationRequestFormatter.java b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/src/main/java/org/openecomp/appc/mdsal/operation/ConfigOperationRequestFormatter.java
index d5d6a0cb5..94e120faf 100644
--- a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/src/main/java/org/openecomp/appc/mdsal/operation/ConfigOperationRequestFormatter.java
+++ b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/src/main/java/org/openecomp/appc/mdsal/operation/ConfigOperationRequestFormatter.java
@@ -42,7 +42,7 @@ public class ConfigOperationRequestFormatter {
      */
     public String buildPath(URL url,String module, String containerName , String... subModules ) {
 
-        StringBuilder path = new StringBuilder( url.getPath()+ Constants.URL_BACKSLASH + module + ":"+containerName + Constants.URL_BACKSLASH);
+        StringBuilder path = new StringBuilder( Constants.CONFIG_PATH + Constants.URL_BACKSLASH + module + ":"+containerName + Constants.URL_BACKSLASH);
         if(subModules.length >0){
             for(String subModule : subModules){
                 path.append(subModule);