Add test cases for MdsalHelper

Fix test case for loadProperties, and added test cases for IpAddress
types

Change-Id: Iabf182d32ae3937871dc9656105fdda0c1a9411f
Issue-ID: CCSDK-106
Signed-off-by: Dan Timoney <dtimoney@att.com>

23 files changed, 91 insertions, 2742 deletions

diff --git a/sli/model/src/main/yang-gen-sal/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/core/sliapi/rev161110/$YangModelBindingProvider.java b/sli/model/src/main/yang-gen-sal/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/core/sliapi/rev161110/$YangModelBindingProvider.java
deleted file mode 100644
index 5195da54..00000000
--- a/sli/model/src/main/yang-gen-sal/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/core/sliapi/rev161110/$YangModelBindingProvider.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110;
-
-public final class $YangModelBindingProvider implements org.opendaylight.yangtools.yang.binding.YangModelBindingProvider {
-    @Override
-    public org.opendaylight.yangtools.yang.binding.YangModuleInfo getModuleInfo() {
-        return $YangModuleInfoImpl.getInstance();
-    }
-}
diff --git a/sli/model/src/main/yang-gen-sal/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/core/sliapi/rev161110/$YangModuleInfoImpl.java b/sli/model/src/main/yang-gen-sal/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/core/sliapi/rev161110/$YangModuleInfoImpl.java
deleted file mode 100644
index e1cdacc5..00000000
--- a/sli/model/src/main/yang-gen-sal/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/core/sliapi/rev161110/$YangModuleInfoImpl.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110 ;
-import org.opendaylight.yangtools.yang.binding.YangModuleInfo;
-import java.util.Set;
-import java.util.HashSet;
-import com.google.common.collect.ImmutableSet;
-import java.io.InputStream;
-import java.io.IOException;
-public final class $YangModuleInfoImpl implements YangModuleInfo {
-
-    private static final YangModuleInfo INSTANCE = new $YangModuleInfoImpl();
-
-    private final java.lang.String name = "SLI-API";
-    private final java.lang.String namespace = "org:onap:ccsdk:sli:core:sliapi";
-    private final java.lang.String revision = "2016-11-10";
-    private final java.lang.String resourcePath = "/META-INF/yang/sliapi.yang";
-
-    private final Set<YangModuleInfo> importedModules;
-
-    public static YangModuleInfo getInstance() {
-        return INSTANCE;
-    }
-
-    private $YangModuleInfoImpl() {
-        Set<YangModuleInfo> set = new HashSet<>();
-        set.add(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.$YangModuleInfoImpl.getInstance());
-        importedModules = ImmutableSet.copyOf(set);
-    
-        InputStream stream = $YangModuleInfoImpl.class.getResourceAsStream(resourcePath);
-        if (stream == null) {
-            throw new IllegalStateException("Resource '" + resourcePath + "' is missing");
-        }
-        try {
-            stream.close();
-        } catch (IOException e) {
-        // Resource leak, but there is nothing we can do
-        }
-    }
-    
-    @Override
-    public java.lang.String getName() {
-        return name;
-    }
-    
-    @Override
-    public java.lang.String getRevision() {
-        return revision;
-    }
-    
-    @Override
-    public java.lang.String getNamespace() {
-        return namespace;
-    }
-    
-    @Override
-    public InputStream getModuleSourceStream() throws IOException {
-        InputStream stream = $YangModuleInfoImpl.class.getResourceAsStream(resourcePath);
-        if (stream == null) {
-            throw new IOException("Resource " + resourcePath + " is missing");
-        }
-        return stream;
-    }
-    
-    @Override
-    public Set<YangModuleInfo> getImportedModules() {
-        return importedModules;
-    }
-    
-    @Override
-    public java.lang.String toString() {
-        java.lang.StringBuilder sb = new java.lang.StringBuilder(this.getClass().getCanonicalName());
-        sb.append("[");
-        sb.append("name = " + name);
-        sb.append(", namespace = " + namespace);
-        sb.append(", revision = " + revision);
-        sb.append(", resourcePath = " + resourcePath);
-        sb.append(", imports = " + importedModules);
-        sb.append("]");
-        return sb.toString();
-    }
-    
-    
-}
diff --git a/sli/model/src/main/yang-gen-sal/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/core/sliapi/rev161110/ExecuteGraphInput.java b/sli/model/src/main/yang-gen-sal/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/core/sliapi/rev161110/ExecuteGraphInput.java
deleted file mode 100644
index 4045483e..00000000
--- a/sli/model/src/main/yang-gen-sal/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/core/sliapi/rev161110/ExecuteGraphInput.java
+++ /dev/null
@@ -1,128 +0,0 @@
-package org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110;
-import org.opendaylight.yangtools.yang.binding.DataObject;
-import org.opendaylight.yangtools.yang.common.QName;
-import java.util.List;
-import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.execute.graph.input.SliParameter;
-import org.opendaylight.yangtools.yang.binding.Augmentable;
-
-/**
- * <p>This class represents the following YANG schema fragment defined in module <b>SLI-API</b>
- * <pre>
- * container input {
- *     leaf module-name {
- *         type string;
- *     }
- *     leaf rpc-name {
- *         type string;
- *     }
- *     leaf mode {
- *         type enumeration;
- *     }
- *     list sli-parameter {
- *         key "parameter-name"
- *         leaf parameter-name {
- *             type string;
- *         }
- *         leaf int-value {
- *             type int32;
- *         }
- *         leaf string-value {
- *             type string;
- *         }
- *         leaf boolean-value {
- *             type boolean;
- *         }
- *         uses parameter-setting;
- *     }
- * }
- * </pre>
- * The schema path to identify an instance is
- * <i>SLI-API/execute-graph/input</i>
- *
- * <p>To create instances of this class use {@link org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphInputBuilder}.
- * @see org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphInputBuilder
- *
- */
-public interface ExecuteGraphInput
-    extends
-    DataObject,
-    Augmentable<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphInput>
-{
-
-
-    public enum Mode {
-        Sync(0, "sync"),
-        
-        Async(1, "async")
-        ;
-    
-    
-        java.lang.String name;
-        int value;
-        private static final java.util.Map<java.lang.Integer, Mode> VALUE_MAP;
-    
-        static {
-            final com.google.common.collect.ImmutableMap.Builder<java.lang.Integer, Mode> b = com.google.common.collect.ImmutableMap.builder();
-            for (Mode enumItem : Mode.values())
-            {
-                b.put(enumItem.value, enumItem);
-            }
-    
-            VALUE_MAP = b.build();
-        }
-    
-        private Mode(int value, java.lang.String name) {
-            this.value = value;
-            this.name = name;
-        }
-    
-        /**
-         * Returns the name of the enumeration item as it is specified in the input yang.
-         *
-         * @return the name of the enumeration item as it is specified in the input yang
-         */
-        public java.lang.String getName() {
-            return name;
-        }
-    
-        /**
-         * @return integer value
-         */
-        public int getIntValue() {
-            return value;
-        }
-    
-        /**
-         * @param valueArg
-         * @return corresponding Mode item
-         */
-        public static Mode forValue(int valueArg) {
-            return VALUE_MAP.get(valueArg);
-        }
-    }
-
-    public static final QName QNAME = org.opendaylight.yangtools.yang.common.QName.create("org:onap:ccsdk:sli:core:sliapi",
-        "2016-11-10", "input").intern();
-
-    /**
-     * @return <code>java.lang.String</code> <code>moduleName</code>, or <code>null</code> if not present
-     */
-    java.lang.String getModuleName();
-    
-    /**
-     * @return <code>java.lang.String</code> <code>rpcName</code>, or <code>null</code> if not present
-     */
-    java.lang.String getRpcName();
-    
-    /**
-     * @return <code>org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphInput.Mode</code> <code>mode</code>, or <code>null</code> if not present
-     */
-    Mode getMode();
-    
-    /**
-     * @return <code>java.util.List</code> <code>sliParameter</code>, or <code>null</code> if not present
-     */
-    List<SliParameter> getSliParameter();
-
-}
-
diff --git a/sli/model/src/main/yang-gen-sal/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/core/sliapi/rev161110/ExecuteGraphInputBuilder.java b/sli/model/src/main/yang-gen-sal/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/core/sliapi/rev161110/ExecuteGraphInputBuilder.java
deleted file mode 100644
index 9f28ef27..00000000
--- a/sli/model/src/main/yang-gen-sal/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/core/sliapi/rev161110/ExecuteGraphInputBuilder.java
+++ /dev/null
@@ -1,287 +0,0 @@
-package org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110;
-import org.opendaylight.yangtools.yang.binding.Augmentation;
-import org.opendaylight.yangtools.yang.binding.AugmentationHolder;
-import org.opendaylight.yangtools.yang.binding.DataObject;
-import java.util.HashMap;
-import org.opendaylight.yangtools.concepts.Builder;
-import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphInput.Mode;
-import java.util.Objects;
-import java.util.List;
-import java.util.Collections;
-import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.execute.graph.input.SliParameter;
-import java.util.Map;
-
-/**
- * Class that builds {@link org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphInput} instances.
- *
- * @see org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphInput
- *
- */
-public class ExecuteGraphInputBuilder implements Builder<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphInput> {
-
-    private Mode _mode;
-    private java.lang.String _moduleName;
-    private java.lang.String _rpcName;
-    private List<SliParameter> _sliParameter;
-
-    Map<java.lang.Class<? extends Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphInput>>, Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphInput>> augmentation = Collections.emptyMap();
-
-    public ExecuteGraphInputBuilder() {
-    }
-
-    public ExecuteGraphInputBuilder(ExecuteGraphInput base) {
-        this._mode = base.getMode();
-        this._moduleName = base.getModuleName();
-        this._rpcName = base.getRpcName();
-        this._sliParameter = base.getSliParameter();
-        if (base instanceof ExecuteGraphInputImpl) {
-            ExecuteGraphInputImpl impl = (ExecuteGraphInputImpl) base;
-            if (!impl.augmentation.isEmpty()) {
-                this.augmentation = new HashMap<>(impl.augmentation);
-            }
-        } else if (base instanceof AugmentationHolder) {
-            @SuppressWarnings("unchecked")
-            AugmentationHolder<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphInput> casted =(AugmentationHolder<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphInput>) base;
-            if (!casted.augmentations().isEmpty()) {
-                this.augmentation = new HashMap<>(casted.augmentations());
-            }
-        }
-    }
-
-
-    public Mode getMode() {
-        return _mode;
-    }
-    
-    public java.lang.String getModuleName() {
-        return _moduleName;
-    }
-    
-    public java.lang.String getRpcName() {
-        return _rpcName;
-    }
-    
-    public List<SliParameter> getSliParameter() {
-        return _sliParameter;
-    }
-    
-    @SuppressWarnings("unchecked")
-    public <E extends Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphInput>> E getAugmentation(java.lang.Class<E> augmentationType) {
-        if (augmentationType == null) {
-            throw new IllegalArgumentException("Augmentation Type reference cannot be NULL!");
-        }
-        return (E) augmentation.get(augmentationType);
-    }
-
-     
-    public ExecuteGraphInputBuilder setMode(final Mode value) {
-        this._mode = value;
-        return this;
-    }
-    
-     
-    public ExecuteGraphInputBuilder setModuleName(final java.lang.String value) {
-        this._moduleName = value;
-        return this;
-    }
-    
-     
-    public ExecuteGraphInputBuilder setRpcName(final java.lang.String value) {
-        this._rpcName = value;
-        return this;
-    }
-    
-     
-    public ExecuteGraphInputBuilder setSliParameter(final List<SliParameter> value) {
-        this._sliParameter = value;
-        return this;
-    }
-    
-    public ExecuteGraphInputBuilder addAugmentation(java.lang.Class<? extends Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphInput>> augmentationType, Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphInput> augmentation) {
-        if (augmentation == null) {
-            return removeAugmentation(augmentationType);
-        }
-    
-        if (!(this.augmentation instanceof HashMap)) {
-            this.augmentation = new HashMap<>();
-        }
-    
-        this.augmentation.put(augmentationType, augmentation);
-        return this;
-    }
-    
-    public ExecuteGraphInputBuilder removeAugmentation(java.lang.Class<? extends Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphInput>> augmentationType) {
-        if (this.augmentation instanceof HashMap) {
-            this.augmentation.remove(augmentationType);
-        }
-        return this;
-    }
-
-    @Override
-    public ExecuteGraphInput build() {
-        return new ExecuteGraphInputImpl(this);
-    }
-
-    private static final class ExecuteGraphInputImpl implements ExecuteGraphInput {
-
-        @Override
-        public java.lang.Class<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphInput> getImplementedInterface() {
-            return org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphInput.class;
-        }
-
-        private final Mode _mode;
-        private final java.lang.String _moduleName;
-        private final java.lang.String _rpcName;
-        private final List<SliParameter> _sliParameter;
-
-        private Map<java.lang.Class<? extends Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphInput>>, Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphInput>> augmentation = Collections.emptyMap();
-
-        private ExecuteGraphInputImpl(ExecuteGraphInputBuilder base) {
-            this._mode = base.getMode();
-            this._moduleName = base.getModuleName();
-            this._rpcName = base.getRpcName();
-            this._sliParameter = base.getSliParameter();
-            switch (base.augmentation.size()) {
-            case 0:
-                this.augmentation = Collections.emptyMap();
-                break;
-            case 1:
-                final Map.Entry<java.lang.Class<? extends Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphInput>>, Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphInput>> e = base.augmentation.entrySet().iterator().next();
-                this.augmentation = Collections.<java.lang.Class<? extends Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphInput>>, Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphInput>>singletonMap(e.getKey(), e.getValue());
-                break;
-            default :
-                this.augmentation = new HashMap<>(base.augmentation);
-            }
-        }
-
-        @Override
-        public Mode getMode() {
-            return _mode;
-        }
-        
-        @Override
-        public java.lang.String getModuleName() {
-            return _moduleName;
-        }
-        
-        @Override
-        public java.lang.String getRpcName() {
-            return _rpcName;
-        }
-        
-        @Override
-        public List<SliParameter> getSliParameter() {
-            return _sliParameter;
-        }
-        
-        @SuppressWarnings("unchecked")
-        @Override
-        public <E extends Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphInput>> E getAugmentation(java.lang.Class<E> augmentationType) {
-            if (augmentationType == null) {
-                throw new IllegalArgumentException("Augmentation Type reference cannot be NULL!");
-            }
-            return (E) augmentation.get(augmentationType);
-        }
-
-        private int hash = 0;
-        private volatile boolean hashValid = false;
-        
-        @Override
-        public int hashCode() {
-            if (hashValid) {
-                return hash;
-            }
-        
-            final int prime = 31;
-            int result = 1;
-            result = prime * result + Objects.hashCode(_mode);
-            result = prime * result + Objects.hashCode(_moduleName);
-            result = prime * result + Objects.hashCode(_rpcName);
-            result = prime * result + Objects.hashCode(_sliParameter);
-            result = prime * result + Objects.hashCode(augmentation);
-        
-            hash = result;
-            hashValid = true;
-            return result;
-        }
-
-        @Override
-        public boolean equals(java.lang.Object obj) {
-            if (this == obj) {
-                return true;
-            }
-            if (!(obj instanceof DataObject)) {
-                return false;
-            }
-            if (!org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphInput.class.equals(((DataObject)obj).getImplementedInterface())) {
-                return false;
-            }
-            org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphInput other = (org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphInput)obj;
-            if (!Objects.equals(_mode, other.getMode())) {
-                return false;
-            }
-            if (!Objects.equals(_moduleName, other.getModuleName())) {
-                return false;
-            }
-            if (!Objects.equals(_rpcName, other.getRpcName())) {
-                return false;
-            }
-            if (!Objects.equals(_sliParameter, other.getSliParameter())) {
-                return false;
-            }
-            if (getClass() == obj.getClass()) {
-                // Simple case: we are comparing against self
-                ExecuteGraphInputImpl otherImpl = (ExecuteGraphInputImpl) obj;
-                if (!Objects.equals(augmentation, otherImpl.augmentation)) {
-                    return false;
-                }
-            } else {
-                // Hard case: compare our augments with presence there...
-                for (Map.Entry<java.lang.Class<? extends Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphInput>>, Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphInput>> e : augmentation.entrySet()) {
-                    if (!e.getValue().equals(other.getAugmentation(e.getKey()))) {
-                        return false;
-                    }
-                }
-                // .. and give the other one the chance to do the same
-                if (!obj.equals(this)) {
-                    return false;
-                }
-            }
-            return true;
-        }
-
-        @Override
-        public java.lang.String toString() {
-            java.lang.String name = "ExecuteGraphInput [";
-            java.lang.StringBuilder builder = new java.lang.StringBuilder (name);
-            if (_mode != null) {
-                builder.append("_mode=");
-                builder.append(_mode);
-                builder.append(", ");
-            }
-            if (_moduleName != null) {
-                builder.append("_moduleName=");
-                builder.append(_moduleName);
-                builder.append(", ");
-            }
-            if (_rpcName != null) {
-                builder.append("_rpcName=");
-                builder.append(_rpcName);
-                builder.append(", ");
-            }
-            if (_sliParameter != null) {
-                builder.append("_sliParameter=");
-                builder.append(_sliParameter);
-            }
-            final int builderLength = builder.length();
-            final int builderAdditionalLength = builder.substring(name.length(), builderLength).length();
-            if (builderAdditionalLength > 2 && !builder.substring(builderLength - 2, builderLength).equals(", ")) {
-                builder.append(", ");
-            }
-            builder.append("augmentation=");
-            builder.append(augmentation.values());
-            return builder.append(']').toString();
-        }
-    }
-
-}
diff --git a/sli/model/src/main/yang-gen-sal/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/core/sliapi/rev161110/ExecuteGraphOutput.java b/sli/model/src/main/yang-gen-sal/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/core/sliapi/rev161110/ExecuteGraphOutput.java
deleted file mode 100644
index 08321c07..00000000
--- a/sli/model/src/main/yang-gen-sal/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/core/sliapi/rev161110/ExecuteGraphOutput.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110;
-import org.opendaylight.yangtools.yang.binding.DataObject;
-import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.binding.Augmentable;
-
-/**
- * <p>This class represents the following YANG schema fragment defined in module <b>SLI-API</b>
- * <pre>
- * container output {
- *     leaf response-code {
- *         type string;
- *     }
- *     leaf ack-final-indicator {
- *         type string;
- *     }
- *     leaf response-message {
- *         type string;
- *     }
- *     leaf context-memory-json {
- *         type string;
- *     }
- *     uses response-fields;
- * }
- * </pre>
- * The schema path to identify an instance is
- * <i>SLI-API/execute-graph/output</i>
- *
- * <p>To create instances of this class use {@link org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphOutputBuilder}.
- * @see org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphOutputBuilder
- *
- */
-public interface ExecuteGraphOutput
-    extends
-    ResponseFields,
-    DataObject,
-    Augmentable<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphOutput>
-{
-
-
-
-    public static final QName QNAME = org.opendaylight.yangtools.yang.common.QName.create("org:onap:ccsdk:sli:core:sliapi",
-        "2016-11-10", "output").intern();
-
-
-}
-
diff --git a/sli/model/src/main/yang-gen-sal/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/core/sliapi/rev161110/ExecuteGraphOutputBuilder.java b/sli/model/src/main/yang-gen-sal/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/core/sliapi/rev161110/ExecuteGraphOutputBuilder.java
deleted file mode 100644
index 7b613bb4..00000000
--- a/sli/model/src/main/yang-gen-sal/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/core/sliapi/rev161110/ExecuteGraphOutputBuilder.java
+++ /dev/null
@@ -1,315 +0,0 @@
-package org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110;
-import org.opendaylight.yangtools.yang.binding.Augmentation;
-import org.opendaylight.yangtools.yang.binding.AugmentationHolder;
-import org.opendaylight.yangtools.yang.binding.DataObject;
-import java.util.HashMap;
-import org.opendaylight.yangtools.concepts.Builder;
-import java.util.Objects;
-import java.util.Collections;
-import java.util.Map;
-
-/**
- * Class that builds {@link org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphOutput} instances.
- *
- * @see org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphOutput
- *
- */
-public class ExecuteGraphOutputBuilder implements Builder<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphOutput> {
-
-    private java.lang.String _ackFinalIndicator;
-    private java.lang.String _contextMemoryJson;
-    private java.lang.String _responseCode;
-    private java.lang.String _responseMessage;
-
-    Map<java.lang.Class<? extends Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphOutput>>, Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphOutput>> augmentation = Collections.emptyMap();
-
-    public ExecuteGraphOutputBuilder() {
-    }
-    public ExecuteGraphOutputBuilder(org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ResponseFields arg) {
-        this._responseCode = arg.getResponseCode();
-        this._ackFinalIndicator = arg.getAckFinalIndicator();
-        this._responseMessage = arg.getResponseMessage();
-        this._contextMemoryJson = arg.getContextMemoryJson();
-    }
-
-    public ExecuteGraphOutputBuilder(ExecuteGraphOutput base) {
-        this._ackFinalIndicator = base.getAckFinalIndicator();
-        this._contextMemoryJson = base.getContextMemoryJson();
-        this._responseCode = base.getResponseCode();
-        this._responseMessage = base.getResponseMessage();
-        if (base instanceof ExecuteGraphOutputImpl) {
-            ExecuteGraphOutputImpl impl = (ExecuteGraphOutputImpl) base;
-            if (!impl.augmentation.isEmpty()) {
-                this.augmentation = new HashMap<>(impl.augmentation);
-            }
-        } else if (base instanceof AugmentationHolder) {
-            @SuppressWarnings("unchecked")
-            AugmentationHolder<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphOutput> casted =(AugmentationHolder<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphOutput>) base;
-            if (!casted.augmentations().isEmpty()) {
-                this.augmentation = new HashMap<>(casted.augmentations());
-            }
-        }
-    }
-
-    /**
-     *Set fields from given grouping argument. Valid argument is instance of one of following types:
-     * <ul>
-     * <li>org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ResponseFields</li>
-     * </ul>
-     *
-     * @param arg grouping object
-     * @throws IllegalArgumentException if given argument is none of valid types
-    */
-    public void fieldsFrom(DataObject arg) {
-        boolean isValidArg = false;
-        if (arg instanceof org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ResponseFields) {
-            this._responseCode = ((org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ResponseFields)arg).getResponseCode();
-            this._ackFinalIndicator = ((org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ResponseFields)arg).getAckFinalIndicator();
-            this._responseMessage = ((org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ResponseFields)arg).getResponseMessage();
-            this._contextMemoryJson = ((org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ResponseFields)arg).getContextMemoryJson();
-            isValidArg = true;
-        }
-        if (!isValidArg) {
-            throw new IllegalArgumentException(
-              "expected one of: [org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ResponseFields] \n" +
-              "but was: " + arg
-            );
-        }
-    }
-
-    public java.lang.String getAckFinalIndicator() {
-        return _ackFinalIndicator;
-    }
-    
-    public java.lang.String getContextMemoryJson() {
-        return _contextMemoryJson;
-    }
-    
-    public java.lang.String getResponseCode() {
-        return _responseCode;
-    }
-    
-    public java.lang.String getResponseMessage() {
-        return _responseMessage;
-    }
-    
-    @SuppressWarnings("unchecked")
-    public <E extends Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphOutput>> E getAugmentation(java.lang.Class<E> augmentationType) {
-        if (augmentationType == null) {
-            throw new IllegalArgumentException("Augmentation Type reference cannot be NULL!");
-        }
-        return (E) augmentation.get(augmentationType);
-    }
-
-     
-    public ExecuteGraphOutputBuilder setAckFinalIndicator(final java.lang.String value) {
-        this._ackFinalIndicator = value;
-        return this;
-    }
-    
-     
-    public ExecuteGraphOutputBuilder setContextMemoryJson(final java.lang.String value) {
-        this._contextMemoryJson = value;
-        return this;
-    }
-    
-     
-    public ExecuteGraphOutputBuilder setResponseCode(final java.lang.String value) {
-        this._responseCode = value;
-        return this;
-    }
-    
-     
-    public ExecuteGraphOutputBuilder setResponseMessage(final java.lang.String value) {
-        this._responseMessage = value;
-        return this;
-    }
-    
-    public ExecuteGraphOutputBuilder addAugmentation(java.lang.Class<? extends Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphOutput>> augmentationType, Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphOutput> augmentation) {
-        if (augmentation == null) {
-            return removeAugmentation(augmentationType);
-        }
-    
-        if (!(this.augmentation instanceof HashMap)) {
-            this.augmentation = new HashMap<>();
-        }
-    
-        this.augmentation.put(augmentationType, augmentation);
-        return this;
-    }
-    
-    public ExecuteGraphOutputBuilder removeAugmentation(java.lang.Class<? extends Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphOutput>> augmentationType) {
-        if (this.augmentation instanceof HashMap) {
-            this.augmentation.remove(augmentationType);
-        }
-        return this;
-    }
-
-    @Override
-    public ExecuteGraphOutput build() {
-        return new ExecuteGraphOutputImpl(this);
-    }
-
-    private static final class ExecuteGraphOutputImpl implements ExecuteGraphOutput {
-
-        @Override
-        public java.lang.Class<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphOutput> getImplementedInterface() {
-            return org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphOutput.class;
-        }
-
-        private final java.lang.String _ackFinalIndicator;
-        private final java.lang.String _contextMemoryJson;
-        private final java.lang.String _responseCode;
-        private final java.lang.String _responseMessage;
-
-        private Map<java.lang.Class<? extends Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphOutput>>, Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphOutput>> augmentation = Collections.emptyMap();
-
-        private ExecuteGraphOutputImpl(ExecuteGraphOutputBuilder base) {
-            this._ackFinalIndicator = base.getAckFinalIndicator();
-            this._contextMemoryJson = base.getContextMemoryJson();
-            this._responseCode = base.getResponseCode();
-            this._responseMessage = base.getResponseMessage();
-            switch (base.augmentation.size()) {
-            case 0:
-                this.augmentation = Collections.emptyMap();
-                break;
-            case 1:
-                final Map.Entry<java.lang.Class<? extends Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphOutput>>, Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphOutput>> e = base.augmentation.entrySet().iterator().next();
-                this.augmentation = Collections.<java.lang.Class<? extends Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphOutput>>, Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphOutput>>singletonMap(e.getKey(), e.getValue());
-                break;
-            default :
-                this.augmentation = new HashMap<>(base.augmentation);
-            }
-        }
-
-        @Override
-        public java.lang.String getAckFinalIndicator() {
-            return _ackFinalIndicator;
-        }
-        
-        @Override
-        public java.lang.String getContextMemoryJson() {
-            return _contextMemoryJson;
-        }
-        
-        @Override
-        public java.lang.String getResponseCode() {
-            return _responseCode;
-        }
-        
-        @Override
-        public java.lang.String getResponseMessage() {
-            return _responseMessage;
-        }
-        
-        @SuppressWarnings("unchecked")
-        @Override
-        public <E extends Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphOutput>> E getAugmentation(java.lang.Class<E> augmentationType) {
-            if (augmentationType == null) {
-                throw new IllegalArgumentException("Augmentation Type reference cannot be NULL!");
-            }
-            return (E) augmentation.get(augmentationType);
-        }
-
-        private int hash = 0;
-        private volatile boolean hashValid = false;
-        
-        @Override
-        public int hashCode() {
-            if (hashValid) {
-                return hash;
-            }
-        
-            final int prime = 31;
-            int result = 1;
-            result = prime * result + Objects.hashCode(_ackFinalIndicator);
-            result = prime * result + Objects.hashCode(_contextMemoryJson);
-            result = prime * result + Objects.hashCode(_responseCode);
-            result = prime * result + Objects.hashCode(_responseMessage);
-            result = prime * result + Objects.hashCode(augmentation);
-        
-            hash = result;
-            hashValid = true;
-            return result;
-        }
-
-        @Override
-        public boolean equals(java.lang.Object obj) {
-            if (this == obj) {
-                return true;
-            }
-            if (!(obj instanceof DataObject)) {
-                return false;
-            }
-            if (!org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphOutput.class.equals(((DataObject)obj).getImplementedInterface())) {
-                return false;
-            }
-            org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphOutput other = (org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphOutput)obj;
-            if (!Objects.equals(_ackFinalIndicator, other.getAckFinalIndicator())) {
-                return false;
-            }
-            if (!Objects.equals(_contextMemoryJson, other.getContextMemoryJson())) {
-                return false;
-            }
-            if (!Objects.equals(_responseCode, other.getResponseCode())) {
-                return false;
-            }
-            if (!Objects.equals(_responseMessage, other.getResponseMessage())) {
-                return false;
-            }
-            if (getClass() == obj.getClass()) {
-                // Simple case: we are comparing against self
-                ExecuteGraphOutputImpl otherImpl = (ExecuteGraphOutputImpl) obj;
-                if (!Objects.equals(augmentation, otherImpl.augmentation)) {
-                    return false;
-                }
-            } else {
-                // Hard case: compare our augments with presence there...
-                for (Map.Entry<java.lang.Class<? extends Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphOutput>>, Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphOutput>> e : augmentation.entrySet()) {
-                    if (!e.getValue().equals(other.getAugmentation(e.getKey()))) {
-                        return false;
-                    }
-                }
-                // .. and give the other one the chance to do the same
-                if (!obj.equals(this)) {
-                    return false;
-                }
-            }
-            return true;
-        }
-
-        @Override
-        public java.lang.String toString() {
-            java.lang.String name = "ExecuteGraphOutput [";
-            java.lang.StringBuilder builder = new java.lang.StringBuilder (name);
-            if (_ackFinalIndicator != null) {
-                builder.append("_ackFinalIndicator=");
-                builder.append(_ackFinalIndicator);
-                builder.append(", ");
-            }
-            if (_contextMemoryJson != null) {
-                builder.append("_contextMemoryJson=");
-                builder.append(_contextMemoryJson);
-                builder.append(", ");
-            }
-            if (_responseCode != null) {
-                builder.append("_responseCode=");
-                builder.append(_responseCode);
-                builder.append(", ");
-            }
-            if (_responseMessage != null) {
-                builder.append("_responseMessage=");
-                builder.append(_responseMessage);
-            }
-            final int builderLength = builder.length();
-            final int builderAdditionalLength = builder.substring(name.length(), builderLength).length();
-            if (builderAdditionalLength > 2 && !builder.substring(builderLength - 2, builderLength).equals(", ")) {
-                builder.append(", ");
-            }
-            builder.append("augmentation=");
-            builder.append(augmentation.values());
-            return builder.append(']').toString();
-        }
-    }
-
-}
diff --git a/sli/model/src/main/yang-gen-sal/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/core/sliapi/rev161110/HealthcheckOutput.java b/sli/model/src/main/yang-gen-sal/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/core/sliapi/rev161110/HealthcheckOutput.java
deleted file mode 100644
index b0dd3b1b..00000000
--- a/sli/model/src/main/yang-gen-sal/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/core/sliapi/rev161110/HealthcheckOutput.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110;
-import org.opendaylight.yangtools.yang.binding.DataObject;
-import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.binding.Augmentable;
-
-/**
- * <p>This class represents the following YANG schema fragment defined in module <b>SLI-API</b>
- * <pre>
- * container output {
- *     leaf response-code {
- *         type string;
- *     }
- *     leaf ack-final-indicator {
- *         type string;
- *     }
- *     leaf response-message {
- *         type string;
- *     }
- *     leaf context-memory-json {
- *         type string;
- *     }
- *     uses response-fields;
- * }
- * </pre>
- * The schema path to identify an instance is
- * <i>SLI-API/healthcheck/output</i>
- *
- * <p>To create instances of this class use {@link org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.HealthcheckOutputBuilder}.
- * @see org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.HealthcheckOutputBuilder
- *
- */
-public interface HealthcheckOutput
-    extends
-    ResponseFields,
-    DataObject,
-    Augmentable<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.HealthcheckOutput>
-{
-
-
-
-    public static final QName QNAME = org.opendaylight.yangtools.yang.common.QName.create("org:onap:ccsdk:sli:core:sliapi",
-        "2016-11-10", "output").intern();
-
-
-}
-
diff --git a/sli/model/src/main/yang-gen-sal/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/core/sliapi/rev161110/HealthcheckOutputBuilder.java b/sli/model/src/main/yang-gen-sal/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/core/sliapi/rev161110/HealthcheckOutputBuilder.java
deleted file mode 100644
index de784032..00000000
--- a/sli/model/src/main/yang-gen-sal/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/core/sliapi/rev161110/HealthcheckOutputBuilder.java
+++ /dev/null
@@ -1,315 +0,0 @@
-package org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110;
-import org.opendaylight.yangtools.yang.binding.Augmentation;
-import org.opendaylight.yangtools.yang.binding.AugmentationHolder;
-import org.opendaylight.yangtools.yang.binding.DataObject;
-import java.util.HashMap;
-import org.opendaylight.yangtools.concepts.Builder;
-import java.util.Objects;
-import java.util.Collections;
-import java.util.Map;
-
-/**
- * Class that builds {@link org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.HealthcheckOutput} instances.
- *
- * @see org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.HealthcheckOutput
- *
- */
-public class HealthcheckOutputBuilder implements Builder<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.HealthcheckOutput> {
-
-    private java.lang.String _ackFinalIndicator;
-    private java.lang.String _contextMemoryJson;
-    private java.lang.String _responseCode;
-    private java.lang.String _responseMessage;
-
-    Map<java.lang.Class<? extends Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.HealthcheckOutput>>, Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.HealthcheckOutput>> augmentation = Collections.emptyMap();
-
-    public HealthcheckOutputBuilder() {
-    }
-    public HealthcheckOutputBuilder(org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ResponseFields arg) {
-        this._responseCode = arg.getResponseCode();
-        this._ackFinalIndicator = arg.getAckFinalIndicator();
-        this._responseMessage = arg.getResponseMessage();
-        this._contextMemoryJson = arg.getContextMemoryJson();
-    }
-
-    public HealthcheckOutputBuilder(HealthcheckOutput base) {
-        this._ackFinalIndicator = base.getAckFinalIndicator();
-        this._contextMemoryJson = base.getContextMemoryJson();
-        this._responseCode = base.getResponseCode();
-        this._responseMessage = base.getResponseMessage();
-        if (base instanceof HealthcheckOutputImpl) {
-            HealthcheckOutputImpl impl = (HealthcheckOutputImpl) base;
-            if (!impl.augmentation.isEmpty()) {
-                this.augmentation = new HashMap<>(impl.augmentation);
-            }
-        } else if (base instanceof AugmentationHolder) {
-            @SuppressWarnings("unchecked")
-            AugmentationHolder<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.HealthcheckOutput> casted =(AugmentationHolder<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.HealthcheckOutput>) base;
-            if (!casted.augmentations().isEmpty()) {
-                this.augmentation = new HashMap<>(casted.augmentations());
-            }
-        }
-    }
-
-    /**
-     *Set fields from given grouping argument. Valid argument is instance of one of following types:
-     * <ul>
-     * <li>org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ResponseFields</li>
-     * </ul>
-     *
-     * @param arg grouping object
-     * @throws IllegalArgumentException if given argument is none of valid types
-    */
-    public void fieldsFrom(DataObject arg) {
-        boolean isValidArg = false;
-        if (arg instanceof org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ResponseFields) {
-            this._responseCode = ((org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ResponseFields)arg).getResponseCode();
-            this._ackFinalIndicator = ((org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ResponseFields)arg).getAckFinalIndicator();
-            this._responseMessage = ((org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ResponseFields)arg).getResponseMessage();
-            this._contextMemoryJson = ((org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ResponseFields)arg).getContextMemoryJson();
-            isValidArg = true;
-        }
-        if (!isValidArg) {
-            throw new IllegalArgumentException(
-              "expected one of: [org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ResponseFields] \n" +
-              "but was: " + arg
-            );
-        }
-    }
-
-    public java.lang.String getAckFinalIndicator() {
-        return _ackFinalIndicator;
-    }
-    
-    public java.lang.String getContextMemoryJson() {
-        return _contextMemoryJson;
-    }
-    
-    public java.lang.String getResponseCode() {
-        return _responseCode;
-    }
-    
-    public java.lang.String getResponseMessage() {
-        return _responseMessage;
-    }
-    
-    @SuppressWarnings("unchecked")
-    public <E extends Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.HealthcheckOutput>> E getAugmentation(java.lang.Class<E> augmentationType) {
-        if (augmentationType == null) {
-            throw new IllegalArgumentException("Augmentation Type reference cannot be NULL!");
-        }
-        return (E) augmentation.get(augmentationType);
-    }
-
-     
-    public HealthcheckOutputBuilder setAckFinalIndicator(final java.lang.String value) {
-        this._ackFinalIndicator = value;
-        return this;
-    }
-    
-     
-    public HealthcheckOutputBuilder setContextMemoryJson(final java.lang.String value) {
-        this._contextMemoryJson = value;
-        return this;
-    }
-    
-     
-    public HealthcheckOutputBuilder setResponseCode(final java.lang.String value) {
-        this._responseCode = value;
-        return this;
-    }
-    
-     
-    public HealthcheckOutputBuilder setResponseMessage(final java.lang.String value) {
-        this._responseMessage = value;
-        return this;
-    }
-    
-    public HealthcheckOutputBuilder addAugmentation(java.lang.Class<? extends Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.HealthcheckOutput>> augmentationType, Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.HealthcheckOutput> augmentation) {
-        if (augmentation == null) {
-            return removeAugmentation(augmentationType);
-        }
-    
-        if (!(this.augmentation instanceof HashMap)) {
-            this.augmentation = new HashMap<>();
-        }
-    
-        this.augmentation.put(augmentationType, augmentation);
-        return this;
-    }
-    
-    public HealthcheckOutputBuilder removeAugmentation(java.lang.Class<? extends Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.HealthcheckOutput>> augmentationType) {
-        if (this.augmentation instanceof HashMap) {
-            this.augmentation.remove(augmentationType);
-        }
-        return this;
-    }
-
-    @Override
-    public HealthcheckOutput build() {
-        return new HealthcheckOutputImpl(this);
-    }
-
-    private static final class HealthcheckOutputImpl implements HealthcheckOutput {
-
-        @Override
-        public java.lang.Class<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.HealthcheckOutput> getImplementedInterface() {
-            return org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.HealthcheckOutput.class;
-        }
-
-        private final java.lang.String _ackFinalIndicator;
-        private final java.lang.String _contextMemoryJson;
-        private final java.lang.String _responseCode;
-        private final java.lang.String _responseMessage;
-
-        private Map<java.lang.Class<? extends Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.HealthcheckOutput>>, Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.HealthcheckOutput>> augmentation = Collections.emptyMap();
-
-        private HealthcheckOutputImpl(HealthcheckOutputBuilder base) {
-            this._ackFinalIndicator = base.getAckFinalIndicator();
-            this._contextMemoryJson = base.getContextMemoryJson();
-            this._responseCode = base.getResponseCode();
-            this._responseMessage = base.getResponseMessage();
-            switch (base.augmentation.size()) {
-            case 0:
-                this.augmentation = Collections.emptyMap();
-                break;
-            case 1:
-                final Map.Entry<java.lang.Class<? extends Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.HealthcheckOutput>>, Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.HealthcheckOutput>> e = base.augmentation.entrySet().iterator().next();
-                this.augmentation = Collections.<java.lang.Class<? extends Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.HealthcheckOutput>>, Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.HealthcheckOutput>>singletonMap(e.getKey(), e.getValue());
-                break;
-            default :
-                this.augmentation = new HashMap<>(base.augmentation);
-            }
-        }
-
-        @Override
-        public java.lang.String getAckFinalIndicator() {
-            return _ackFinalIndicator;
-        }
-        
-        @Override
-        public java.lang.String getContextMemoryJson() {
-            return _contextMemoryJson;
-        }
-        
-        @Override
-        public java.lang.String getResponseCode() {
-            return _responseCode;
-        }
-        
-        @Override
-        public java.lang.String getResponseMessage() {
-            return _responseMessage;
-        }
-        
-        @SuppressWarnings("unchecked")
-        @Override
-        public <E extends Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.HealthcheckOutput>> E getAugmentation(java.lang.Class<E> augmentationType) {
-            if (augmentationType == null) {
-                throw new IllegalArgumentException("Augmentation Type reference cannot be NULL!");
-            }
-            return (E) augmentation.get(augmentationType);
-        }
-
-        private int hash = 0;
-        private volatile boolean hashValid = false;
-        
-        @Override
-        public int hashCode() {
-            if (hashValid) {
-                return hash;
-            }
-        
-            final int prime = 31;
-            int result = 1;
-            result = prime * result + Objects.hashCode(_ackFinalIndicator);
-            result = prime * result + Objects.hashCode(_contextMemoryJson);
-            result = prime * result + Objects.hashCode(_responseCode);
-            result = prime * result + Objects.hashCode(_responseMessage);
-            result = prime * result + Objects.hashCode(augmentation);
-        
-            hash = result;
-            hashValid = true;
-            return result;
-        }
-
-        @Override
-        public boolean equals(java.lang.Object obj) {
-            if (this == obj) {
-                return true;
-            }
-            if (!(obj instanceof DataObject)) {
-                return false;
-            }
-            if (!org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.HealthcheckOutput.class.equals(((DataObject)obj).getImplementedInterface())) {
-                return false;
-            }
-            org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.HealthcheckOutput other = (org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.HealthcheckOutput)obj;
-            if (!Objects.equals(_ackFinalIndicator, other.getAckFinalIndicator())) {
-                return false;
-            }
-            if (!Objects.equals(_contextMemoryJson, other.getContextMemoryJson())) {
-                return false;
-            }
-            if (!Objects.equals(_responseCode, other.getResponseCode())) {
-                return false;
-            }
-            if (!Objects.equals(_responseMessage, other.getResponseMessage())) {
-                return false;
-            }
-            if (getClass() == obj.getClass()) {
-                // Simple case: we are comparing against self
-                HealthcheckOutputImpl otherImpl = (HealthcheckOutputImpl) obj;
-                if (!Objects.equals(augmentation, otherImpl.augmentation)) {
-                    return false;
-                }
-            } else {
-                // Hard case: compare our augments with presence there...
-                for (Map.Entry<java.lang.Class<? extends Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.HealthcheckOutput>>, Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.HealthcheckOutput>> e : augmentation.entrySet()) {
-                    if (!e.getValue().equals(other.getAugmentation(e.getKey()))) {
-                        return false;
-                    }
-                }
-                // .. and give the other one the chance to do the same
-                if (!obj.equals(this)) {
-                    return false;
-                }
-            }
-            return true;
-        }
-
-        @Override
-        public java.lang.String toString() {
-            java.lang.String name = "HealthcheckOutput [";
-            java.lang.StringBuilder builder = new java.lang.StringBuilder (name);
-            if (_ackFinalIndicator != null) {
-                builder.append("_ackFinalIndicator=");
-                builder.append(_ackFinalIndicator);
-                builder.append(", ");
-            }
-            if (_contextMemoryJson != null) {
-                builder.append("_contextMemoryJson=");
-                builder.append(_contextMemoryJson);
-                builder.append(", ");
-            }
-            if (_responseCode != null) {
-                builder.append("_responseCode=");
-                builder.append(_responseCode);
-                builder.append(", ");
-            }
-            if (_responseMessage != null) {
-                builder.append("_responseMessage=");
-                builder.append(_responseMessage);
-            }
-            final int builderLength = builder.length();
-            final int builderAdditionalLength = builder.substring(name.length(), builderLength).length();
-            if (builderAdditionalLength > 2 && !builder.substring(builderLength - 2, builderLength).equals(", ")) {
-                builder.append(", ");
-            }
-            builder.append("augmentation=");
-            builder.append(augmentation.values());
-            return builder.append(']').toString();
-        }
-    }
-
-}
diff --git a/sli/model/src/main/yang-gen-sal/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/core/sliapi/rev161110/ParameterSetting.java b/sli/model/src/main/yang-gen-sal/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/core/sliapi/rev161110/ParameterSetting.java
deleted file mode 100644
index e2d610b6..00000000
--- a/sli/model/src/main/yang-gen-sal/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/core/sliapi/rev161110/ParameterSetting.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110;
-import org.opendaylight.yangtools.yang.binding.DataObject;
-import org.opendaylight.yangtools.yang.common.QName;
-
-/**
- * Parameter setting
- *
- * <p>This class represents the following YANG schema fragment defined in module <b>SLI-API</b>
- * <pre>
- * grouping parameter-setting {
- *     leaf parameter-name {
- *         type string;
- *     }
- *     leaf int-value {
- *         type int32;
- *     }
- *     leaf string-value {
- *         type string;
- *     }
- *     leaf boolean-value {
- *         type boolean;
- *     }
- * }
- * </pre>
- * The schema path to identify an instance is
- * <i>SLI-API/parameter-setting</i>
- *
- */
-public interface ParameterSetting
-    extends
-    DataObject
-{
-
-
-
-    public static final QName QNAME = org.opendaylight.yangtools.yang.common.QName.create("org:onap:ccsdk:sli:core:sliapi",
-        "2016-11-10", "parameter-setting").intern();
-
-    /**
-     * Parameter name
-     *
-     *
-     *
-     * @return <code>java.lang.String</code> <code>parameterName</code>, or <code>null</code> if not present
-     */
-    java.lang.String getParameterName();
-    
-    /**
-     * @return <code>java.lang.Integer</code> <code>intValue</code>, or <code>null</code> if not present
-     */
-    java.lang.Integer getIntValue();
-    
-    /**
-     * @return <code>java.lang.String</code> <code>stringValue</code>, or <code>null</code> if not present
-     */
-    java.lang.String getStringValue();
-    
-    /**
-     * @return <code>java.lang.Boolean</code> <code>booleanValue</code>, or <code>null</code> if not present
-     */
-    java.lang.Boolean isBooleanValue();
-
-}
-
diff --git a/sli/model/src/main/yang-gen-sal/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/core/sliapi/rev161110/ResponseFields.java b/sli/model/src/main/yang-gen-sal/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/core/sliapi/rev161110/ResponseFields.java
deleted file mode 100644
index 440beea0..00000000
--- a/sli/model/src/main/yang-gen-sal/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/core/sliapi/rev161110/ResponseFields.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110;
-import org.opendaylight.yangtools.yang.binding.DataObject;
-import org.opendaylight.yangtools.yang.common.QName;
-
-/**
- * <p>This class represents the following YANG schema fragment defined in module <b>SLI-API</b>
- * <pre>
- * grouping response-fields {
- *     leaf response-code {
- *         type string;
- *     }
- *     leaf ack-final-indicator {
- *         type string;
- *     }
- *     leaf response-message {
- *         type string;
- *     }
- *     leaf context-memory-json {
- *         type string;
- *     }
- * }
- * </pre>
- * The schema path to identify an instance is
- * <i>SLI-API/response-fields</i>
- *
- */
-public interface ResponseFields
-    extends
-    DataObject
-{
-
-
-
-    public static final QName QNAME = org.opendaylight.yangtools.yang.common.QName.create("org:onap:ccsdk:sli:core:sliapi",
-        "2016-11-10", "response-fields").intern();
-
-    /**
-     * @return <code>java.lang.String</code> <code>responseCode</code>, or <code>null</code> if not present
-     */
-    java.lang.String getResponseCode();
-    
-    /**
-     * @return <code>java.lang.String</code> <code>ackFinalIndicator</code>, or <code>null</code> if not present
-     */
-    java.lang.String getAckFinalIndicator();
-    
-    /**
-     * @return <code>java.lang.String</code> <code>responseMessage</code>, or <code>null</code> if not present
-     */
-    java.lang.String getResponseMessage();
-    
-    /**
-     * @return <code>java.lang.String</code> <code>contextMemoryJson</code>, or <code>null</code> if not present
-     */
-    java.lang.String getContextMemoryJson();
-
-}
-
diff --git a/sli/model/src/main/yang-gen-sal/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/core/sliapi/rev161110/SLIAPIData.java b/sli/model/src/main/yang-gen-sal/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/core/sliapi/rev161110/SLIAPIData.java
deleted file mode 100644
index 1917b475..00000000
--- a/sli/model/src/main/yang-gen-sal/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/core/sliapi/rev161110/SLIAPIData.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110;
-import org.opendaylight.yangtools.yang.binding.DataRoot;
-
-/**
- * Defines API to service logic interpreter
- *
- * <p>This class represents the following YANG schema fragment defined in module <b>SLI-API</b>
- * <pre>
- * module SLI-API {
- *     yang-version 1;
- *     namespace "org:onap:ccsdk:sli:core:sliapi";
- *     prefix "sample";
- *
- *     import ietf-inet-types { prefix "inet"; }
- *     revision 2016-11-10 {
- *         description "Defines API to service logic interpreter
- *         ";
- *     }
- *
- *     container test-results {
- *         list test-result {
- *             key "test-identifier"
- *             leaf test-identifier {
- *                 type string;
- *             }
- *             leaf-list results {
- *                 type string;
- *             }
- *         }
- *     }
- *
- *     grouping response-fields {
- *         leaf response-code {
- *             type string;
- *         }
- *         leaf ack-final-indicator {
- *             type string;
- *         }
- *         leaf response-message {
- *             type string;
- *         }
- *         leaf context-memory-json {
- *             type string;
- *         }
- *     }
- *     grouping parameter-setting {
- *         leaf parameter-name {
- *             type string;
- *         }
- *         leaf int-value {
- *             type int32;
- *         }
- *         leaf string-value {
- *             type string;
- *         }
- *         leaf boolean-value {
- *             type boolean;
- *         }
- *     }
- *
- *     rpc healthcheck {
- *         input {
- *         }
- *         
- *         output {
- *             leaf response-code {
- *                 type string;
- *             }
- *             leaf ack-final-indicator {
- *                 type string;
- *             }
- *             leaf response-message {
- *                 type string;
- *             }
- *             leaf context-memory-json {
- *                 type string;
- *             }
- *         }
- *     }
- *     rpc execute-graph {
- *         " Method to add a new parameter.";
- *         input {
- *             leaf module-name {
- *                 type string;
- *             }
- *             leaf rpc-name {
- *                 type string;
- *             }
- *             leaf mode {
- *                 type enumeration;
- *             }
- *             list sli-parameter {
- *                 key "parameter-name"
- *                 leaf parameter-name {
- *                     type string;
- *                 }
- *                 leaf int-value {
- *                     type int32;
- *                 }
- *                 leaf string-value {
- *                     type string;
- *                 }
- *                 leaf boolean-value {
- *                     type boolean;
- *                 }
- *                 uses parameter-setting;
- *             }
- *         }
- *         
- *         output {
- *             leaf response-code {
- *                 type string;
- *             }
- *             leaf ack-final-indicator {
- *                 type string;
- *             }
- *             leaf response-message {
- *                 type string;
- *             }
- *             leaf context-memory-json {
- *                 type string;
- *             }
- *         }
- *     }
- * }
- * </pre>
- *
- */
-public interface SLIAPIData
-    extends
-    DataRoot
-{
-
-
-
-
-    /**
-     * Test results
-     *
-     *
-     *
-     * @return <code>org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.TestResults</code> <code>testResults</code>, or <code>null</code> if not present
-     */
-    TestResults getTestResults();
-
-}
-
diff --git a/sli/model/src/main/yang-gen-sal/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/core/sliapi/rev161110/SLIAPIService.java b/sli/model/src/main/yang-gen-sal/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/core/sliapi/rev161110/SLIAPIService.java
deleted file mode 100644
index 3ad03f6f..00000000
--- a/sli/model/src/main/yang-gen-sal/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/core/sliapi/rev161110/SLIAPIService.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110;
-import org.opendaylight.yangtools.yang.binding.RpcService;
-import org.opendaylight.yangtools.yang.common.RpcResult;
-import java.util.concurrent.Future;
-
-/**
- * Interface for implementing the following YANG RPCs defined in module <b>SLI-API</b>
- * <pre>
- * rpc healthcheck {
- *     input {
- *     }
- *     
- *     output {
- *         leaf response-code {
- *             type string;
- *         }
- *         leaf ack-final-indicator {
- *             type string;
- *         }
- *         leaf response-message {
- *             type string;
- *         }
- *         leaf context-memory-json {
- *             type string;
- *         }
- *     }
- * }
- * rpc execute-graph {
- *     " Method to add a new parameter.";
- *     input {
- *         leaf module-name {
- *             type string;
- *         }
- *         leaf rpc-name {
- *             type string;
- *         }
- *         leaf mode {
- *             type enumeration;
- *         }
- *         list sli-parameter {
- *             key "parameter-name"
- *             leaf parameter-name {
- *                 type string;
- *             }
- *             leaf int-value {
- *                 type int32;
- *             }
- *             leaf string-value {
- *                 type string;
- *             }
- *             leaf boolean-value {
- *                 type boolean;
- *             }
- *             uses parameter-setting;
- *         }
- *     }
- *     
- *     output {
- *         leaf response-code {
- *             type string;
- *         }
- *         leaf ack-final-indicator {
- *             type string;
- *         }
- *         leaf response-message {
- *             type string;
- *         }
- *         leaf context-memory-json {
- *             type string;
- *         }
- *     }
- * }
- * </pre>
- *
- */
-public interface SLIAPIService
-    extends
-    RpcService
-{
-
-
-
-
-    Future<RpcResult<HealthcheckOutput>> healthcheck();
-    
-    /**
-     * Method to add a new parameter.
-     *
-     */
-    Future<RpcResult<ExecuteGraphOutput>> executeGraph(ExecuteGraphInput input);
-
-}
-
diff --git a/sli/model/src/main/yang-gen-sal/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/core/sliapi/rev161110/TestResults.java b/sli/model/src/main/yang-gen-sal/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/core/sliapi/rev161110/TestResults.java
deleted file mode 100644
index a1723d73..00000000
--- a/sli/model/src/main/yang-gen-sal/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/core/sliapi/rev161110/TestResults.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110;
-import org.opendaylight.yangtools.yang.binding.ChildOf;
-import org.opendaylight.yangtools.yang.common.QName;
-import java.util.List;
-import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.test.results.TestResult;
-import org.opendaylight.yangtools.yang.binding.Augmentable;
-
-/**
- * Test results
- *
- * <p>This class represents the following YANG schema fragment defined in module <b>SLI-API</b>
- * <pre>
- * container test-results {
- *     list test-result {
- *         key "test-identifier"
- *         leaf test-identifier {
- *             type string;
- *         }
- *         leaf-list results {
- *             type string;
- *         }
- *     }
- * }
- * </pre>
- * The schema path to identify an instance is
- * <i>SLI-API/test-results</i>
- *
- * <p>To create instances of this class use {@link org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.TestResultsBuilder}.
- * @see org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.TestResultsBuilder
- *
- */
-public interface TestResults
-    extends
-    ChildOf<SLIAPIData>,
-    Augmentable<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.TestResults>
-{
-
-
-
-    public static final QName QNAME = org.opendaylight.yangtools.yang.common.QName.create("org:onap:ccsdk:sli:core:sliapi",
-        "2016-11-10", "test-results").intern();
-
-    /**
-     * @return <code>java.util.List</code> <code>testResult</code>, or <code>null</code> if not present
-     */
-    List<TestResult> getTestResult();
-
-}
-
diff --git a/sli/model/src/main/yang-gen-sal/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/core/sliapi/rev161110/TestResultsBuilder.java b/sli/model/src/main/yang-gen-sal/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/core/sliapi/rev161110/TestResultsBuilder.java
deleted file mode 100644
index 36da730e..00000000
--- a/sli/model/src/main/yang-gen-sal/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/core/sliapi/rev161110/TestResultsBuilder.java
+++ /dev/null
@@ -1,202 +0,0 @@
-package org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110;
-import org.opendaylight.yangtools.yang.binding.Augmentation;
-import org.opendaylight.yangtools.yang.binding.AugmentationHolder;
-import org.opendaylight.yangtools.yang.binding.DataObject;
-import java.util.HashMap;
-import org.opendaylight.yangtools.concepts.Builder;
-import java.util.Objects;
-import java.util.List;
-import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.test.results.TestResult;
-import java.util.Collections;
-import java.util.Map;
-
-/**
- * Class that builds {@link org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.TestResults} instances.
- *
- * @see org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.TestResults
- *
- */
-public class TestResultsBuilder implements Builder<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.TestResults> {
-
-    private List<TestResult> _testResult;
-
-    Map<java.lang.Class<? extends Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.TestResults>>, Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.TestResults>> augmentation = Collections.emptyMap();
-
-    public TestResultsBuilder() {
-    }
-
-    public TestResultsBuilder(TestResults base) {
-        this._testResult = base.getTestResult();
-        if (base instanceof TestResultsImpl) {
-            TestResultsImpl impl = (TestResultsImpl) base;
-            if (!impl.augmentation.isEmpty()) {
-                this.augmentation = new HashMap<>(impl.augmentation);
-            }
-        } else if (base instanceof AugmentationHolder) {
-            @SuppressWarnings("unchecked")
-            AugmentationHolder<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.TestResults> casted =(AugmentationHolder<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.TestResults>) base;
-            if (!casted.augmentations().isEmpty()) {
-                this.augmentation = new HashMap<>(casted.augmentations());
-            }
-        }
-    }
-
-
-    public List<TestResult> getTestResult() {
-        return _testResult;
-    }
-    
-    @SuppressWarnings("unchecked")
-    public <E extends Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.TestResults>> E getAugmentation(java.lang.Class<E> augmentationType) {
-        if (augmentationType == null) {
-            throw new IllegalArgumentException("Augmentation Type reference cannot be NULL!");
-        }
-        return (E) augmentation.get(augmentationType);
-    }
-
-     
-    public TestResultsBuilder setTestResult(final List<TestResult> value) {
-        this._testResult = value;
-        return this;
-    }
-    
-    public TestResultsBuilder addAugmentation(java.lang.Class<? extends Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.TestResults>> augmentationType, Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.TestResults> augmentation) {
-        if (augmentation == null) {
-            return removeAugmentation(augmentationType);
-        }
-    
-        if (!(this.augmentation instanceof HashMap)) {
-            this.augmentation = new HashMap<>();
-        }
-    
-        this.augmentation.put(augmentationType, augmentation);
-        return this;
-    }
-    
-    public TestResultsBuilder removeAugmentation(java.lang.Class<? extends Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.TestResults>> augmentationType) {
-        if (this.augmentation instanceof HashMap) {
-            this.augmentation.remove(augmentationType);
-        }
-        return this;
-    }
-
-    @Override
-    public TestResults build() {
-        return new TestResultsImpl(this);
-    }
-
-    private static final class TestResultsImpl implements TestResults {
-
-        @Override
-        public java.lang.Class<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.TestResults> getImplementedInterface() {
-            return org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.TestResults.class;
-        }
-
-        private final List<TestResult> _testResult;
-
-        private Map<java.lang.Class<? extends Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.TestResults>>, Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.TestResults>> augmentation = Collections.emptyMap();
-
-        private TestResultsImpl(TestResultsBuilder base) {
-            this._testResult = base.getTestResult();
-            switch (base.augmentation.size()) {
-            case 0:
-                this.augmentation = Collections.emptyMap();
-                break;
-            case 1:
-                final Map.Entry<java.lang.Class<? extends Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.TestResults>>, Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.TestResults>> e = base.augmentation.entrySet().iterator().next();
-                this.augmentation = Collections.<java.lang.Class<? extends Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.TestResults>>, Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.TestResults>>singletonMap(e.getKey(), e.getValue());
-                break;
-            default :
-                this.augmentation = new HashMap<>(base.augmentation);
-            }
-        }
-
-        @Override
-        public List<TestResult> getTestResult() {
-            return _testResult;
-        }
-        
-        @SuppressWarnings("unchecked")
-        @Override
-        public <E extends Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.TestResults>> E getAugmentation(java.lang.Class<E> augmentationType) {
-            if (augmentationType == null) {
-                throw new IllegalArgumentException("Augmentation Type reference cannot be NULL!");
-            }
-            return (E) augmentation.get(augmentationType);
-        }
-
-        private int hash = 0;
-        private volatile boolean hashValid = false;
-        
-        @Override
-        public int hashCode() {
-            if (hashValid) {
-                return hash;
-            }
-        
-            final int prime = 31;
-            int result = 1;
-            result = prime * result + Objects.hashCode(_testResult);
-            result = prime * result + Objects.hashCode(augmentation);
-        
-            hash = result;
-            hashValid = true;
-            return result;
-        }
-
-        @Override
-        public boolean equals(java.lang.Object obj) {
-            if (this == obj) {
-                return true;
-            }
-            if (!(obj instanceof DataObject)) {
-                return false;
-            }
-            if (!org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.TestResults.class.equals(((DataObject)obj).getImplementedInterface())) {
-                return false;
-            }
-            org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.TestResults other = (org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.TestResults)obj;
-            if (!Objects.equals(_testResult, other.getTestResult())) {
-                return false;
-            }
-            if (getClass() == obj.getClass()) {
-                // Simple case: we are comparing against self
-                TestResultsImpl otherImpl = (TestResultsImpl) obj;
-                if (!Objects.equals(augmentation, otherImpl.augmentation)) {
-                    return false;
-                }
-            } else {
-                // Hard case: compare our augments with presence there...
-                for (Map.Entry<java.lang.Class<? extends Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.TestResults>>, Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.TestResults>> e : augmentation.entrySet()) {
-                    if (!e.getValue().equals(other.getAugmentation(e.getKey()))) {
-                        return false;
-                    }
-                }
-                // .. and give the other one the chance to do the same
-                if (!obj.equals(this)) {
-                    return false;
-                }
-            }
-            return true;
-        }
-
-        @Override
-        public java.lang.String toString() {
-            java.lang.String name = "TestResults [";
-            java.lang.StringBuilder builder = new java.lang.StringBuilder (name);
-            if (_testResult != null) {
-                builder.append("_testResult=");
-                builder.append(_testResult);
-            }
-            final int builderLength = builder.length();
-            final int builderAdditionalLength = builder.substring(name.length(), builderLength).length();
-            if (builderAdditionalLength > 2 && !builder.substring(builderLength - 2, builderLength).equals(", ")) {
-                builder.append(", ");
-            }
-            builder.append("augmentation=");
-            builder.append(augmentation.values());
-            return builder.append(']').toString();
-        }
-    }
-
-}
diff --git a/sli/model/src/main/yang-gen-sal/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/core/sliapi/rev161110/execute/graph/input/SliParameter.java b/sli/model/src/main/yang-gen-sal/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/core/sliapi/rev161110/execute/graph/input/SliParameter.java
deleted file mode 100644
index e1cac53c..00000000
--- a/sli/model/src/main/yang-gen-sal/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/core/sliapi/rev161110/execute/graph/input/SliParameter.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.execute.graph.input;
-import org.opendaylight.yangtools.yang.binding.ChildOf;
-import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ParameterSetting;
-import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.binding.Augmentable;
-import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphInput;
-import org.opendaylight.yangtools.yang.binding.Identifiable;
-
-/**
- * <p>This class represents the following YANG schema fragment defined in module <b>SLI-API</b>
- * <pre>
- * list sli-parameter {
- *     key "parameter-name"
- *     leaf parameter-name {
- *         type string;
- *     }
- *     leaf int-value {
- *         type int32;
- *     }
- *     leaf string-value {
- *         type string;
- *     }
- *     leaf boolean-value {
- *         type boolean;
- *     }
- *     uses parameter-setting;
- * }
- * </pre>
- * The schema path to identify an instance is
- * <i>SLI-API/execute-graph/input/sli-parameter</i>
- *
- * <p>To create instances of this class use {@link org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.execute.graph.input.SliParameterBuilder}.
- * @see org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.execute.graph.input.SliParameterBuilder
- * @see org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.execute.graph.input.SliParameterKey
- *
- */
-public interface SliParameter
-    extends
-    ChildOf<ExecuteGraphInput>,
-    Augmentable<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.execute.graph.input.SliParameter>,
-    ParameterSetting,
-    Identifiable<SliParameterKey>
-{
-
-
-
-    public static final QName QNAME = org.opendaylight.yangtools.yang.common.QName.create("org:onap:ccsdk:sli:core:sliapi",
-        "2016-11-10", "sli-parameter").intern();
-
-    /**
-     * Returns Primary Key of Yang List Type
-     *
-     *
-     *
-     * @return <code>org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.execute.graph.input.SliParameterKey</code> <code>key</code>, or <code>null</code> if not present
-     */
-    SliParameterKey getKey();
-
-}
-
diff --git a/sli/model/src/main/yang-gen-sal/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/core/sliapi/rev161110/execute/graph/input/SliParameterBuilder.java b/sli/model/src/main/yang-gen-sal/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/core/sliapi/rev161110/execute/graph/input/SliParameterBuilder.java
deleted file mode 100644
index f28eb1a8..00000000
--- a/sli/model/src/main/yang-gen-sal/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/core/sliapi/rev161110/execute/graph/input/SliParameterBuilder.java
+++ /dev/null
@@ -1,357 +0,0 @@
-package org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.execute.graph.input;
-import org.opendaylight.yangtools.yang.binding.Augmentation;
-import org.opendaylight.yangtools.yang.binding.AugmentationHolder;
-import org.opendaylight.yangtools.yang.binding.DataObject;
-import java.util.HashMap;
-import org.opendaylight.yangtools.concepts.Builder;
-import java.util.Objects;
-import java.util.Collections;
-import java.util.Map;
-
-/**
- * Class that builds {@link org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.execute.graph.input.SliParameter} instances.
- *
- * @see org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.execute.graph.input.SliParameter
- *
- */
-public class SliParameterBuilder implements Builder<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.execute.graph.input.SliParameter> {
-
-    private java.lang.Integer _intValue;
-    private SliParameterKey _key;
-    private java.lang.String _parameterName;
-    private java.lang.String _stringValue;
-    private java.lang.Boolean _booleanValue;
-
-    Map<java.lang.Class<? extends Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.execute.graph.input.SliParameter>>, Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.execute.graph.input.SliParameter>> augmentation = Collections.emptyMap();
-
-    public SliParameterBuilder() {
-    }
-    public SliParameterBuilder(org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ParameterSetting arg) {
-        this._parameterName = arg.getParameterName();
-        this._intValue = arg.getIntValue();
-        this._stringValue = arg.getStringValue();
-        this._booleanValue = arg.isBooleanValue();
-    }
-
-    public SliParameterBuilder(SliParameter base) {
-        if (base.getKey() == null) {
-            this._key = new SliParameterKey(
-                base.getParameterName()
-            );
-            this._parameterName = base.getParameterName();
-        } else {
-            this._key = base.getKey();
-            this._parameterName = _key.getParameterName();
-        }
-        this._intValue = base.getIntValue();
-        this._stringValue = base.getStringValue();
-        this._booleanValue = base.isBooleanValue();
-        if (base instanceof SliParameterImpl) {
-            SliParameterImpl impl = (SliParameterImpl) base;
-            if (!impl.augmentation.isEmpty()) {
-                this.augmentation = new HashMap<>(impl.augmentation);
-            }
-        } else if (base instanceof AugmentationHolder) {
-            @SuppressWarnings("unchecked")
-            AugmentationHolder<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.execute.graph.input.SliParameter> casted =(AugmentationHolder<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.execute.graph.input.SliParameter>) base;
-            if (!casted.augmentations().isEmpty()) {
-                this.augmentation = new HashMap<>(casted.augmentations());
-            }
-        }
-    }
-
-    /**
-     *Set fields from given grouping argument. Valid argument is instance of one of following types:
-     * <ul>
-     * <li>org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ParameterSetting</li>
-     * </ul>
-     *
-     * @param arg grouping object
-     * @throws IllegalArgumentException if given argument is none of valid types
-    */
-    public void fieldsFrom(DataObject arg) {
-        boolean isValidArg = false;
-        if (arg instanceof org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ParameterSetting) {
-            this._parameterName = ((org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ParameterSetting)arg).getParameterName();
-            this._intValue = ((org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ParameterSetting)arg).getIntValue();
-            this._stringValue = ((org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ParameterSetting)arg).getStringValue();
-            this._booleanValue = ((org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ParameterSetting)arg).isBooleanValue();
-            isValidArg = true;
-        }
-        if (!isValidArg) {
-            throw new IllegalArgumentException(
-              "expected one of: [org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ParameterSetting] \n" +
-              "but was: " + arg
-            );
-        }
-    }
-
-    public java.lang.Integer getIntValue() {
-        return _intValue;
-    }
-    
-    public SliParameterKey getKey() {
-        return _key;
-    }
-    
-    public java.lang.String getParameterName() {
-        return _parameterName;
-    }
-    
-    public java.lang.String getStringValue() {
-        return _stringValue;
-    }
-    
-    public java.lang.Boolean isBooleanValue() {
-        return _booleanValue;
-    }
-    
-    @SuppressWarnings("unchecked")
-    public <E extends Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.execute.graph.input.SliParameter>> E getAugmentation(java.lang.Class<E> augmentationType) {
-        if (augmentationType == null) {
-            throw new IllegalArgumentException("Augmentation Type reference cannot be NULL!");
-        }
-        return (E) augmentation.get(augmentationType);
-    }
-
-     
-    public SliParameterBuilder setIntValue(final java.lang.Integer value) {
-        this._intValue = value;
-        return this;
-    }
-    
-     
-    public SliParameterBuilder setKey(final SliParameterKey value) {
-        this._key = value;
-        return this;
-    }
-    
-     
-    public SliParameterBuilder setParameterName(final java.lang.String value) {
-        this._parameterName = value;
-        return this;
-    }
-    
-     
-    public SliParameterBuilder setStringValue(final java.lang.String value) {
-        this._stringValue = value;
-        return this;
-    }
-    
-     
-    public SliParameterBuilder setBooleanValue(final java.lang.Boolean value) {
-        this._booleanValue = value;
-        return this;
-    }
-    
-    public SliParameterBuilder addAugmentation(java.lang.Class<? extends Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.execute.graph.input.SliParameter>> augmentationType, Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.execute.graph.input.SliParameter> augmentation) {
-        if (augmentation == null) {
-            return removeAugmentation(augmentationType);
-        }
-    
-        if (!(this.augmentation instanceof HashMap)) {
-            this.augmentation = new HashMap<>();
-        }
-    
-        this.augmentation.put(augmentationType, augmentation);
-        return this;
-    }
-    
-    public SliParameterBuilder removeAugmentation(java.lang.Class<? extends Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.execute.graph.input.SliParameter>> augmentationType) {
-        if (this.augmentation instanceof HashMap) {
-            this.augmentation.remove(augmentationType);
-        }
-        return this;
-    }
-
-    @Override
-    public SliParameter build() {
-        return new SliParameterImpl(this);
-    }
-
-    private static final class SliParameterImpl implements SliParameter {
-
-        @Override
-        public java.lang.Class<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.execute.graph.input.SliParameter> getImplementedInterface() {
-            return org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.execute.graph.input.SliParameter.class;
-        }
-
-        private final java.lang.Integer _intValue;
-        private final SliParameterKey _key;
-        private final java.lang.String _parameterName;
-        private final java.lang.String _stringValue;
-        private final java.lang.Boolean _booleanValue;
-
-        private Map<java.lang.Class<? extends Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.execute.graph.input.SliParameter>>, Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.execute.graph.input.SliParameter>> augmentation = Collections.emptyMap();
-
-        private SliParameterImpl(SliParameterBuilder base) {
-            if (base.getKey() == null) {
-                this._key = new SliParameterKey(
-                    base.getParameterName()
-                );
-                this._parameterName = base.getParameterName();
-            } else {
-                this._key = base.getKey();
-                this._parameterName = _key.getParameterName();
-            }
-            this._intValue = base.getIntValue();
-            this._stringValue = base.getStringValue();
-            this._booleanValue = base.isBooleanValue();
-            switch (base.augmentation.size()) {
-            case 0:
-                this.augmentation = Collections.emptyMap();
-                break;
-            case 1:
-                final Map.Entry<java.lang.Class<? extends Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.execute.graph.input.SliParameter>>, Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.execute.graph.input.SliParameter>> e = base.augmentation.entrySet().iterator().next();
-                this.augmentation = Collections.<java.lang.Class<? extends Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.execute.graph.input.SliParameter>>, Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.execute.graph.input.SliParameter>>singletonMap(e.getKey(), e.getValue());
-                break;
-            default :
-                this.augmentation = new HashMap<>(base.augmentation);
-            }
-        }
-
-        @Override
-        public java.lang.Integer getIntValue() {
-            return _intValue;
-        }
-        
-        @Override
-        public SliParameterKey getKey() {
-            return _key;
-        }
-        
-        @Override
-        public java.lang.String getParameterName() {
-            return _parameterName;
-        }
-        
-        @Override
-        public java.lang.String getStringValue() {
-            return _stringValue;
-        }
-        
-        @Override
-        public java.lang.Boolean isBooleanValue() {
-            return _booleanValue;
-        }
-        
-        @SuppressWarnings("unchecked")
-        @Override
-        public <E extends Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.execute.graph.input.SliParameter>> E getAugmentation(java.lang.Class<E> augmentationType) {
-            if (augmentationType == null) {
-                throw new IllegalArgumentException("Augmentation Type reference cannot be NULL!");
-            }
-            return (E) augmentation.get(augmentationType);
-        }
-
-        private int hash = 0;
-        private volatile boolean hashValid = false;
-        
-        @Override
-        public int hashCode() {
-            if (hashValid) {
-                return hash;
-            }
-        
-            final int prime = 31;
-            int result = 1;
-            result = prime * result + Objects.hashCode(_intValue);
-            result = prime * result + Objects.hashCode(_key);
-            result = prime * result + Objects.hashCode(_parameterName);
-            result = prime * result + Objects.hashCode(_stringValue);
-            result = prime * result + Objects.hashCode(_booleanValue);
-            result = prime * result + Objects.hashCode(augmentation);
-        
-            hash = result;
-            hashValid = true;
-            return result;
-        }
-
-        @Override
-        public boolean equals(java.lang.Object obj) {
-            if (this == obj) {
-                return true;
-            }
-            if (!(obj instanceof DataObject)) {
-                return false;
-            }
-            if (!org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.execute.graph.input.SliParameter.class.equals(((DataObject)obj).getImplementedInterface())) {
-                return false;
-            }
-            org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.execute.graph.input.SliParameter other = (org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.execute.graph.input.SliParameter)obj;
-            if (!Objects.equals(_intValue, other.getIntValue())) {
-                return false;
-            }
-            if (!Objects.equals(_key, other.getKey())) {
-                return false;
-            }
-            if (!Objects.equals(_parameterName, other.getParameterName())) {
-                return false;
-            }
-            if (!Objects.equals(_stringValue, other.getStringValue())) {
-                return false;
-            }
-            if (!Objects.equals(_booleanValue, other.isBooleanValue())) {
-                return false;
-            }
-            if (getClass() == obj.getClass()) {
-                // Simple case: we are comparing against self
-                SliParameterImpl otherImpl = (SliParameterImpl) obj;
-                if (!Objects.equals(augmentation, otherImpl.augmentation)) {
-                    return false;
-                }
-            } else {
-                // Hard case: compare our augments with presence there...
-                for (Map.Entry<java.lang.Class<? extends Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.execute.graph.input.SliParameter>>, Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.execute.graph.input.SliParameter>> e : augmentation.entrySet()) {
-                    if (!e.getValue().equals(other.getAugmentation(e.getKey()))) {
-                        return false;
-                    }
-                }
-                // .. and give the other one the chance to do the same
-                if (!obj.equals(this)) {
-                    return false;
-                }
-            }
-            return true;
-        }
-
-        @Override
-        public java.lang.String toString() {
-            java.lang.String name = "SliParameter [";
-            java.lang.StringBuilder builder = new java.lang.StringBuilder (name);
-            if (_intValue != null) {
-                builder.append("_intValue=");
-                builder.append(_intValue);
-                builder.append(", ");
-            }
-            if (_key != null) {
-                builder.append("_key=");
-                builder.append(_key);
-                builder.append(", ");
-            }
-            if (_parameterName != null) {
-                builder.append("_parameterName=");
-                builder.append(_parameterName);
-                builder.append(", ");
-            }
-            if (_stringValue != null) {
-                builder.append("_stringValue=");
-                builder.append(_stringValue);
-                builder.append(", ");
-            }
-            if (_booleanValue != null) {
-                builder.append("_booleanValue=");
-                builder.append(_booleanValue);
-            }
-            final int builderLength = builder.length();
-            final int builderAdditionalLength = builder.substring(name.length(), builderLength).length();
-            if (builderAdditionalLength > 2 && !builder.substring(builderLength - 2, builderLength).equals(", ")) {
-                builder.append(", ");
-            }
-            builder.append("augmentation=");
-            builder.append(augmentation.values());
-            return builder.append(']').toString();
-        }
-    }
-
-}
diff --git a/sli/model/src/main/yang-gen-sal/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/core/sliapi/rev161110/execute/graph/input/SliParameterKey.java b/sli/model/src/main/yang-gen-sal/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/core/sliapi/rev161110/execute/graph/input/SliParameterKey.java
deleted file mode 100644
index 6c19a877..00000000
--- a/sli/model/src/main/yang-gen-sal/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/core/sliapi/rev161110/execute/graph/input/SliParameterKey.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.execute.graph.input;
-import org.opendaylight.yangtools.yang.binding.Identifier;
-import java.util.Objects;
-
-public class SliParameterKey
- implements Identifier<SliParameter> {
-    private static final long serialVersionUID = 8929025111457627032L;
-    private final java.lang.String _parameterName;
-
-
-    public SliParameterKey(java.lang.String _parameterName) {
-    
-    
-        this._parameterName = _parameterName;
-    }
-    
-    /**
-     * Creates a copy from Source Object.
-     *
-     * @param source Source object
-     */
-    public SliParameterKey(SliParameterKey source) {
-        this._parameterName = source._parameterName;
-    }
-
-
-    public java.lang.String getParameterName() {
-        return _parameterName;
-    }
-
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + Objects.hashCode(_parameterName);
-        return result;
-    }
-
-    @Override
-    public boolean equals(java.lang.Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        SliParameterKey other = (SliParameterKey) obj;
-        if (!Objects.equals(_parameterName, other._parameterName)) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public java.lang.String toString() {
-        java.lang.StringBuilder builder = new java.lang.StringBuilder(org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.execute.graph.input.SliParameterKey.class.getSimpleName()).append(" [");
-        boolean first = true;
-    
-        if (_parameterName != null) {
-            if (first) {
-                first = false;
-            } else {
-                builder.append(", ");
-            }
-            builder.append("_parameterName=");
-            builder.append(_parameterName);
-         }
-        return builder.append(']').toString();
-    }
-}
-
diff --git a/sli/model/src/main/yang-gen-sal/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/core/sliapi/rev161110/test/results/TestResult.java b/sli/model/src/main/yang-gen-sal/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/core/sliapi/rev161110/test/results/TestResult.java
deleted file mode 100644
index d12faa44..00000000
--- a/sli/model/src/main/yang-gen-sal/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/core/sliapi/rev161110/test/results/TestResult.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.test.results;
-import org.opendaylight.yangtools.yang.binding.ChildOf;
-import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.TestResults;
-import java.util.List;
-import org.opendaylight.yangtools.yang.binding.Augmentable;
-import org.opendaylight.yangtools.yang.binding.Identifiable;
-
-/**
- * <p>This class represents the following YANG schema fragment defined in module <b>SLI-API</b>
- * <pre>
- * list test-result {
- *     key "test-identifier"
- *     leaf test-identifier {
- *         type string;
- *     }
- *     leaf-list results {
- *         type string;
- *     }
- * }
- * </pre>
- * The schema path to identify an instance is
- * <i>SLI-API/test-results/test-result</i>
- *
- * <p>To create instances of this class use {@link org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.test.results.TestResultBuilder}.
- * @see org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.test.results.TestResultBuilder
- * @see org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.test.results.TestResultKey
- *
- */
-public interface TestResult
-    extends
-    ChildOf<TestResults>,
-    Augmentable<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.test.results.TestResult>,
-    Identifiable<TestResultKey>
-{
-
-
-
-    public static final QName QNAME = org.opendaylight.yangtools.yang.common.QName.create("org:onap:ccsdk:sli:core:sliapi",
-        "2016-11-10", "test-result").intern();
-
-    /**
-     * @return <code>java.lang.String</code> <code>testIdentifier</code>, or <code>null</code> if not present
-     */
-    java.lang.String getTestIdentifier();
-    
-    /**
-     * @return <code>java.util.List</code> <code>results</code>, or <code>null</code> if not present
-     */
-    List<java.lang.String> getResults();
-    
-    /**
-     * Returns Primary Key of Yang List Type
-     *
-     *
-     *
-     * @return <code>org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.test.results.TestResultKey</code> <code>key</code>, or <code>null</code> if not present
-     */
-    TestResultKey getKey();
-
-}
-
diff --git a/sli/model/src/main/yang-gen-sal/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/core/sliapi/rev161110/test/results/TestResultBuilder.java b/sli/model/src/main/yang-gen-sal/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/core/sliapi/rev161110/test/results/TestResultBuilder.java
deleted file mode 100644
index 51e43722..00000000
--- a/sli/model/src/main/yang-gen-sal/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/core/sliapi/rev161110/test/results/TestResultBuilder.java
+++ /dev/null
@@ -1,271 +0,0 @@
-package org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.test.results;
-import org.opendaylight.yangtools.yang.binding.Augmentation;
-import org.opendaylight.yangtools.yang.binding.AugmentationHolder;
-import org.opendaylight.yangtools.yang.binding.DataObject;
-import java.util.HashMap;
-import org.opendaylight.yangtools.concepts.Builder;
-import java.util.Objects;
-import java.util.List;
-import java.util.Collections;
-import java.util.Map;
-
-/**
- * Class that builds {@link org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.test.results.TestResult} instances.
- *
- * @see org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.test.results.TestResult
- *
- */
-public class TestResultBuilder implements Builder<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.test.results.TestResult> {
-
-    private TestResultKey _key;
-    private List<java.lang.String> _results;
-    private java.lang.String _testIdentifier;
-
-    Map<java.lang.Class<? extends Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.test.results.TestResult>>, Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.test.results.TestResult>> augmentation = Collections.emptyMap();
-
-    public TestResultBuilder() {
-    }
-
-    public TestResultBuilder(TestResult base) {
-        if (base.getKey() == null) {
-            this._key = new TestResultKey(
-                base.getTestIdentifier()
-            );
-            this._testIdentifier = base.getTestIdentifier();
-        } else {
-            this._key = base.getKey();
-            this._testIdentifier = _key.getTestIdentifier();
-        }
-        this._results = base.getResults();
-        if (base instanceof TestResultImpl) {
-            TestResultImpl impl = (TestResultImpl) base;
-            if (!impl.augmentation.isEmpty()) {
-                this.augmentation = new HashMap<>(impl.augmentation);
-            }
-        } else if (base instanceof AugmentationHolder) {
-            @SuppressWarnings("unchecked")
-            AugmentationHolder<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.test.results.TestResult> casted =(AugmentationHolder<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.test.results.TestResult>) base;
-            if (!casted.augmentations().isEmpty()) {
-                this.augmentation = new HashMap<>(casted.augmentations());
-            }
-        }
-    }
-
-
-    public TestResultKey getKey() {
-        return _key;
-    }
-    
-    public List<java.lang.String> getResults() {
-        return _results;
-    }
-    
-    public java.lang.String getTestIdentifier() {
-        return _testIdentifier;
-    }
-    
-    @SuppressWarnings("unchecked")
-    public <E extends Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.test.results.TestResult>> E getAugmentation(java.lang.Class<E> augmentationType) {
-        if (augmentationType == null) {
-            throw new IllegalArgumentException("Augmentation Type reference cannot be NULL!");
-        }
-        return (E) augmentation.get(augmentationType);
-    }
-
-     
-    public TestResultBuilder setKey(final TestResultKey value) {
-        this._key = value;
-        return this;
-    }
-    
-     
-    public TestResultBuilder setResults(final List<java.lang.String> value) {
-        this._results = value;
-        return this;
-    }
-    
-     
-    public TestResultBuilder setTestIdentifier(final java.lang.String value) {
-        this._testIdentifier = value;
-        return this;
-    }
-    
-    public TestResultBuilder addAugmentation(java.lang.Class<? extends Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.test.results.TestResult>> augmentationType, Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.test.results.TestResult> augmentation) {
-        if (augmentation == null) {
-            return removeAugmentation(augmentationType);
-        }
-    
-        if (!(this.augmentation instanceof HashMap)) {
-            this.augmentation = new HashMap<>();
-        }
-    
-        this.augmentation.put(augmentationType, augmentation);
-        return this;
-    }
-    
-    public TestResultBuilder removeAugmentation(java.lang.Class<? extends Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.test.results.TestResult>> augmentationType) {
-        if (this.augmentation instanceof HashMap) {
-            this.augmentation.remove(augmentationType);
-        }
-        return this;
-    }
-
-    @Override
-    public TestResult build() {
-        return new TestResultImpl(this);
-    }
-
-    private static final class TestResultImpl implements TestResult {
-
-        @Override
-        public java.lang.Class<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.test.results.TestResult> getImplementedInterface() {
-            return org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.test.results.TestResult.class;
-        }
-
-        private final TestResultKey _key;
-        private final List<java.lang.String> _results;
-        private final java.lang.String _testIdentifier;
-
-        private Map<java.lang.Class<? extends Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.test.results.TestResult>>, Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.test.results.TestResult>> augmentation = Collections.emptyMap();
-
-        private TestResultImpl(TestResultBuilder base) {
-            if (base.getKey() == null) {
-                this._key = new TestResultKey(
-                    base.getTestIdentifier()
-                );
-                this._testIdentifier = base.getTestIdentifier();
-            } else {
-                this._key = base.getKey();
-                this._testIdentifier = _key.getTestIdentifier();
-            }
-            this._results = base.getResults();
-            switch (base.augmentation.size()) {
-            case 0:
-                this.augmentation = Collections.emptyMap();
-                break;
-            case 1:
-                final Map.Entry<java.lang.Class<? extends Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.test.results.TestResult>>, Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.test.results.TestResult>> e = base.augmentation.entrySet().iterator().next();
-                this.augmentation = Collections.<java.lang.Class<? extends Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.test.results.TestResult>>, Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.test.results.TestResult>>singletonMap(e.getKey(), e.getValue());
-                break;
-            default :
-                this.augmentation = new HashMap<>(base.augmentation);
-            }
-        }
-
-        @Override
-        public TestResultKey getKey() {
-            return _key;
-        }
-        
-        @Override
-        public List<java.lang.String> getResults() {
-            return _results;
-        }
-        
-        @Override
-        public java.lang.String getTestIdentifier() {
-            return _testIdentifier;
-        }
-        
-        @SuppressWarnings("unchecked")
-        @Override
-        public <E extends Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.test.results.TestResult>> E getAugmentation(java.lang.Class<E> augmentationType) {
-            if (augmentationType == null) {
-                throw new IllegalArgumentException("Augmentation Type reference cannot be NULL!");
-            }
-            return (E) augmentation.get(augmentationType);
-        }
-
-        private int hash = 0;
-        private volatile boolean hashValid = false;
-        
-        @Override
-        public int hashCode() {
-            if (hashValid) {
-                return hash;
-            }
-        
-            final int prime = 31;
-            int result = 1;
-            result = prime * result + Objects.hashCode(_key);
-            result = prime * result + Objects.hashCode(_results);
-            result = prime * result + Objects.hashCode(_testIdentifier);
-            result = prime * result + Objects.hashCode(augmentation);
-        
-            hash = result;
-            hashValid = true;
-            return result;
-        }
-
-        @Override
-        public boolean equals(java.lang.Object obj) {
-            if (this == obj) {
-                return true;
-            }
-            if (!(obj instanceof DataObject)) {
-                return false;
-            }
-            if (!org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.test.results.TestResult.class.equals(((DataObject)obj).getImplementedInterface())) {
-                return false;
-            }
-            org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.test.results.TestResult other = (org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.test.results.TestResult)obj;
-            if (!Objects.equals(_key, other.getKey())) {
-                return false;
-            }
-            if (!Objects.equals(_results, other.getResults())) {
-                return false;
-            }
-            if (!Objects.equals(_testIdentifier, other.getTestIdentifier())) {
-                return false;
-            }
-            if (getClass() == obj.getClass()) {
-                // Simple case: we are comparing against self
-                TestResultImpl otherImpl = (TestResultImpl) obj;
-                if (!Objects.equals(augmentation, otherImpl.augmentation)) {
-                    return false;
-                }
-            } else {
-                // Hard case: compare our augments with presence there...
-                for (Map.Entry<java.lang.Class<? extends Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.test.results.TestResult>>, Augmentation<org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.test.results.TestResult>> e : augmentation.entrySet()) {
-                    if (!e.getValue().equals(other.getAugmentation(e.getKey()))) {
-                        return false;
-                    }
-                }
-                // .. and give the other one the chance to do the same
-                if (!obj.equals(this)) {
-                    return false;
-                }
-            }
-            return true;
-        }
-
-        @Override
-        public java.lang.String toString() {
-            java.lang.String name = "TestResult [";
-            java.lang.StringBuilder builder = new java.lang.StringBuilder (name);
-            if (_key != null) {
-                builder.append("_key=");
-                builder.append(_key);
-                builder.append(", ");
-            }
-            if (_results != null) {
-                builder.append("_results=");
-                builder.append(_results);
-                builder.append(", ");
-            }
-            if (_testIdentifier != null) {
-                builder.append("_testIdentifier=");
-                builder.append(_testIdentifier);
-            }
-            final int builderLength = builder.length();
-            final int builderAdditionalLength = builder.substring(name.length(), builderLength).length();
-            if (builderAdditionalLength > 2 && !builder.substring(builderLength - 2, builderLength).equals(", ")) {
-                builder.append(", ");
-            }
-            builder.append("augmentation=");
-            builder.append(augmentation.values());
-            return builder.append(']').toString();
-        }
-    }
-
-}
diff --git a/sli/model/src/main/yang-gen-sal/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/core/sliapi/rev161110/test/results/TestResultKey.java b/sli/model/src/main/yang-gen-sal/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/core/sliapi/rev161110/test/results/TestResultKey.java
deleted file mode 100644
index d867ca23..00000000
--- a/sli/model/src/main/yang-gen-sal/org/opendaylight/yang/gen/v1/org/onap/ccsdk/sli/core/sliapi/rev161110/test/results/TestResultKey.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.test.results;
-import org.opendaylight.yangtools.yang.binding.Identifier;
-import java.util.Objects;
-
-public class TestResultKey
- implements Identifier<TestResult> {
-    private static final long serialVersionUID = 3857649555637491806L;
-    private final java.lang.String _testIdentifier;
-
-
-    public TestResultKey(java.lang.String _testIdentifier) {
-    
-    
-        this._testIdentifier = _testIdentifier;
-    }
-    
-    /**
-     * Creates a copy from Source Object.
-     *
-     * @param source Source object
-     */
-    public TestResultKey(TestResultKey source) {
-        this._testIdentifier = source._testIdentifier;
-    }
-
-
-    public java.lang.String getTestIdentifier() {
-        return _testIdentifier;
-    }
-
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + Objects.hashCode(_testIdentifier);
-        return result;
-    }
-
-    @Override
-    public boolean equals(java.lang.Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        TestResultKey other = (TestResultKey) obj;
-        if (!Objects.equals(_testIdentifier, other._testIdentifier)) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public java.lang.String toString() {
-        java.lang.StringBuilder builder = new java.lang.StringBuilder(org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.test.results.TestResultKey.class.getSimpleName()).append(" [");
-        boolean first = true;
-    
-        if (_testIdentifier != null) {
-            if (first) {
-                first = false;
-            } else {
-                builder.append(", ");
-            }
-            builder.append("_testIdentifier=");
-            builder.append(_testIdentifier);
-         }
-        return builder.append(']').toString();
-    }
-}
-
diff --git a/sli/model/src/main/yang/sliapi.yang b/sli/model/src/main/yang/sliapi.yang
index 8deb8a10..5d91ba2d 100755
--- a/sli/model/src/main/yang/sliapi.yang
+++ b/sli/model/src/main/yang/sliapi.yang
@@ -39,6 +39,12 @@ module SLI-API {
         leaf boolean-value {
             type boolean;
         }
+        leaf ipaddress-value {
+            type inet:ip-address;
+        }
+        leaf ipprefix-value {
+            type inet:ip-prefix;
+        }
     }
 
     grouping response-fields {
diff --git a/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelperTest.java b/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelperTest.java
index 5ba0eb96..c00da68c 100644
--- a/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelperTest.java
+++ b/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelperTest.java
@@ -21,6 +21,7 @@
 
 package org.onap.ccsdk.sli.core.sli.provider;
 
+import java.io.File;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -32,6 +33,7 @@ import org.onap.ccsdk.sli.core.sli.SvcLogicGraph;
 import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphInputBuilder;
 import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.execute.graph.input.SliParameter;
 import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.execute.graph.input.SliParameterBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.IpAddressBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -41,9 +43,10 @@ import junit.framework.TestCase;
 public class MdsalHelperTest extends TestCase {
 	private static final Logger LOG = LoggerFactory
 			.getLogger(MdsalHelperTest.class);
-    public static final String pathToSdnPropertiesFile = "./src/test/resources/l3sdn.properties";
+    public static final String pathToSdnPropertiesFile = "src/test/resources/l3sdn.properties";
 
     public void testSdnProperties() {
+
         MdsalHelperTesterUtil.loadProperties(pathToSdnPropertiesFile);
         assertEquals("synccomplete", MdsalHelperTesterUtil.mapEnumeratedValue("request-status", "synccomplete"));
         assertEquals("asynccomplete", MdsalHelperTesterUtil.mapEnumeratedValue("request-status", "asynccomplete"));
@@ -67,13 +70,24 @@ public class MdsalHelperTest extends TestCase {
     		params.add(parmBuilder.build());
 
     		parmBuilder.setParameterName("int-parm");
+    		parmBuilder.setBooleanValue(null);
     		parmBuilder.setIntValue(1);
     		params.add(parmBuilder.build());
 
     		parmBuilder.setParameterName("str-parm");
+    		parmBuilder.setIntValue(null);
     		parmBuilder.setStringValue("hello");
     		params.add(parmBuilder.build());
 
+    		parmBuilder.setParameterName("ipaddress4-parm");
+    		parmBuilder.setStringValue(null);
+    		parmBuilder.setIpaddressValue(IpAddressBuilder.getDefaultInstance("127.0.0.1"));
+    		params.add(parmBuilder.build());
+
+    		parmBuilder.setParameterName("ipaddress6-parm");
+    		parmBuilder.setIpaddressValue(IpAddressBuilder.getDefaultInstance("ef::1"));
+    		params.add(parmBuilder.build());
+
 
     		execBuilder.setMode(Mode.Sync);
     		execBuilder.setModuleName("my-module");
@@ -107,7 +121,10 @@ public class MdsalHelperTest extends TestCase {
     	props.setProperty("execute-graph-input.sli-parameter[1].int-value", "1");
     	props.setProperty("execute-graph-input.sli-parameter[2].parameter-name", "str-param");
     	props.setProperty("execute-graph-input.sli-parameter[2].str-value",  "hello");
-
+    	props.setProperty("execute-graph-input.sli-parameter[3].parameter-name", "ipv4address-param");
+    	props.setProperty("execute-graph-input.sli-parameter[3].ipaddress-value",  "127.0.0.1");
+    	props.setProperty("execute-graph-input.sli-parameter[4].parameter-name", "ipv6address-param");
+    	props.setProperty("execute-graph-input.sli-parameter[4].ipaddress-value",  "ef::1");
     	ExecuteGraphInputBuilder execBuilder = new ExecuteGraphInputBuilder();
 
     	MdsalHelperTesterUtil.toBuilder(props, execBuilder);
diff --git a/sli/provider/src/test/resources/l3sdn.properties b/sli/provider/src/test/resources/l3sdn.properties
new file mode 100644
index 00000000..6f40ebca
--- /dev/null
+++ b/sli/provider/src/test/resources/l3sdn.properties
@@ -0,0 +1,66 @@
+# yang conversion properties 
+# used to convert Enum back to the original yang value 
+yang.request-status.Synccomplete=synccomplete
+yang.request-status.Asynccomplete=asynccomplete
+yang.request-status.Notifycomplete=notifycomplete
+yang.rpc-name.ServiceConfigurationOperation=service-configuration-operation
+yang.rpc-name.SvcTopologyOperation=svc-topology-operation
+yang.rpc-name.ServiceConfigurationNotification=service-configuration-notification
+yang.rpc-action.Reserve=reserve
+yang.rpc-action.Activate=activate
+yang.rpc-action.Assign=assign
+yang.rpc-action.Turnup=turnup
+yang.rpc-action.Delete=delete
+yang.rpc-action.Changereserve=changereserve
+yang.rpc-action.Changeactivate=changeactivate
+yang.rpc-action.Changedelete=changedelete
+yang.rpc-action.Changeassign=changeassign
+yang.svc-vnf-type.Vce=vce
+yang.vnf-type.Vce=vce
+yang.vnf-status.PendingCreate=pending-create
+yang.vnf-status.Created=created
+yang.vnf-status.Active=active
+yang.vnf-status.PendingDelete=pending-delete
+yang.connection-type.Customer=customer
+yang.connection-type.Internet=internet
+yang.net-status.PendingCreate=pending-create
+yang.net-status.Created=created
+yang.net-status.Active=active
+yang.net-status.PendingDelete=pending-delete
+yang.svc-action.Reserve=reserve
+yang.svc-action.Activate=activate
+yang.svc-action.Assign=assign
+yang.svc-action.Turnup=turnup
+yang.svc-action.Delete=delete
+yang.svc-action.Changereserve=changereserve
+yang.svc-action.Changeactivate=changeactivate
+yang.svc-action.Changedelete=changedelete
+yang.svc-action.Changeassign=changeassign
+yang.service-type.SDNETHERNETINTERNET=SDN-ETHERNET-INTERNET
+yang.internet-evc-speed-value._2=2
+yang.internet-evc-speed-value._4=4
+yang.internet-evc-speed-value._5=5
+yang.internet-evc-speed-value._8=8
+yang.internet-evc-speed-value._10=10
+yang.internet-evc-speed-value._20=20
+yang.internet-evc-speed-value._50=50
+yang.internet-evc-speed-value._100=100
+yang.internet-evc-speed-value._150=150
+yang.internet-evc-speed-value._250=250
+yang.internet-evc-speed-value._400=400
+yang.internet-evc-speed-value._500=500
+yang.internet-evc-speed-value._600=600
+yang.internet-evc-speed-value._1000=1000
+yang.ip-version.Ds=ds
+yang.ip-version.V6=v6
+yang.routing-protocol.None=none
+yang.routing-protocol.Bgp=bgp
+yang.routing-protocol.Ospf=ospf
+yang.routing-protocol.Igrp=igrp
+yang.routing-protocol.Eigrp=eigrp
+yang.routing-protocol.Rip=rip
+yang.routing-protocol.IsIs=is-is
+yang.vr-designation.Primary=primary
+yang.feature-type.FIREWALLLITE=FIREWALL-LITE
+yang.equipment-role.VPLSPE=VPLS-PE
+yang.interface-role.CUSTOMERUPLINK=CUSTOMER-UPLINK