Platform hardening for appc-dg-md-sal-store

Changes made to synch up code in ONAP
for bundle appc-dg-md-sal-store

Issue-ID: APPC-377
Change-Id: I603918a3d6b250e5edea59818549868d4a6964fd
Signed-off-by: Ramya Balaji <rb111y@att.com>

13 files changed, 1272 insertions, 0 deletions

diff --git a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/src/main/java/org/onap/appc/mdsal/MDSALStore.java b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/src/main/java/org/onap/appc/mdsal/MDSALStore.java
new file mode 100644
index 000000000..19fff2b5c
--- /dev/null
+++ b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/src/main/java/org/onap/appc/mdsal/MDSALStore.java
@@ -0,0 +1,73 @@
+/*-
+ * ============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.onap.appc.mdsal;
+
+import org.onap.appc.mdsal.exception.MDSALStoreException;
+import org.onap.appc.mdsal.objects.BundleInfo;
+
+import java.util.Date;
+
+/**
+ * Provides APIs for interacting with MD-SAL store
+ */
+public interface MDSALStore {
+
+    /**
+     * Checks the presence of any yang module in the MD-SAL store,
+     * <i>Due to limitation of SchemaContext interface of ODL that it does not
+     * contain the information about dynamically loaded yang modules, it
+     * checks the presence of OSGI bundle</i>
+     * @param moduleName Name of the Module
+     * @param revision revision of the Module
+     * @return returns true- module is present, false - module is absent
+     */
+    boolean isModulePresent(String moduleName, Date revision);
+
+    /**
+     * This method will be used to store yang module to MD-SAL store
+     * @param yang - yang module that need to be stored. In String format
+     * @param bundleInfo - Bundle Information that contains name , description,  version , location. These parameters used to create bundle which will push yang to MD-SAL store.
+     * @throws MDSALStoreException
+     */
+    void storeYangModule(String yang, BundleInfo bundleInfo) throws MDSALStoreException;
+
+    /**
+     * This method is used to store configuration JSON to MD-SAL store. It invokes store configuration Operation with required parameters
+     * @param moduleName - Yang module name where JSON need to be posted
+     * @param requestId - Request ID which is used as unique key for configuration JSON
+     * @param configJSON - String value of configuration JSON that needs to be stored in MD-SAl store
+     * @throws MDSALStoreException
+     */
+    void storeJson(String moduleName , String requestId , String configJSON ) throws MDSALStoreException;
+
+    /**
+     * This method will be used to store yang module to MD-SAL store
+     * @param yang - yang module that need to be stored. In String format
+     * @param moduleName - yang module name
+     * @throws MDSALStoreException
+     */
+    void storeYangModuleOnLeader(String yang, String moduleName) throws MDSALStoreException;
+
+}
diff --git a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/src/main/java/org/onap/appc/mdsal/exception/MDSALStoreException.java b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/src/main/java/org/onap/appc/mdsal/exception/MDSALStoreException.java
new file mode 100644
index 000000000..2bb30b1c2
--- /dev/null
+++ b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/src/main/java/org/onap/appc/mdsal/exception/MDSALStoreException.java
@@ -0,0 +1,72 @@
+/*-
+ * ============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.onap.appc.mdsal.exception;
+
+/**
+ * This is custom exception type defined for MD-SAL store. All exceptions thrown by mdsal store module need to be wrapped in this class.
+*/
+ public class MDSALStoreException extends Exception {
+
+    private static final long serialVersionUID = 1L;
+
+    public MDSALStoreException(){
+    }
+
+    /**
+     * Create MDSALStoreException using only message.
+     * @param message -- message to the caller.
+     */
+    public MDSALStoreException (String message){
+        super(message);
+    }
+
+    /**
+     * Create MDSALStoreException using orignal cause
+     * @param cause - cause that is being wrapped / suppressed.
+     */
+    public MDSALStoreException (Throwable cause){
+        super(cause);
+    }
+
+    /**
+     *
+     * @param message - message to the caller.
+     * @param cause - cause that is being wrapped / suppressed .
+     */
+    public MDSALStoreException(String message , Throwable cause){
+        super(message , cause);
+    }
+
+    /**
+     *
+     * @param message - message to the caller.
+     * @param cause - cause that is being wrapped / suppressed .
+     * @param enableSuppression - Indicates if suppression is enabled.
+     * @param writableStackTrace - Indicates if writable stacktrace is supported
+     */
+    public MDSALStoreException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
+        super(message, cause, enableSuppression, writableStackTrace);
+    }
+}
diff --git a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/src/main/java/org/onap/appc/mdsal/impl/Constants.java b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/src/main/java/org/onap/appc/mdsal/impl/Constants.java
new file mode 100644
index 000000000..e414b4146
--- /dev/null
+++ b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/src/main/java/org/onap/appc/mdsal/impl/Constants.java
@@ -0,0 +1,139 @@
+/*-
+ * ============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.onap.appc.mdsal.impl;
+/**
+ * This class contains the definitions of all constant values used in the appc-dg-mdsal-store
+ * These properties are used for creating osgi bundle zip file. It also defines contents for Blueprint.xml file of bundle
+*/
+public class Constants {
+
+    private Constants(){}
+    /**
+     * Manifest attribute for OSGI Bundle Name
+     */
+    public static final String MANIFEST_ATTR_BUNDLE_NAME= "Bundle-Name";
+
+    /**
+     * Manifest attribute for OSGI Bundle Symbolic Name
+     */
+    public static final String MANIFEST_ATTR_BUNDLE_SYMBOLIC_NAME= "Bundle-SymbolicName";
+
+    /**
+     * Manifest attribute for OSGI Bundle Description
+     */
+    public static final String MANIFEST_ATTR_BUNDLE_DESCRIPTION= "Bundle-Description";
+
+    /**
+     * Manifest attribute for OSGI Bundle Manifest version
+     */
+    public static final String MANIFEST_ATTR_BUNDLE_MANIFEST_VERSION= "Bundle-ManifestVersion";
+
+    /**
+     * Manifest attribute for OSGI Bundle Version
+     */
+    public static final String MANIFEST_ATTR_BUNDLE_VERSION= "Bundle-Version";
+
+    /**
+     * Manifest attribute for OSGI Bundle Blueprint
+     */
+    public static final String MANIFEST_ATTR_BUNDLE_BLUEPRINT= "Bundle-Blueprint";
+
+    /**
+     * Manifest value for Mainfest Version
+     */
+    public static final String MANIFEST_VALUE_VERSION= "1.0";
+
+    /**
+     * Manifest value for OSGI Bundle Vesion
+     */
+    public static final String MANIFEST_VALUE_BUNDLE_MAN_VERSION= "2";
+
+    /**
+     * Manifest value for OSGI Bundle Blueprint location
+     */
+    public static final String MANIFEST_VALUE_BUNDLE_BLUEPRINT= "OSGI-INF/blueprint/blueprint.xml";
+
+    /**
+     * Base URL for config actions exposed by RESTCONF API
+     */
+
+    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.
+     */
+    public static final String BLUEPRINT = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+            "<!--\n" +
+            "    Starter Blueprint Camel Definition appc-aai-adapter-blueprint\n" +
+            "-->\n" +
+            "<blueprint xmlns=\"http://www.osgi.org/xmlns/blueprint/v1.0.0\"\n" +
+            "                       xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
+            "                       xsi:schemaLocation=\"http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd\">\n" +
+            "\n" +
+            "</blueprint>";
+
+    /**
+     * HTTP Header attribute for Content type - JSON
+     */
+    public static final String OPERATION_APPLICATION_JSON= " application/json";
+
+    /**
+     * HTTP protocol used for config operations
+     */
+    public static final String OPERATION_HTTPS= "https";
+
+    /**
+     *  Constant for backslash to be used while formatting URL
+     */
+    public static final String URL_BACKSLASH ="/";
+
+    public static final String GET_NODE_STATUS_PATH_FORMAT =  "/jolokia/read/org.opendaylight.controller:Category=Shards,name=%s,type=DistributedConfigDatastore";
+
+    public static final String SHARD_NAME_FORMAT = "%s-shard-default-config";
+
+    public static final String GET_SHARD_LIST_PATH = "/jolokia/read/org.opendaylight.controller:type=DistributedConfigDatastore,Category=ShardManager,name=shard-manager-config";
+
+    public static final String YANG_LOADER_PATH = "/restconf/operations/mdsal-store:store-yang";
+
+    public static final String JSON_RESPONSE_VALUE = "value";
+
+    public static final String JSON_RESPONSE_MEMBER_NAME =  "MemberName";
+
+    public static final String SELF = "self";
+}
diff --git a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/src/main/java/org/onap/appc/mdsal/impl/MDSALStoreFactory.java b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/src/main/java/org/onap/appc/mdsal/impl/MDSALStoreFactory.java
new file mode 100644
index 000000000..bc951d926
--- /dev/null
+++ b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/src/main/java/org/onap/appc/mdsal/impl/MDSALStoreFactory.java
@@ -0,0 +1,50 @@
+/*-
+ * ============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.onap.appc.mdsal.impl;
+
+import org.onap.appc.mdsal.MDSALStore;
+
+/*
+ * Factory class to create/get instance of MDSALStore
+ */
+public class MDSALStoreFactory {
+    private static class ReferenceHolder{
+        private static MDSALStore store = new MDSALStoreImpl();
+        private ReferenceHolder(){}
+    }
+    private MDSALStoreFactory(){
+
+    }
+
+    /**
+     * Method for creating MDSALStore instance, It creates an instance of
+     * MDSALStoreImpl once and returns the same instance everytime it is invoked.
+     * @return
+     */
+    public static MDSALStore createMDSALStore (){
+        return ReferenceHolder.store;
+    }
+}
+
diff --git a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/src/main/java/org/onap/appc/mdsal/impl/MDSALStoreImpl.java b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/src/main/java/org/onap/appc/mdsal/impl/MDSALStoreImpl.java
new file mode 100644
index 000000000..fcd315bf6
--- /dev/null
+++ b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/src/main/java/org/onap/appc/mdsal/impl/MDSALStoreImpl.java
@@ -0,0 +1,354 @@
+/*-
+ * ============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.onap.appc.mdsal.impl;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonValue;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.commons.io.IOUtils;
+import org.apache.http.HttpResponse;
+import org.opendaylight.yang.gen.v1.org.onap.appc.mdsal.store.rev170925.StoreYangInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.mdsal.store.rev170925.StoreYangInputBuilder;
+import org.opendaylight.yangtools.yang.binding.DataContainer;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.mdsal.MDSALStore;
+import org.onap.appc.mdsal.exception.MDSALStoreException;
+import org.onap.appc.mdsal.objects.BundleInfo;
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
+import org.onap.appc.mdsal.operation.ConfigOperationRequestFormatter;
+import org.onap.appc.rest.client.RestClientInvoker;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.FrameworkUtil;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.*;
+import java.util.jar.Attributes;
+import java.util.jar.JarEntry;
+import java.util.jar.JarOutputStream;
+import java.util.jar.Manifest;
+
+/**
+ * Implementation of MDSALStore
+ */
+public class MDSALStoreImpl implements MDSALStore {
+
+    private final EELFLogger logger = EELFManager.getInstance().getLogger(MDSALStoreImpl.class);
+    private RestClientInvoker client;
+    private ConfigOperationRequestFormatter requestFormatter = new ConfigOperationRequestFormatter();
+    private ObjectMapper mapper = new ObjectMapper();
+    private Map<String, RestClientInvoker> remoteClientMap = new HashMap<>();
+
+    MDSALStoreImpl() {
+        String configUrl = null;
+        String user = null;
+        String password = null;
+        Configuration configuration = ConfigurationFactory.getConfiguration();
+        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);
+        }
+        if (configUrl != null) {
+            try {
+                client = new RestClientInvoker(new URL(configUrl));
+                client.setAuthentication(user, password);
+            } catch (MalformedURLException e) {
+                logger.error("Error initializing RestConf client: " + e.getMessage(), e);
+            }
+        }
+    }
+
+
+    @Override
+    public boolean isModulePresent(String moduleName, Date revision) {
+
+        if (logger.isDebugEnabled()) {
+            logger.debug("isModulePresent invoked with moduleName = " + moduleName + " , revision = " + revision);
+        }
+
+        BundleContext bundleContext = FrameworkUtil.getBundle(this.getClass()).getBundleContext();
+        /*
+         * SchemaContext interface of ODL provides APIs for querying details of yang modules
+         * loaded into MD-SAL store, but its limitation is, it only returns information about
+         * static yang modules loaded on server start up, it does not return information about
+         * the yang modules loaded dynamically. Due to this limitation, we are checking the
+         * presence of OSGI bundle instead of yang module. (Note: Assuming OSGI bundle is named
+         * with the yang module name).
+         */
+
+        Bundle bundle = bundleContext.getBundle(moduleName);
+        if (logger.isDebugEnabled()) {
+            logger.debug("isModulePresent returned = " + (bundle != null));
+        }
+        return bundle != null;
+    }
+
+    @Override
+    public void storeYangModule(String yang, BundleInfo bundleInfo) throws MDSALStoreException {
+
+        BundleContext bundleContext = FrameworkUtil.getBundle(this.getClass()).getBundleContext();
+        byte[] byteArray = createBundleJar(yang, Constants.BLUEPRINT, bundleInfo);
+
+        try (ByteArrayInputStream inputStream = new ByteArrayInputStream(byteArray)) {
+            Bundle bundle = bundleContext.installBundle(bundleInfo.getLocation(), inputStream);
+            bundle.start();
+        } catch (Exception e) {
+            logger.error(String.format("Error storing yang module: %s. Error message: %s.", yang, e.getMessage()));
+            throw new MDSALStoreException("Error storing yang module: " + yang + " " + e.getMessage(), e);
+        }
+    }
+
+    @Override
+    public void storeYangModuleOnLeader(String yang, String moduleName) throws MDSALStoreException {
+        try {
+            String leader = getLeaderNode();
+            if (Constants.SELF.equals(leader)){
+                logger.debug("Current node is a leader.");
+            }else{
+                logger.debug("Attempting to load yang module on Leader: " + leader );
+                String inputJson = createInputJson(yang, moduleName);
+                RestClientInvoker remoteClient = getRemoteClient(leader);
+                HttpResponse response = remoteClient.doPost(Constants.YANG_LOADER_PATH, inputJson);
+                int httpCode = response.getStatusLine().getStatusCode();
+                String respBody = IOUtils.toString(response.getEntity().getContent());
+                if (httpCode < 200 || httpCode >= 300) {
+                    logger.debug("Error while loading yang module on leader. Response code: " + httpCode);
+                    processRestconfResponse(respBody);
+                } else {
+                    logger.debug("Yang module successfully loaded on leader. Response code: " + httpCode);
+                }
+            }
+        } catch (APPCException e) {
+            logger.error("Error loading Yang on Leader. Error message: " + e.getMessage());
+            throw new MDSALStoreException("Error loading Yang on Leader. Error message: " + e.getMessage(), e);
+        } catch (IOException e) {
+            logger.error("Error reading response from remote client. Error message: " + e.getMessage());
+            throw new MDSALStoreException("Error reading response from remote client. Error message: " + e.getMessage(), e);
+        }
+    }
+
+    private String createInputJson(String yang, String moduleName)  throws MDSALStoreException {
+        StoreYangInputBuilder builder = new StoreYangInputBuilder();
+        builder.setYang(yang).setModuleName(moduleName);
+        StoreYangInput input = builder.build();
+        try {
+            ObjectMapper objectMapper = new ObjectMapper();
+            objectMapper.addMixInAnnotations(StoreYangInput.class, MixIn.class);
+            String inputJson = objectMapper.writer().withRootName("input").writeValueAsString(input);
+            logger.debug("Input JSON :" + inputJson);
+            return inputJson;
+        } catch (JsonProcessingException e) {
+            logger.error(String.format("Error creating JSON input using yang: %s. Error message: %s",yang ,e.getMessage()));
+            throw new MDSALStoreException(String.format("Error creating JSON input using yang: %s. Error message: %s",yang ,e.getMessage()), e);
+        }
+    }
+
+    private RestClientInvoker getRemoteClient(String leader) throws MDSALStoreException {
+        if (remoteClientMap.containsKey(leader)) {
+            return remoteClientMap.get(leader);
+        } else {
+            Configuration configuration = ConfigurationFactory.getConfiguration();
+            Properties properties = configuration.getProperties();
+            if (properties != null) {
+                try {
+                    URL configUrl = new URL(properties.getProperty(Constants.CONFIG_URL_PROPERTY, Constants.CONFIG_URL_DEFAULT));
+                    String user = properties.getProperty(Constants.CONFIG_USER_PROPERTY);
+                    String password = properties.getProperty(Constants.CONFIG_PASS_PROPERTY);
+                    RestClientInvoker remoteClient = new RestClientInvoker(new URL(configUrl.getProtocol(), leader, configUrl.getPort(), ""));
+                    remoteClient.setAuthentication(user, password);
+                    remoteClientMap.put(leader, remoteClient);
+                    return remoteClient;
+                } catch (MalformedURLException e) {
+                    logger.error("Error initializing remote RestConf client: " + e.getMessage(), e);
+                    throw new MDSALStoreException("Error initializing Remote RestConf client: " + e.getMessage(), e);
+                }
+            } else {
+                logger.error("Error initializing Remote RestConf client. Could not read appc properties");
+                throw new MDSALStoreException("Error initializing Remote RestConf client. Could not read appc properties");
+            }
+        }
+    }
+
+    abstract class MixIn {
+        @JsonIgnore
+        abstract Class<? extends DataContainer> getImplementedInterface(); // to be removed during serialization
+
+        @JsonValue
+        abstract java.lang.String getValue();
+
+        @JsonProperty("module-name")
+        abstract java.lang.String getModuleName();
+    }
+
+    @Override
+    public void storeJson(String module, String requestId, String configJson) throws MDSALStoreException {
+        if (configJson == null) {
+            throw new MDSALStoreException("Configuration JSON is empty or null");
+        }
+        logger.debug("Configuration JSON: " + configJson + "\n" + "module" + module);
+        try {
+            String path = requestFormatter.buildPath(module, org.onap.appc.Constants.YANG_BASE_CONTAINER,
+                    org.onap.appc.Constants.YANG_VNF_CONFIG_LIST, requestId, org.onap.appc.Constants.YANG_VNF_CONFIG);
+            logger.debug("Configuration Path : " + path);
+            HttpResponse response = client.doPut(path, configJson);
+            int httpCode = response.getStatusLine().getStatusCode();
+            String respBody = IOUtils.toString(response.getEntity().getContent());
+            if (httpCode < 200 || httpCode >= 300) {
+                logger.debug("Error while storing configuration JSON to MD-SAL store. Response code: " + httpCode);
+                processRestconfResponse(respBody);
+            } else {
+                logger.debug("Configuration JSON stored to MD-SAL store successfully. Response code: " + httpCode);
+            }
+        } catch (IOException | APPCException e) {
+            logger.error("Error while storing configuration json. Error Message" + e.getMessage(), e);
+            throw new MDSALStoreException(e);
+        }
+    }
+
+    private void processRestconfResponse(String response) throws MDSALStoreException {
+        try {
+            JsonNode responseJson = mapper.readTree(response);
+            ArrayList<String> errorMessage = new ArrayList<>();
+            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());
+                }
+            }
+            logger.error("Failed to load config JSON to MD SAL store. " + errorMessage.toString());
+            throw new MDSALStoreException("Failed to load config JSON to MD SAL store. Error Message: " + errorMessage.toString());
+        } catch (IOException e) {
+            logger.error("Failed to process error response from RestConf: " + e.getMessage());
+            throw new MDSALStoreException("Failed to process RestConf response. Error Message: " + e.toString(), e);
+        }
+    }
+
+    private byte[] createBundleJar(String yang, String blueprint, BundleInfo bundleInfo) throws MDSALStoreException {
+
+        Manifest manifest = new Manifest();
+        manifest.getMainAttributes().put(Attributes.Name.MANIFEST_VERSION, Constants.MANIFEST_VALUE_VERSION);
+        manifest.getMainAttributes().put(new Attributes.Name(Constants.MANIFEST_ATTR_BUNDLE_NAME), bundleInfo.getName());
+        manifest.getMainAttributes().put(new Attributes.Name(Constants.MANIFEST_ATTR_BUNDLE_SYMBOLIC_NAME), bundleInfo.getName());
+        manifest.getMainAttributes().put(new Attributes.Name(Constants.MANIFEST_ATTR_BUNDLE_DESCRIPTION), bundleInfo.getDescription());
+        manifest.getMainAttributes().put(new Attributes.Name(Constants.MANIFEST_ATTR_BUNDLE_MANIFEST_VERSION), Constants.MANIFEST_VALUE_BUNDLE_MAN_VERSION);
+        manifest.getMainAttributes().put(new Attributes.Name(Constants.MANIFEST_ATTR_BUNDLE_VERSION), String.valueOf(bundleInfo.getVersion()));
+        manifest.getMainAttributes().put(new Attributes.Name(Constants.MANIFEST_ATTR_BUNDLE_BLUEPRINT), Constants.MANIFEST_VALUE_BUNDLE_BLUEPRINT);
+
+        byte[] retunValue;
+
+        try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+             JarOutputStream jarOutputStream = new JarOutputStream(outputStream, manifest)) {
+            jarOutputStream.putNextEntry(new JarEntry("META-INF/yang/"));
+            jarOutputStream.putNextEntry(new JarEntry("META-INF/yang/" + bundleInfo.getName() + ".yang"));
+            jarOutputStream.write(yang.getBytes());
+            jarOutputStream.closeEntry();
+
+            jarOutputStream.putNextEntry(new JarEntry("OSGI-INF/blueprint/"));
+            jarOutputStream.putNextEntry(new JarEntry(Constants.MANIFEST_VALUE_BUNDLE_BLUEPRINT));
+            jarOutputStream.write(blueprint.getBytes());
+            jarOutputStream.closeEntry();
+            jarOutputStream.close();
+            retunValue = outputStream.toByteArray();
+        } catch (Exception e) {
+            logger.error("Error creating bundle jar: " + bundleInfo.getName() + ". Error message: " + e.getMessage());
+            throw new MDSALStoreException("Error creating bundle jar: " + bundleInfo.getName() + " " + e.getMessage(), e);
+        }
+        return retunValue;
+    }
+
+    private String getLeaderNode() throws MDSALStoreException {
+        try {
+            String shardName = String.format(Constants.SHARD_NAME_FORMAT, getNodeName());
+            HttpResponse response = client.doGet(String.format(Constants.GET_NODE_STATUS_PATH_FORMAT, shardName));
+            int httpCode = response.getStatusLine().getStatusCode();
+            String respBody = IOUtils.toString(response.getEntity().getContent());
+            logger.debug(String.format("Get node status returned Code: %s. Response: %s ", httpCode, respBody));
+            if (httpCode == 200 && mapper.readTree(respBody).get(Constants.JSON_RESPONSE_VALUE) !=null ) {
+                JsonNode responseValue = mapper.readTree(respBody).get(Constants.JSON_RESPONSE_VALUE);
+                    String leaderShard = responseValue.get("Leader").asText();
+                    if (shardName.equals(leaderShard)) {
+                        logger.debug("Current node is leader.");
+                        return Constants.SELF;
+                    } else {
+                        String[] peers = responseValue.get("PeerAddresses").asText().split(",");
+                        for (String peer : peers) {
+                            if (peer.trim().startsWith(leaderShard)) {
+                                String leader = peer.substring(peer.indexOf('@') + 1, peer.indexOf(':', peer.indexOf('@')));
+                                logger.debug(String.format("Node %s is a leader", leader));
+                                return leader;
+                            }
+                        }
+                        logger.error("No Leader found for a cluster");
+                        throw new MDSALStoreException("No Leader found for a cluster");
+                    }
+            } else {
+                logger.error("Error while retrieving leader node.");
+                throw new MDSALStoreException("Error while retrieving leader node.");
+            }
+        } catch (IOException | APPCException e) {
+            logger.error(String.format("Error while retrieving leader Node. Error message : %s ", e.getMessage()), e);
+            throw new MDSALStoreException(e);
+        }
+    }
+
+    private String getNodeName() throws MDSALStoreException {
+        try {
+            HttpResponse response = client.doGet(Constants.GET_SHARD_LIST_PATH);
+            int httpCode = response.getStatusLine().getStatusCode();
+            String respBody = IOUtils.toString(response.getEntity().getContent());
+            logger.debug(String.format("Get shard list returned Code: %s. Response: %s ", httpCode, respBody));
+            if (httpCode == 200) {
+                JsonNode responseValue = mapper.readTree(respBody).get(Constants.JSON_RESPONSE_VALUE);
+                if (responseValue != null && responseValue.get(Constants.JSON_RESPONSE_MEMBER_NAME) != null) {
+                    String name = responseValue.get(Constants.JSON_RESPONSE_MEMBER_NAME).asText();
+                    logger.debug("Node name : " + name);
+                    return name;
+                }else{
+                    logger.error(String.format("Error while retrieving node name from response. Response body: %s.", respBody));
+                    throw new MDSALStoreException(String.format("Error while retrieving node name from response. Response body: %s.", respBody));
+                }
+            } else {
+                logger.error(String.format("Error while retrieving node name. Error code: %s. Error response: %s.", httpCode, respBody));
+                throw new MDSALStoreException(String.format("Error while retrieving node name. Error code: %s. Error response: %s.", httpCode, respBody));
+            }
+        } catch (IOException | APPCException e) {
+            logger.error("Error while getting node name " + e.getMessage(), e);
+            throw new MDSALStoreException(e);
+        }
+    }
+}
diff --git a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/src/main/java/org/onap/appc/mdsal/objects/BundleInfo.java b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/src/main/java/org/onap/appc/mdsal/objects/BundleInfo.java
new file mode 100644
index 000000000..b6d65447d
--- /dev/null
+++ b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/src/main/java/org/onap/appc/mdsal/objects/BundleInfo.java
@@ -0,0 +1,74 @@
+/*-
+ * ============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.onap.appc.mdsal.objects;
+/**
+ * Holds bundle information which includes name , description , version and location. This information will be used to create osgi bundle.
+ */
+ public class BundleInfo {
+
+    private String name;
+    private String description;
+    private Integer version;
+    private String location;
+
+    /**
+     * Creates an object of BundleInfo with version initialized to 1
+     */
+    public BundleInfo(){
+        version =1;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public Integer getVersion() {
+        return version;
+    }
+
+    public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+    public String getLocation() {
+        return location;
+    }
+
+    public void setLocation(String location) {
+        this.location = location;
+    }
+}
diff --git a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/src/main/java/org/onap/appc/mdsal/operation/ConfigOperationRequestFormatter.java b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/src/main/java/org/onap/appc/mdsal/operation/ConfigOperationRequestFormatter.java
new file mode 100644
index 000000000..117349eea
--- /dev/null
+++ b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/src/main/java/org/onap/appc/mdsal/operation/ConfigOperationRequestFormatter.java
@@ -0,0 +1,52 @@
+/*-
+ * ============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.onap.appc.mdsal.operation;
+
+import org.onap.appc.mdsal.impl.Constants;
+
+/**
+ * Creates request url path for config actions based on parameter like module name , container-name and sub modules if any.
+ */
+
+public class ConfigOperationRequestFormatter {
+    /**
+     *  Build a request url path for config actions
+     * @param module - yang module name
+     * @param containerName - yang container name
+     * @param subModules - sub module /container  names as string in varargs ( String ) format
+     * @return - resultant path in String format
+     */
+    public String buildPath(String module, String containerName , String... subModules ) {
+
+        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);
+                path.append("/");
+            }
+        }
+        return  path.toString();
+    }
+}
diff --git a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/src/main/java/org/onap/appc/mdsal/provider/MdsalStoreProvider.java b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/src/main/java/org/onap/appc/mdsal/provider/MdsalStoreProvider.java
new file mode 100644
index 000000000..f4d5ad159
--- /dev/null
+++ b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/src/main/java/org/onap/appc/mdsal/provider/MdsalStoreProvider.java
@@ -0,0 +1,127 @@
+/*-
+ * ============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.onap.appc.mdsal.provider;
+
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
+import com.google.common.util.concurrent.Futures;
+import org.opendaylight.controller.md.sal.binding.api.DataBroker;
+import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
+import org.opendaylight.controller.sal.binding.api.NotificationProviderService;
+import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry;
+import org.opendaylight.yang.gen.v1.org.onap.appc.mdsal.store.rev170925.MdsalStoreService;
+import org.opendaylight.yang.gen.v1.org.onap.appc.mdsal.store.rev170925.StoreYangInput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.mdsal.store.rev170925.StoreYangOutput;
+import org.opendaylight.yang.gen.v1.org.onap.appc.mdsal.store.rev170925.StoreYangOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.appc.mdsal.store.rev170925.response.Status;
+import org.opendaylight.yang.gen.v1.org.onap.appc.mdsal.store.rev170925.response.StatusBuilder;
+import org.opendaylight.yangtools.yang.common.RpcResult;
+import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
+import org.onap.appc.Constants;
+import org.onap.appc.mdsal.MDSALStore;
+import org.onap.appc.mdsal.impl.MDSALStoreFactory;
+import org.onap.appc.mdsal.objects.BundleInfo;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+
+public class MdsalStoreProvider implements MdsalStoreService ,AutoCloseable{
+
+    protected DataBroker dataBroker;
+    protected RpcProviderRegistry rpcRegistry;
+    protected NotificationProviderService notificationService;
+
+    protected BindingAwareBroker.RpcRegistration<MdsalStoreService> rpcRegistration;
+    private final EELFLogger log = EELFManager.getInstance().getLogger(MdsalStoreProvider.class);
+    private final ExecutorService executor;
+    private final static String APP_NAME = "MdsalStoreProvider";
+
+    public MdsalStoreProvider(DataBroker dataBroker2, NotificationProviderService notificationProviderService
+            , RpcProviderRegistry rpcRegistry2){
+        log.info("Creating provider for " + APP_NAME);
+        executor = Executors.newFixedThreadPool(1);
+        this.dataBroker = dataBroker2;
+        this.notificationService = notificationProviderService;
+
+        this.rpcRegistry = rpcRegistry2;
+
+        if (this.rpcRegistry != null) {
+            rpcRegistration = rpcRegistry.addRpcImplementation(MdsalStoreService.class, this);
+        }
+        log.info("Initialization complete for " + APP_NAME);
+
+    }
+
+    @Override
+    public void close() throws Exception {
+        log.info("Closing provider for " + APP_NAME);
+        if(this.executor != null){
+            executor.shutdown();
+        }
+        if(this.rpcRegistration != null){
+            rpcRegistration.close();
+        }
+        log.info("Successfully closed provider for " + APP_NAME);
+    }
+
+    @Override
+    public Future<RpcResult<StoreYangOutput>> storeYang(StoreYangInput input) {
+        Status status =null;String message=null;
+        try{
+            BundleInfo bundleInfo = new BundleInfo();
+            bundleInfo.setName(input.getModuleName());
+            bundleInfo.setDescription(input.getModuleName());
+            bundleInfo.setLocation(input.getModuleName());
+
+            MDSALStore store =  MDSALStoreFactory.createMDSALStore();
+
+            Date revision = new SimpleDateFormat(Constants.YANG_REVISION_FORMAT).parse(Constants.YANG_REVISION);
+            if(!store.isModulePresent(input.getModuleName(),revision)){
+                message = "YANG module saved successfully";
+                store.storeYangModule(input.getYang(),bundleInfo);
+            }
+            else{
+                message = "YANG Module already available";
+            }
+            store.storeYangModuleOnLeader(input.getYang(),input.getModuleName());
+            status = new StatusBuilder().setCode(200).setMessage(message).build();
+        }
+        catch (Exception e){
+
+            message = "Error in storeYang of MdsalStoreProvider";
+            log.error(message,e);
+            status = new StatusBuilder().setCode(500).setMessage(message).build();
+        }
+        StoreYangOutputBuilder builder = new StoreYangOutputBuilder().setStatus(status);
+        return Futures.immediateFuture(
+                RpcResultBuilder
+                        .<StoreYangOutput>status(true)
+                        .withResult(builder.build())
+                        .build());
+    }
+}
diff --git a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/src/main/java/org/opendaylight/yang/gen/v1/org/onap/appc/mdsal/store/impl/rev170925/MdsalStoreProviderModule.java b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/src/main/java/org/opendaylight/yang/gen/v1/org/onap/appc/mdsal/store/impl/rev170925/MdsalStoreProviderModule.java
new file mode 100644
index 000000000..50e9874dc
--- /dev/null
+++ b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/src/main/java/org/opendaylight/yang/gen/v1/org/onap/appc/mdsal/store/impl/rev170925/MdsalStoreProviderModule.java
@@ -0,0 +1,58 @@
+/*-
+ * ============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.opendaylight.yang.gen.v1.org.onap.appc.mdsal.store.impl.rev170925;
+
+import org.onap.appc.mdsal.provider.MdsalStoreProvider;
+
+public class MdsalStoreProviderModule extends org.opendaylight.yang.gen.v1.org.onap.appc.mdsal.store.impl.rev170925.AbstractMdsalStoreProviderModule {
+    public MdsalStoreProviderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
+        super(identifier, dependencyResolver);
+    }
+
+    public MdsalStoreProviderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.org.onap.appc.mdsal.store.impl.rev170925.MdsalStoreProviderModule oldModule, java.lang.AutoCloseable oldInstance) {
+        super(identifier, dependencyResolver, oldModule, oldInstance);
+    }
+
+    @Override
+    public void customValidation() {
+        // add custom validation form module attributes here.
+    }
+
+    @Override
+    public java.lang.AutoCloseable createInstance() {
+        MdsalStoreProvider provider = new MdsalStoreProvider(getDataBrokerDependency()
+                ,getNotificationServiceDependency()
+                ,getRpcRegistryDependency());
+
+        return new AutoCloseable() {
+
+            @Override
+            public void close() throws Exception {
+                provider.close();
+            }
+        };
+    }
+
+}
diff --git a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/src/main/java/org/opendaylight/yang/gen/v1/org/onap/appc/mdsal/store/impl/rev170925/MdsalStoreProviderModuleFactory.java b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/src/main/java/org/opendaylight/yang/gen/v1/org/onap/appc/mdsal/store/impl/rev170925/MdsalStoreProviderModuleFactory.java
new file mode 100644
index 000000000..0c3254889
--- /dev/null
+++ b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/src/main/java/org/opendaylight/yang/gen/v1/org/onap/appc/mdsal/store/impl/rev170925/MdsalStoreProviderModuleFactory.java
@@ -0,0 +1,37 @@
+/*-
+ * ============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=========================================================
+ */
+
+/*
+* Generated file
+*
+* Generated from: yang module name: mdsal-store-impl yang module local name: mdsal-store-impl
+* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
+* Generated at: Tue Sep 26 15:55:55 IST 2017
+*
+* Do not modify this file unless it is present under src/main directory
+*/
+package org.opendaylight.yang.gen.v1.org.onap.appc.mdsal.store.impl.rev170925;
+public class MdsalStoreProviderModuleFactory extends org.opendaylight.yang.gen.v1.org.onap.appc.mdsal.store.impl.rev170925.AbstractMdsalStoreProviderModuleFactory {
+
+}
diff --git a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/src/main/resources/initial/appc-mdsal-store.xml b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/src/main/resources/initial/appc-mdsal-store.xml
new file mode 100644
index 000000000..c14838756
--- /dev/null
+++ b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/src/main/resources/initial/appc-mdsal-store.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ============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=========================================================
+  -->
+
+<!-- vi: set et smarttab sw=4 tabstop=4: -->
+<snapshot>
+    <configuration>
+        <data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
+            <modules xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
+                <module>
+                
+                    <!-- This xmlns:prefix should match the namespace in the *-impl.yang file
+                         The prefix: inside type should match the prefix of the yang file. -->
+                    <type xmlns:prefix="org:onap:appc:mdsal:store:impl">
+                        prefix:mdsal-store-impl
+                    </type>
+                    <name>mdsal-store-impl</name>
+
+                    <!--  The following sections contain bindings to services defined in the
+                          *-impl yang file. For example the rpc-registry is required
+                          because we have a dependency (or augmentation) named "rpc-registry"
+                          and which binds to the md-sa-binding-registry. If you remove those
+                          dependencies from the yang file then you can remove them from here. -->
+                    <rpc-registry>
+                        <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-rpc-registry</type>
+                        <name>binding-rpc-broker</name>
+                    </rpc-registry>
+                    
+                    <data-broker>
+                        <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-async-data-broker</type>
+                        <name>binding-data-broker</name>
+                    </data-broker>
+                    
+                     <notification-service>
+                        <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">
+                            binding:binding-notification-service
+                        </type>
+                        <name>binding-notification-broker</name>
+                    </notification-service>
+                </module>
+
+            </modules>
+        </data>
+
+    </configuration>
+
+    <!--  Required capabilities are basically a listing of all modules that need to be imported before
+          our service can be resolved. Capabilities for dependencies defined above are implied which is
+          why we do not have define a required capability for the data broker, for example. -->
+    <required-capabilities>
+        <capability>org:onap:appc:mdsal:store:impl?module=mdsal-store-impl&amp;revision=2017-09-25</capability>
+    </required-capabilities>
+
+</snapshot>
diff --git a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/src/main/yang/mdsal-store.yang b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/src/main/yang/mdsal-store.yang
new file mode 100644
index 000000000..67cd7212b
--- /dev/null
+++ b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/src/main/yang/mdsal-store.yang
@@ -0,0 +1,86 @@
+/*-
+ * ============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=========================================================
+ */
+
+module mdsal-store-impl {
+
+    yang-version 1;
+    namespace "org:onap:appc:mdsal:store:impl";
+    prefix mdsal-store-impl;
+
+    import config { prefix config; revision-date 2013-04-05; }
+    import opendaylight-md-sal-binding { prefix mdsal; revision-date 2013-10-28; }
+
+     description
+        "This module contains the base YANG definitions for
+         mdsal-store-impl implementation.";
+
+    revision "2017-09-25" {
+        description
+            "Initial revision.";
+    }
+
+    // This is the definition of the service implementation as a module identity.
+    identity mdsal-store-impl {
+            base config:module-type;
+
+            // Specifies the prefix for generated java classes.
+            config:java-name-prefix MdsalStoreProvider;
+    }
+
+    // Augments the 'configuration' choice node under modules/module.
+    // We consume the two main services, RPCs and DataStore
+    // Notification service is not used
+    augment "/config:modules/config:module/config:configuration" {
+        case mdsal-store-impl {
+            when "/config:modules/config:module/config:type = 'mdsal-store-impl'";
+
+            container rpc-registry {
+                uses config:service-ref {
+                    refine type {
+                        mandatory true;
+                        config:required-identity mdsal:binding-rpc-registry;
+                    }
+                }
+            }
+
+            container notification-service {
+                uses config:service-ref {
+                    refine type {
+                        mandatory true;
+                        config:required-identity mdsal:binding-notification-service;
+                    }
+                }
+            }
+
+            container data-broker {
+                uses config:service-ref {
+                    refine type {
+                        mandatory false;
+                        config:required-identity mdsal:binding-async-data-broker;
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/src/test/java/org/onap/appc/mdsal/MDSALStoreTest.java b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/src/test/java/org/onap/appc/mdsal/MDSALStoreTest.java
new file mode 100644
index 000000000..aa659a1b2
--- /dev/null
+++ b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/src/test/java/org/onap/appc/mdsal/MDSALStoreTest.java
@@ -0,0 +1,75 @@
+/*-
+ * ============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.onap.appc.mdsal;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.http.HttpResponse;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mockito;
+import org.onap.appc.mdsal.exception.MDSALStoreException;
+import org.onap.appc.mdsal.impl.MDSALStoreFactory;
+import org.onap.appc.mdsal.impl.MDSALStoreImpl;
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
+import org.onap.appc.mdsal.operation.ConfigOperationRequestFormatter;
+import org.onap.appc.rest.client.RestClientInvoker;
+import org.osgi.framework.*;
+import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+
+import java.net.URL;
+
+/**
+ * MDSALStore Tests
+ */
+@RunWith(PowerMockRunner.class)
+@PrepareForTest({FrameworkUtil.class,BundleContext.class,ServiceReference.class,
+        BundleReference.class,Bundle.class,Filter.class,BundleListener.class,InvalidSyntaxException.class,
+        BundleException.class,FrameworkListener.class,ServiceRegistration.class,ServiceListener.class,
+        Version.class})
+public class MDSALStoreTest {
+
+    private final EELFLogger logger = EELFManager.getInstance().getLogger(MDSALStoreTest.class);
+    private RestClientInvoker client = Mockito.mock(RestClientInvoker.class);
+    private ConfigOperationRequestFormatter requestFormatter = new ConfigOperationRequestFormatter();
+    private ObjectMapper mapper = new ObjectMapper();
+    MDSALStoreImpl store;
+
+    @Before
+    public void init() throws Exception{
+        PowerMockito.whenNew(RestClientInvoker.class).withArguments(Mockito.any(URL.class)).thenReturn(client);
+        store = (MDSALStoreImpl) MDSALStoreFactory.createMDSALStore();
+    }
+
+    @Ignore
+    public void testYangInput() throws MDSALStoreException {
+        store.storeYangModuleOnLeader("module test { }", "Name");
+    }
+
+}