Populate seed code

Add seed code for sli/core repository

Issue: CCSDK-6
Change-Id: Iaeb54c6135a94a6ffec0c7fd96505d72d18aeb00
Signed-off-by: Dan Timoney <dtimoney@att.com>

106 files changed, 15218 insertions, 0 deletions

diff --git a/sli/.gitignore b/sli/.gitignore
new file mode 100755
index 00000000..3632ac67
--- /dev/null
+++ b/sli/.gitignore
@@ -0,0 +1,38 @@
+#####standard .git ignore entries#####

+

+## IDE Specific Files ##

+org.eclipse.core.resources.prefs

+.classpath

+.project

+.settings

+.idea

+.externalToolBuilders

+maven-eclipse.xml

+workspace

+

+## Compilation Files ##

+*.class

+**/target

+target

+target-ide

+MANIFEST.MF

+

+## Misc Ignores (OS specific etc) ##

+bin/

+dist

+*~

+*.ipr

+*.iml

+*.iws

+classes

+out/

+.DS_STORE

+.metadata

+

+## antlr4 generated files ##

+ExprGrammarBaseListener.java

+ExprGrammarLexer.java

+ExprGrammarListener.java

+ExprGrammarParser.java

+ExprGrammar.tokens

+ExprGrammarLexer.tokens

diff --git a/sli/common/pom.xml b/sli/common/pom.xml
new file mode 100755
index 00000000..ce98b947
--- /dev/null
+++ b/sli/common/pom.xml
@@ -0,0 +1,150 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>sli</artifactId>
+		<groupId>org.openecomp.sdnc.core</groupId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>sli-common</artifactId>
+	<packaging>bundle</packaging>
+
+	<name>SLI - Common Classes</name>
+	<description>The SLI Common package includes common classes used by the various SLI subcomponents, as well as classes used by clients to interface with the service logic interpreter</description>
+
+	<dependencies>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>3.8.1</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.antlr</groupId>
+			<artifactId>antlr4</artifactId>
+			<version>${antlr.version}</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>${slf4j.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-simple</artifactId>
+			<version>1.7.5</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-lang3</artifactId>
+			<version>${commons.lang3.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.opendaylight.mdsal</groupId>
+			<artifactId>yang-binding</artifactId>
+			<version>${odl.mdsal.yang.binding.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.opendaylight.yangtools</groupId>
+			<artifactId>yang-common</artifactId>
+			<version>${odl.yangtools.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.opendaylight.mdsal.model</groupId>
+			<artifactId>ietf-inet-types</artifactId>
+			<version>${odl.ietf-inet-types.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.opendaylight.mdsal.model</groupId>
+			<artifactId>ietf-yang-types</artifactId>
+			<version>${odl.ietf-yang-types.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.opendaylight.controller</groupId>
+			<artifactId>sal-core-api</artifactId>
+			<version>${odl.mdsal.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.opendaylight.yangtools</groupId>
+			<artifactId>yang-data-impl</artifactId>
+			<version>${odl.yangtools.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>equinoxSDK381</groupId>
+			<artifactId>org.eclipse.osgi</artifactId>
+			<version>${equinox.osgi.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>mysql</groupId>
+			<artifactId>mysql-connector-java</artifactId>
+			<version>${mysql.connector.version}</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.openecomp.sdnc.core</groupId>
+			<artifactId>dblib-provider</artifactId>
+			<version>${sdnctl.dblib.version}</version>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>1.7</source>
+					<target>1.7</target>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<version>2.4</version>
+				<configuration>
+					<includes>**/*.xsd</includes>
+					<archive>
+						<manifest>
+							<mainClass>org.openecomp.sdnc.sli.SvcLogicParser</mainClass>
+							<packageName>org.openecomp.sdnc.sli</packageName>
+							<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+						</manifest>
+					</archive>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<extensions>true</extensions>
+				<configuration>
+					<instructions>
+						<Export-Package>org.openecomp.sdnc.sli;version=${project.version}</Export-Package>
+						<Import-Package>*</Import-Package>
+						<Embed-Dependency>*;scope=compile;artifactId=commons-lang|commons-lang3</Embed-Dependency>
+						<Embed-Transitive>true</Embed-Transitive>
+					</instructions>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.antlr</groupId>
+				<artifactId>antlr4-maven-plugin</artifactId>
+				<version>${antlr.version}</version>
+				<executions>
+					<execution>
+						<configuration>
+							<outputDirectory>${project.basedir}/src/main/java/</outputDirectory>
+						</configuration>
+						<id>antlr</id>
+						<goals>
+							<goal>antlr4</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>
diff --git a/sli/common/src/main/antlr4/org/openecomp/sdnc/sli/ExprGrammar.g4 b/sli/common/src/main/antlr4/org/openecomp/sdnc/sli/ExprGrammar.g4
new file mode 100755
index 00000000..51f40169
--- /dev/null
+++ b/sli/common/src/main/antlr4/org/openecomp/sdnc/sli/ExprGrammar.g4
@@ -0,0 +1,66 @@
+grammar ExprGrammar;
+	
+options {
+	language = Java;
+}
+	
+
+COMPAREOP : '==' | '!=' | '>' | '<' | '>=' | '<=';
+
+RELOP : 'and' | 'or';
+
+ADDOP : '+' | '-';
+
+MULTOP : '/' | '*';
+
+NUMBER : ('0'..'9')+;
+
+STRING : '\'' ~[\']* '\'';
+
+IDENTIFIER : ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'0'..'9'|'_'|'-')*;
+
+// CONTEXT_VAR : '$' IDENTIFIER;
+
+WS: [ \n\t\r]+ -> skip;
+
+constant : NUMBER | STRING ;
+
+variableLead : ('$')? variableTerm ;
+
+variableTerm : IDENTIFIER ('[' expr ']')? ;
+
+variable : variableLead ('.' variableTerm)* ('.')?;
+
+// variable : CONTEXT_VAR  ( '[' expr ']' )? ('.' IDENTIFIER )? ;
+
+atom : constant | variable;
+
+
+expr : atom 
+     | parenExpr 
+     | multExpr 
+     | addExpr 
+     | compareExpr 
+     | relExpr 
+     | funcExpr;
+
+parenExpr : '(' expr ')';
+
+term : atom | parenExpr | funcExpr;
+
+multExpr : term (MULTOP term)*;
+
+addExpr : multExpr (ADDOP multExpr)*;
+
+compareExpr : addExpr COMPAREOP addExpr;
+
+relExpr : compareExpr (RELOP expr)*;
+
+funcExpr : IDENTIFIER '(' expr (',' expr)* ')';
+
+							
+
+
+ 
+        
+
diff --git a/sli/common/src/main/java/org/openecomp/sdnc/sli/BreakNodeException.java b/sli/common/src/main/java/org/openecomp/sdnc/sli/BreakNodeException.java
new file mode 100644
index 00000000..3e355baa
--- /dev/null
+++ b/sli/common/src/main/java/org/openecomp/sdnc/sli/BreakNodeException.java
@@ -0,0 +1,46 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdnc.sli;
+
+public class BreakNodeException extends SvcLogicException {
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	public BreakNodeException()
+	{
+		super();
+	}
+	
+	public BreakNodeException(String message)
+	{
+		super(message);
+	}
+	
+	public BreakNodeException(String message, Throwable t)
+	{
+		super(message, t);
+	}
+
+}
diff --git a/sli/common/src/main/java/org/openecomp/sdnc/sli/ConfigurationException.java b/sli/common/src/main/java/org/openecomp/sdnc/sli/ConfigurationException.java
new file mode 100644
index 00000000..fa1308f0
--- /dev/null
+++ b/sli/common/src/main/java/org/openecomp/sdnc/sli/ConfigurationException.java
@@ -0,0 +1,45 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdnc.sli;
+
+public class ConfigurationException extends SvcLogicException {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	
+	public ConfigurationException()
+	{
+		super();
+	}
+	
+	public ConfigurationException(String msg)
+	{
+		super(msg);
+	}
+
+	public ConfigurationException(String msg, Throwable t)
+	{
+		super(msg, t);
+	}
+}
diff --git a/sli/common/src/main/java/org/openecomp/sdnc/sli/DuplicateValueException.java b/sli/common/src/main/java/org/openecomp/sdnc/sli/DuplicateValueException.java
new file mode 100644
index 00000000..beb22b0b
--- /dev/null
+++ b/sli/common/src/main/java/org/openecomp/sdnc/sli/DuplicateValueException.java
@@ -0,0 +1,45 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdnc.sli;
+
+public class DuplicateValueException extends SvcLogicException {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	public DuplicateValueException()
+	{
+		super();
+	}
+	
+	public DuplicateValueException(String message)
+	{
+		super(message);
+	}
+	
+	public DuplicateValueException(String message, Throwable t)
+	{
+		super(message, t);
+	}
+}
diff --git a/sli/common/src/main/java/org/openecomp/sdnc/sli/MessageWriter.java b/sli/common/src/main/java/org/openecomp/sdnc/sli/MessageWriter.java
new file mode 100644
index 00000000..5e5b621b
--- /dev/null
+++ b/sli/common/src/main/java/org/openecomp/sdnc/sli/MessageWriter.java
@@ -0,0 +1,302 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdnc.sli;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.sql.SQLException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.Properties;
+
+import javax.sql.rowset.CachedRowSet;
+
+import org.openecomp.sdnc.sli.resource.dblib.DbLibService;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.FrameworkUtil;
+import org.osgi.framework.ServiceReference;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+public class MessageWriter {
+
+	private static final Logger LOG = LoggerFactory.getLogger(MessageWriter.class);
+
+	private static final String DBLIB_SERVICE = "org.openecomp.sdnc.sli.resource.dblib.DBResourceManager";
+	private static final String SVCLOGIC_PROP_VAR = "SDNC_SLI_PROPERTIES";
+	private static final String SDNC_CONFIG_DIR = "SDNC_CONFIG_DIR";
+
+	private static final String INCOMING_PROPERTY_NAME = "org.openecomp.sdnc.sli.MessageWriter.writeIncomingRequests";
+	private static final String OUTGOING_PROPERTY_NAME = "org.openecomp.sdnc.sli.MessageWriter.writeOutgoingRequests";
+
+	private static final SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
+
+	private static DbLibService dbLibService = null;
+
+	private static boolean incomingEnabled = false;
+	private static boolean outgoingEnabled = false;
+
+	private static boolean initialized = false;
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	private static void init() {
+		if (initialized)
+			return;
+
+		initialized = true;
+
+		// Read properties
+		Properties props = new Properties();
+		String propPath = System.getenv(SVCLOGIC_PROP_VAR);
+
+		if (propPath == null) {
+			String propDir = System.getenv(SDNC_CONFIG_DIR);
+			if (propDir == null) {
+				propDir = "/opt/sdnc/data/properties";
+			}
+			propPath = propDir + "/svclogic.properties";
+			LOG.warn("Environment variable " + SVCLOGIC_PROP_VAR + " unset - defaulting to " + propPath);
+		}
+
+		File propFile = new File(propPath);
+
+		if (!propFile.exists()) {
+			LOG.warn("Property file does not exist: " + propPath);
+		}
+
+		try {
+			props.load(new FileInputStream(propFile));
+		} catch (Exception e) {
+			LOG.warn("Error loading property file: " + propPath, e);
+		}
+
+		incomingEnabled = Boolean.valueOf(props.getProperty(INCOMING_PROPERTY_NAME, "false"));
+		outgoingEnabled = Boolean.valueOf(props.getProperty(OUTGOING_PROPERTY_NAME, "false"));
+
+		LOG.info(INCOMING_PROPERTY_NAME + ": " + incomingEnabled);
+		LOG.info(OUTGOING_PROPERTY_NAME + ": " + outgoingEnabled);
+
+		if (dbLibService != null)
+			return;
+
+		BundleContext bctx = FrameworkUtil.getBundle(MessageWriter.class).getBundleContext();
+
+		ServiceReference sref = bctx.getServiceReference(DBLIB_SERVICE);
+
+		if (sref == null) {
+			LOG.warn("Could not find service reference for DBLIB service (" + DBLIB_SERVICE + ")");
+		} else {
+			dbLibService = (DbLibService) bctx.getService(sref);
+			if (dbLibService == null) {
+				LOG.warn("Could not find service reference for DBLIB service (" + DBLIB_SERVICE + ")");
+			}
+		}
+	}
+
+	public static void saveOutgoingRequest(
+	        String requestId,
+	        String serviceInstanceId,
+	        String targetUrl,
+	        String request) {
+		try {
+			init();
+
+			if (!outgoingEnabled)
+				return;
+
+			if (serviceInstanceId == null || serviceInstanceId.trim().length() == 0)
+				serviceInstanceId = "NA";
+
+			int seqnum = getLastSequenceNumber("OUTGOING_MESSAGE", requestId) + 1;
+			String now = df.format(new Date());
+
+			String sql = "INSERT INTO OUTGOING_MESSAGE (\n" +
+			        "	request_id, sequence_number, service_instance_id, target_url, request, start_time)\n" +
+			        "VALUES (?, ?, ?, ?, ?, ?)";
+
+			ArrayList<String> data = new ArrayList<>();
+			data.add(requestId);
+			data.add(String.valueOf(seqnum));
+			data.add(serviceInstanceId);
+			data.add(targetUrl);
+			data.add(request);
+			data.add(now);
+
+			dbLibService.writeData(sql, data, null);
+
+		} catch (Exception e) {
+			LOG.warn("Failed to save outgoing request for request-id: " + requestId, e);
+		}
+	}
+
+	public static void saveOutgoingResponse(String requestId, int httpResponseCode, String response) {
+		try {
+			init();
+
+			if (!outgoingEnabled)
+				return;
+
+			int seqnum = getLastSequenceNumber("OUTGOING_MESSAGE", requestId);
+			if (seqnum == 0) {
+				LOG.warn("Failed to save outgoing response for request-id: " + requestId +
+				        ": Request record not found in OUTGOING_MESSAGE");
+				return;
+			}
+
+			String now = df.format(new Date());
+
+			String sql = "UPDATE OUTGOING_MESSAGE SET http_response_code = ?, response = ?,\n" +
+			        "	duration = timestampdiff(MICROSECOND, start_time, ?) / 1000\n" +
+			        "WHERE request_id = ? AND sequence_number = ?";
+
+			ArrayList<String> data = new ArrayList<>();
+			data.add(String.valueOf(httpResponseCode));
+			data.add(response);
+			data.add(now);
+			data.add(requestId);
+			data.add(String.valueOf(seqnum));
+
+			dbLibService.writeData(sql, data, null);
+
+		} catch (Exception e) {
+			LOG.warn("Failed to save outgoing response for request-id: " + requestId, e);
+		}
+	}
+
+	public static void saveIncomingRequest(
+	        String requestId,
+	        String serviceInstanceId,
+	        String requestHost,
+	        String request) {
+		try {
+			init();
+
+			if (!incomingEnabled)
+				return;
+
+			if (serviceInstanceId == null || serviceInstanceId.trim().length() == 0)
+				serviceInstanceId = "NA";
+
+			int seqnum = getLastSequenceNumber("INCOMING_MESSAGE", requestId) + 1;
+			String now = df.format(new Date());
+
+			String sql = "INSERT INTO INCOMING_MESSAGE (\n" +
+			        "	request_id, sequence_number, service_instance_id, request_host, request, start_time)\n" +
+			        "VALUES (?, ?, ?, ?, ?, ?)";
+
+			ArrayList<String> data = new ArrayList<>();
+			data.add(requestId);
+			data.add(String.valueOf(seqnum));
+			data.add(serviceInstanceId);
+			data.add(requestHost);
+			data.add(request);
+			data.add(now);
+
+			dbLibService.writeData(sql, data, null);
+
+		} catch (Exception e) {
+			LOG.warn("Failed to save incoming request for request-id: " + requestId, e);
+		}
+	}
+
+	public static void saveIncomingResponse(String requestId, int httpResponseCode, String response) {
+		try {
+			init();
+
+			if (!incomingEnabled)
+				return;
+
+			int seqnum = getLastSequenceNumber("INCOMING_MESSAGE", requestId);
+			if (seqnum == 0) {
+				LOG.warn("Failed to save response for request-id: " + requestId +
+				        ": Request record not found in INCOMING_MESSAGE");
+				return;
+			}
+
+			String now = df.format(new Date());
+
+			String sql = "UPDATE INCOMING_MESSAGE SET http_response_code = ?, response = ?,\n" +
+			        "	duration = timestampdiff(MICROSECOND, start_time, ?) / 1000\n" +
+			        "WHERE request_id = ? AND sequence_number = ?";
+
+			ArrayList<String> data = new ArrayList<>();
+			data.add(String.valueOf(httpResponseCode));
+			data.add(response);
+			data.add(now);
+			data.add(requestId);
+			data.add(String.valueOf(seqnum));
+
+			dbLibService.writeData(sql, data, null);
+
+		} catch (Exception e) {
+			LOG.warn("Failed to save response for request-id: " + requestId, e);
+		}
+	}
+
+	public static String getServiceInstanceId(String requestId) throws SQLException {
+		init();
+
+		String sql = "SELECT service_instance_id FROM OUTGOING_MESSAGE WHERE request_id = '" + requestId +
+		        "' ORDER BY sequence_number DESC";
+
+		CachedRowSet rs = null;
+		try {
+			rs = dbLibService.getData(sql, null, null);
+			if (rs.next()) {
+				return rs.getString("service_instance_id");
+			}
+		} finally {
+			if (rs != null) {
+				try {
+					rs.close();
+				} catch (Exception e) {
+					LOG.warn("Failed to close CachedRowSet", e);
+				}
+			}
+		}
+		return null;
+	}
+
+	private static int getLastSequenceNumber(String tableName, String requestId) throws SQLException {
+		String sql = "SELECT sequence_number FROM " + tableName + " WHERE request_id = '" + requestId +
+		        "' ORDER BY sequence_number DESC";
+
+		CachedRowSet rs = null;
+		try {
+			rs = dbLibService.getData(sql, null, null);
+			if (rs.next()) {
+				return rs.getInt("sequence_number");
+			}
+		} finally {
+			if (rs != null) {
+				try {
+					rs.close();
+				} catch (Exception e) {
+					LOG.warn("Failed to close CachedRowSet", e);
+				}
+			}
+		}
+		return 0;
+	}
+}
diff --git a/sli/common/src/main/java/org/openecomp/sdnc/sli/MetricLogger.java b/sli/common/src/main/java/org/openecomp/sdnc/sli/MetricLogger.java
new file mode 100644
index 00000000..14b1f008
--- /dev/null
+++ b/sli/common/src/main/java/org/openecomp/sdnc/sli/MetricLogger.java
@@ -0,0 +1,301 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+/**
+ *
+ */
+package org.openecomp.sdnc.sli;
+
+import java.net.InetAddress;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.TimeZone;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.MDC;
+
+/**
+ * @author dt5972
+ *
+ */
+public class MetricLogger {
+
+    private static final Logger KARAF = LoggerFactory.getLogger(MetricLogger.class);
+    private static final Logger METRIC = LoggerFactory.getLogger("org.openecomp.sdnc.filters.metric");
+
+    public static final String BEGIN_TIMESTAMP = "X-ECOMP-BeginTimestamp";
+    public static final String END_TIMESTAMP = "X-ECOMP-EndTimestamp";
+    public static final String REQUEST_ID = "X-ECOMP-RequestID";
+    public static final String SERVICE_INSTANCE_ID = "X-ECOMP-ServiceInstanceID";
+    public static final String SERVICE_NAME = "X-ECOMP-ServiceName";
+    public static final String PARTNER_NAME = "X-ECOMP-PartnerName";
+    public static final String TARGET_ENTITY = "X-ECOMP-TargetEntity";
+    public static final String TARGET_SERVICE_NAME = "X-ECOMP-TargetServiceName";
+    public static final String STATUS_CODE = "X-ECOMP-StatusCode";
+    public static final String RESPONSE_CODE = "X-ECOMP-ResponseCode";
+    public static final String RESPONSE_DESCRIPTION = "X-ECOMP-ResponseDescription";
+    public static final String INSTANCE_UUID = "X-ECOMP-InstanceUUID";
+    public static final String CATEGORY_LOG_LEVEL = "X-ECOMP-CategoryLogLevel";
+    public static final String SEVERITY = "X-ECOMP-Severity";
+    public static final String SERVER_IP_ADDRESS = "X-ECOMP-ServerIpAddress";
+    public static final String ELAPSED_TIME = "X-ECOMP-ElapsedTime";
+    public static final String SERVER = "X-ECOMP-Server";
+    public static final String CLIENT_IP = "X-ECOMP-ClientIp";
+    public static final String CLASS_NAME = "X-ECOMP-ClassName";
+    public static final String TARGET_VIRTUAL_ENTITY =  "X-ECOMP-TargetVirtualEntity";
+
+    private long beginTimestamp;
+    private String lastMsg = null;
+
+    public MetricLogger() {
+        beginTimestamp = System.currentTimeMillis();
+
+        try {
+            InetAddress localhost = InetAddress.getLocalHost();
+            setServerIpAddress(localhost.getHostAddress());
+            setServer(localhost.getCanonicalHostName());
+        } catch (Exception e) {
+            KARAF.error("Could not get localhost", e);
+        }
+
+    }
+
+
+    public String getBeginTimestamp() {
+        return MDC.get(BEGIN_TIMESTAMP);
+    }
+
+    private void setBeginTimestamp(long beginTimestamp) {
+        this.beginTimestamp = beginTimestamp;
+        MDC.put(BEGIN_TIMESTAMP, MetricLogger.asIso8601(beginTimestamp));
+    }
+
+    public String getEndTimestamp() {
+        return MDC.get(END_TIMESTAMP);
+    }
+
+    private void setEndTimestamp(long endTimestamp) {
+        // Set MDC with formatted time stamp
+        MDC.put(END_TIMESTAMP, MetricLogger.asIso8601(endTimestamp));
+
+        // Set elapsed time
+        setElapsedTime(endTimestamp - beginTimestamp);
+
+    }
+
+    public String getRequestID() {
+        return MDC.get(REQUEST_ID);
+    }
+
+
+    public String getServiceInstanceID() {
+        return MDC.get(SERVICE_INSTANCE_ID);
+    }
+
+    private void setServiceInstanceID(String svcInstanceId) {
+        MDC.put(SERVICE_INSTANCE_ID, svcInstanceId);
+    }
+
+    public String getServiceName() {
+        return MDC.get(SERVICE_NAME);
+    }
+
+    private void setServiceName(String svcName) {
+        MDC.put(SERVICE_NAME, svcName);
+    }
+
+    public String getPartnerName() {
+        return MDC.get(PARTNER_NAME);
+    }
+
+    private void setPartnerName(String partnerName) {
+        MDC.put(PARTNER_NAME, partnerName);
+    }
+
+    public String getTargetEntity() {
+        return MDC.get(TARGET_ENTITY);
+    }
+
+    private void setTargetEntity(String targetEntity) {
+        MDC.put(TARGET_ENTITY, targetEntity);
+    }
+
+    public String getTargetServiceName() {
+        return MDC.get(TARGET_SERVICE_NAME);
+    }
+
+    private void setTargetServiceName(String targetServiceName) {
+        MDC.put(TARGET_SERVICE_NAME, targetServiceName);
+    }
+
+    public String getStatusCode() {
+        return MDC.get(STATUS_CODE);
+    }
+
+    private void setStatusCode(String statusCode) {
+        MDC.put(STATUS_CODE, statusCode);
+    }
+
+    public String getResponseCode() {
+        return MDC.get(RESPONSE_CODE);
+    }
+
+    private void setResponseCode(String responseCode) {
+        MDC.put(RESPONSE_CODE, responseCode);
+    }
+
+    public String getResponseDescription() {
+        return MDC.get(RESPONSE_DESCRIPTION);
+    }
+
+    private void setResponseDescription(String responseDesc) {
+        MDC.put(RESPONSE_DESCRIPTION, responseDesc);
+    }
+
+    public String getInstanceUUID() {
+	return MDC.get(INSTANCE_UUID);
+    }
+
+    private void setInstanceUUID(String instanceUUID) {
+	MDC.put(INSTANCE_UUID, instanceUUID);
+    }
+
+    public String getCategoryLogLevel() {
+	return MDC.get(CATEGORY_LOG_LEVEL);
+    }
+
+    private void setCategoryLogLevel(String categoryLogLevel) {
+	MDC.put(CATEGORY_LOG_LEVEL, categoryLogLevel);
+    }
+    
+    public String getSeverity() {
+        return MDC.get(SEVERITY);
+    }
+
+    private void setSeverity(String severity) {
+        MDC.put(SEVERITY, severity);
+    }
+
+    public String getServerIpAddress() {
+        return MDC.get(SERVER_IP_ADDRESS);
+    }
+
+    private void setServerIpAddress(String serverIpAddress) {
+        MDC.put(SERVER_IP_ADDRESS, serverIpAddress);
+    }
+
+    public String getElapsedTime() {
+        return MDC.get(ELAPSED_TIME);
+    }
+
+    private void setElapsedTime(long elapsedTime) {
+        MDC.put(ELAPSED_TIME, ""+elapsedTime);
+    }
+
+    public String getServer() {
+        return MDC.get(SERVER);
+    }
+
+    private void setServer(String server) {
+        MDC.put(SERVER, server);
+    }
+
+    public String getClientIp() {
+        return MDC.get(CLIENT_IP);
+    }
+
+    private void setClientIp(String clientIp) {
+        MDC.put(CLIENT_IP, clientIp);
+    }
+
+    public String getClassName() {
+        return MDC.get(CLASS_NAME);
+    }
+
+    private void setClassName(String className) {
+        MDC.put(CLASS_NAME, className);
+    }
+
+    public String getTargetVirtualEntity() {
+        return MDC.get(TARGET_VIRTUAL_ENTITY);
+    }
+
+    private void setTargetVirtualEntity(String targetVirtualEntity) {
+        MDC.put(TARGET_VIRTUAL_ENTITY, targetVirtualEntity);
+    }
+
+    public static String asIso8601(Date date) {
+        TimeZone tz = TimeZone.getTimeZone("UTC");
+        DateFormat df = new SimpleDateFormat("yyy-MM-dd'T'HH:mm:ss:SS'+00:00'");
+        df.setTimeZone(tz);
+        return df.format(date);
+    }
+
+    public static String asIso8601(long tsInMillis) {
+        return MetricLogger.asIso8601(new Date(tsInMillis));
+    }
+
+    public void logRequest(String svcInstanceId, String svcName, String partnerName, String targetEntity, String targetServiceName,  String targetVirtualEntity, String msg) {
+
+        setBeginTimestamp(System.currentTimeMillis());
+
+        if (svcInstanceId != null) {
+            setServiceInstanceID(svcInstanceId);
+        }
+
+        if (svcName != null) {
+            setServiceName(svcName);
+        }
+
+        if (partnerName != null) {
+            setPartnerName(partnerName);
+        }
+
+        if (targetEntity != null) {
+            setTargetEntity(targetEntity);
+        }
+
+        if (targetServiceName != null) {
+            setTargetServiceName(targetServiceName);
+        }
+
+        if (targetVirtualEntity != null) {
+            setTargetVirtualEntity(targetVirtualEntity);
+        }
+
+        this.lastMsg = msg;
+
+
+    }
+
+    public void logResponse(String statusCode, String responseCode, String responseDescription) {
+        setEndTimestamp(System.currentTimeMillis());
+
+        setStatusCode(statusCode);
+        setResponseCode(responseCode);
+        setResponseDescription(responseDescription);
+
+        METRIC.info(lastMsg);
+
+    }
+}
diff --git a/sli/common/src/main/java/org/openecomp/sdnc/sli/SvcLogicAdaptor.java b/sli/common/src/main/java/org/openecomp/sdnc/sli/SvcLogicAdaptor.java
new file mode 100644
index 00000000..b4d62ab4
--- /dev/null
+++ b/sli/common/src/main/java/org/openecomp/sdnc/sli/SvcLogicAdaptor.java
@@ -0,0 +1,42 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdnc.sli;
+
+import java.util.Map;
+
+public interface SvcLogicAdaptor {
+	
+	public enum ConfigStatus {
+		SUCCESS,
+		ALREADY_ACTIVE,
+		NOT_FOUND,
+		NOT_READY,
+		FAILURE
+	}
+	
+	public ConfigStatus configure(String key, Map<String,String> parameters, SvcLogicContext ctx);
+	
+	public ConfigStatus activate(String key, SvcLogicContext ctx);
+	
+	public ConfigStatus deactivate(String key, SvcLogicContext ctx);
+	
+}
diff --git a/sli/common/src/main/java/org/openecomp/sdnc/sli/SvcLogicAtom.java b/sli/common/src/main/java/org/openecomp/sdnc/sli/SvcLogicAtom.java
new file mode 100644
index 00000000..9ac64893
--- /dev/null
+++ b/sli/common/src/main/java/org/openecomp/sdnc/sli/SvcLogicAtom.java
@@ -0,0 +1,174 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdnc.sli;
+
+import java.io.Serializable;
+import java.util.LinkedList;
+import java.util.List;
+
+public class SvcLogicAtom extends SvcLogicExpression {
+	
+	public enum AtomType {
+		NUMBER,
+		STRING,
+		IDENTIFIER,
+		CONTEXT_VAR
+
+	}
+	
+	private AtomType atomType;
+	private String atom;
+
+
+	public SvcLogicAtom(String atomType, String atom)
+	{
+		this.atomType = AtomType.valueOf(atomType);
+		this.atom = atom;
+		
+	}
+	
+	public SvcLogicAtom(String atom)
+	{
+
+		if (atom == null)
+		{
+			this.atomType = null;
+			this.atom = null;
+		}
+		else
+		{
+			if (atom.startsWith("$"))
+			{
+				this.atomType = AtomType.CONTEXT_VAR;
+				this.atom = atom.substring(1);
+			}
+			else
+			{
+				if (Character.isDigit(atom.charAt(0)))
+				{
+					this.atomType = AtomType.NUMBER;
+					this.atom = atom;
+				}
+				else if (atom.charAt(0) == '\'')
+				{
+					this.atomType = AtomType.STRING;
+					this.atom = atom.substring(1, atom.length()-1);
+				}
+				else
+				{
+					this.atomType = AtomType.IDENTIFIER;
+					this.atom = atom;
+					
+				}
+					
+			}
+		}
+	}
+
+	public AtomType getAtomType() {
+		return atomType;
+	}
+	
+	public void setAtomType(String newType)
+	{
+		atomType = AtomType.valueOf(newType);
+	}
+
+	public String getAtom() {
+		return atom;
+	}
+	
+	
+	
+	public void setAtomType(AtomType atomType) {
+		this.atomType = atomType;
+	}
+
+	public void setAtom(String atom) {
+		this.atom = atom;
+	}
+
+
+
+	public String toString()
+	{
+		StringBuffer sbuff = new StringBuffer();
+		switch(getAtomType())
+		{
+		case CONTEXT_VAR:
+			sbuff.append("$");
+		case IDENTIFIER:
+			boolean needDot = false;
+			for (SvcLogicExpression term: this.getOperands())
+			{
+				if (needDot)
+				{
+					sbuff.append(".");
+				}
+				sbuff.append(term.toString());
+				needDot = true;
+			}
+			return(sbuff.toString());
+		case STRING:
+		case NUMBER:
+		default:
+			return(atom);
+		}
+	}
+	
+	public String asParsedExpr()
+	{
+		// simplify debugging output for NUMBER type
+		if (atomType == AtomType.NUMBER) {
+			return atom;
+		}
+
+		StringBuffer sbuff = new StringBuffer();
+		
+		sbuff.append("(atom");
+		sbuff.append("<");
+		sbuff.append(atomType.toString());
+		sbuff.append(">");
+		
+		switch(atomType)
+		{
+		case IDENTIFIER:
+		case CONTEXT_VAR:
+			for (SvcLogicExpression term : getOperands())
+			{
+				sbuff.append(" ");
+				sbuff.append(term.asParsedExpr());
+				
+			}
+			break;
+		default:
+			sbuff.append(" ");
+			sbuff.append(atom);
+		}
+		
+		sbuff.append(")");
+		return(sbuff.toString());
+	}
+
+	
+	
+}
diff --git a/sli/common/src/main/java/org/openecomp/sdnc/sli/SvcLogicBinaryExpression.java b/sli/common/src/main/java/org/openecomp/sdnc/sli/SvcLogicBinaryExpression.java
new file mode 100644
index 00000000..1d780d7e
--- /dev/null
+++ b/sli/common/src/main/java/org/openecomp/sdnc/sli/SvcLogicBinaryExpression.java
@@ -0,0 +1,149 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdnc.sli;
+
+import java.util.LinkedList;
+import java.util.List;
+
+public class SvcLogicBinaryExpression extends SvcLogicExpression {
+	
+
+	public enum OperatorType {
+		addOp("+"),
+		subOp("-"),
+		multOp("*"),
+		divOp("/"),
+		equalOp("=="),
+		ltOp("<"),
+		leOp("<="),
+		gtOp(">"),
+		geOp(">="),
+		neOp("!="),
+		andOp("and"),
+		orOp("or");
+		
+		private String text;
+		
+		private OperatorType(String text)
+		{
+			this.text = text;
+		}
+		
+		public String getText()
+		{
+			return(text);
+		}
+		
+		public static OperatorType fromString(String text)
+		{
+			if (text != null)
+			{
+				for (OperatorType t : OperatorType.values())
+				{
+					if (text.equalsIgnoreCase(t.getText())) {
+						
+						return(t);
+					}
+				}
+			}
+			return(null);
+		}
+		
+		public String toString()
+		{
+			return(text);
+		}
+	}
+	private List<OperatorType> operators;
+	
+	public List<OperatorType> getOperators() {
+		return operators;
+	}
+
+	public SvcLogicBinaryExpression()
+	{
+		operators = new LinkedList<OperatorType>();
+	}
+	
+	public void addOperator(String operator)
+	{
+		operators.add(OperatorType.fromString(operator));
+	}
+
+	
+	public String toString()
+	{
+		
+		List<SvcLogicExpression>operands = getOperands();
+		StringBuffer sbuff = new StringBuffer();
+
+		sbuff.append(operands.get(0).toString());
+		for (int i = 0 ; i < operators.size(); i++)
+		{
+			sbuff.append(" ");
+			sbuff.append(operators.get(i));
+			sbuff.append(" ");
+			if (i + 1 < operands.size()) {
+				sbuff.append(operands.get(i + 1).toString());
+			} else {
+				// expression incomplete; operand not bound yet
+				sbuff.append("?");
+			}
+		}
+		
+		return(sbuff.toString());
+
+	}
+	
+	public String asParsedExpr() {
+
+		List<SvcLogicExpression> operands = getOperands();
+
+		if (operators.isEmpty()) {
+			return operands.get(0).asParsedExpr();
+		} else {
+			StringBuffer sbuff = new StringBuffer();
+			// operators in reverse order for left associativity
+			for (int i = operators.size() - 1; i >= 0; --i) {
+				sbuff.append("(");
+				sbuff.append(operators.get(i).getText());
+				sbuff.append(" ");
+			}
+			for (int i = 0; i < operators.size() + 1; ++i) {
+				if (i < operands.size()) {
+					sbuff.append(operands.get(i).asParsedExpr());
+				} else {
+					// expression incomplete; operand not bound yet
+					sbuff.append("?");
+				}
+				if (i != 0) {
+					sbuff.append(")");
+				}
+				if (i < operators.size()) {
+					sbuff.append(" ");
+				}
+			}
+			return sbuff.toString();
+		}
+	}
+
+}
diff --git a/sli/common/src/main/java/org/openecomp/sdnc/sli/SvcLogicContext.java b/sli/common/src/main/java/org/openecomp/sdnc/sli/SvcLogicContext.java
new file mode 100644
index 00000000..79082af2
--- /dev/null
+++ b/sli/common/src/main/java/org/openecomp/sdnc/sli/SvcLogicContext.java
@@ -0,0 +1,248 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdnc.sli;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+
+import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.Text;
+
+
+public class SvcLogicContext {
+
+	private static final Logger LOG = LoggerFactory
+			.getLogger(SvcLogicContext.class);
+	
+	private HashMap<String, String> attributes;
+	
+	private DOMDataBroker domDataBroker;
+	
+	private String status = "success";
+	
+	public SvcLogicContext()
+	{
+		this.attributes = new HashMap<String,String> ();
+		
+	}
+	
+	public SvcLogicContext(Properties props)
+	{
+		this.attributes = new HashMap<String, String> ();
+		
+		if (props.containsKey("SvcLogic.status"))
+		{
+			this.status = props.getProperty("SvcLogic.status");
+		}
+		
+		for (Object nameObj : props.keySet())
+		{
+			String propName = (String) nameObj;
+			attributes.put(propName, props.getProperty(propName));
+		}
+	}
+	
+	
+	
+	public DOMDataBroker getDomDataBroker() {
+		return domDataBroker;
+	}
+
+	public void setDomDataBroker(DOMDataBroker domDataBroker) {
+		this.domDataBroker = domDataBroker;
+	}
+
+	public String getAttribute(String name)
+	{
+		if (attributes.containsKey(name))
+		{
+			return(attributes.get(name));
+		}
+		else
+		{
+			return(null);
+		}
+	}
+	
+	public void setAttribute(String name, String value)
+	{
+		if (value == null) {
+			if (attributes.containsKey(name)) {
+				attributes.remove(name);
+			}
+		} else {
+			attributes.put(name, value);
+		}
+	}
+	
+	public Set<String> getAttributeKeySet()
+	{
+		return(attributes.keySet());
+	}
+
+	public String getStatus() {
+		return status;
+	}
+
+	public void setStatus(String status) {
+		this.status = status;
+	}
+	
+	public Properties toProperties()
+	{
+		Properties props = new Properties();
+		
+		if (status != null)
+		{
+			props.setProperty("SvcLogic.status", status);
+		}
+		
+		for (String attrName : attributes.keySet())
+		{
+			String attrVal = attributes.get(attrName);
+			if (attrVal == null) {
+				LOG.warn("attribute " + attrName
+						+ "null - setting to empty string");
+				props.setProperty(attrName, "");
+			} else {
+				props.setProperty(attrName, attributes.get(attrName));
+			}
+		}
+		
+		return(props);
+	}
+	
+	public void mergeDocument(String pfx, Document doc) {
+		String prefix = "";
+		
+		if (pfx != null) {
+			prefix = pfx;
+		}
+		
+		Element root = doc.getDocumentElement();
+		
+		mergeElement(prefix, root, null);
+	}
+	
+	public void mergeElement(String pfx, Element element, Map<String, Integer> nodeMap) {
+		
+		// In XML, cannot tell the difference between containers and lists.
+		// So, have to treat each element as both (ugly but necessary).
+		// We do this by passing a nodeMap to be used to count instance of each tag, 
+		// which will be used to set _length and to set index 
+		
+		LOG.trace("mergeElement("+pfx+","+element.getTagName()+","+nodeMap+")");
+
+		String curTagName = element.getTagName();
+		String prefix = curTagName;
+		
+		if (pfx != null) {
+			prefix = pfx + "." + prefix;
+		}
+		
+		int myIdx = 0;
+		
+		if (nodeMap != null) {
+			if (nodeMap.containsKey(curTagName)) {
+				myIdx = nodeMap.get(curTagName).intValue();
+			}
+
+			nodeMap.put(curTagName, new Integer(myIdx+1));
+			this.setAttribute(prefix+"_length", ""+(myIdx+1));
+		}
+		
+		NodeList children = element.getChildNodes();
+		
+		int numChildren  = children.getLength();
+		
+		Map<String, Integer> childMap = new HashMap<String, Integer>();
+		Map<String, Integer> idxChildMap = new HashMap<String, Integer>();
+		
+		for (int i = 0 ; i < numChildren ; i++) {
+			Node curNode = children.item(i);
+			
+			if (curNode instanceof Text) {
+				Text curText = (Text) curNode;
+				String curTextValue = curText.getTextContent();
+				LOG.trace("Setting ctx variable "+prefix+" = "+curTextValue);
+				this.setAttribute(prefix, curText.getTextContent());
+				
+
+			} else if (curNode instanceof Element) {
+				mergeElement(prefix, (Element) curNode, childMap);
+				if (nodeMap != null) {
+
+					mergeElement(prefix+"["+myIdx+"]", (Element)curNode, idxChildMap);
+
+				}
+			}
+		}
+		
+	}
+	
+	public String resolve(String ctxVarName) {
+
+		if (ctxVarName.indexOf('[') == -1) {
+			// Ctx variable contains no arrays
+			return (this.getAttribute(ctxVarName));
+		}
+
+		// Resolve any array references
+		StringBuffer sbuff = new StringBuffer();
+		String[] ctxVarParts = ctxVarName.split("\\[");
+		sbuff.append(ctxVarParts[0]);
+		for (int i = 1; i < ctxVarParts.length; i++) {
+			if (ctxVarParts[i].startsWith("$")) {
+				int endBracketLoc = ctxVarParts[i].indexOf("]");
+				if (endBracketLoc == -1) {
+					// Missing end bracket ... give up parsing
+					LOG.warn("Variable reference " + ctxVarName
+							+ " seems to be missing a ']'");
+					return (this.getAttribute(ctxVarName));
+				}
+
+				String idxVarName = ctxVarParts[i].substring(1, endBracketLoc);
+				String remainder = ctxVarParts[i].substring(endBracketLoc);
+
+				sbuff.append("[");
+				sbuff.append(this.getAttribute(idxVarName));
+				sbuff.append(remainder);
+
+			} else {
+				// Index is not a variable reference
+				sbuff.append("[");
+				sbuff.append(ctxVarParts[i]);
+			}
+		}
+
+		return (this.getAttribute(sbuff.toString()));
+	}
+
+}
diff --git a/sli/common/src/main/java/org/openecomp/sdnc/sli/SvcLogicDblibStore.java b/sli/common/src/main/java/org/openecomp/sdnc/sli/SvcLogicDblibStore.java
new file mode 100644
index 00000000..d494eaab
--- /dev/null
+++ b/sli/common/src/main/java/org/openecomp/sdnc/sli/SvcLogicDblibStore.java
@@ -0,0 +1,533 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdnc.sli;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.sql.Blob;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Properties;
+
+import javax.sql.rowset.CachedRowSet;
+
+import org.openecomp.sdnc.sli.resource.dblib.DBResourceManager;
+import org.openecomp.sdnc.sli.resource.dblib.DbLibService;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.FrameworkUtil;
+import org.osgi.framework.ServiceReference;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class SvcLogicDblibStore implements SvcLogicStore {
+
+	private static final String SDNC_CONFIG_DIR = "SDNC_CONFIG_DIR";
+
+	private static final Logger LOG = LoggerFactory
+			.getLogger(SvcLogicDblibStore.class);
+
+	private static final String DBLIB_SERVICE =
+	// "org.openecomp.sdnc.sli.resource.dblib.DBLibService";
+	"org.openecomp.sdnc.sli.resource.dblib.DBResourceManager";
+
+	Properties props = null;
+
+	public void init(Properties props) throws ConfigurationException {
+
+		DbLibService dbSvc = getDbLibService();
+		if(dbSvc == null) {
+			LOG.error("SvcLogic cannot acquire DBLIB_SERVICE");
+			return;
+		}
+		try {
+			dbSvc.getData("select 1 from DUAL", new ArrayList<String>(), null);
+			LOG.debug("SQL test was successful");
+		} catch (SQLException e) {
+			LOG.error("Failed SQL test", e);
+		}
+	}
+
+	public boolean hasGraph(String module, String rpc, String version,
+			String mode) throws SvcLogicException {
+
+		DbLibService dbSvc = getDbLibService();
+
+		boolean retval = false;
+		CachedRowSet results = null;
+		String hasVersionGraphSql = "SELECT count(*) FROM SVC_LOGIC"
+				+ " WHERE module = ? AND rpc = ? AND mode = ? AND version = ?";
+
+		String hasActiveGraphSql = "SELECT count(*) FROM SVC_LOGIC"
+				+ " WHERE module = ? AND rpc = ? AND mode = ? AND active = 'Y'";
+
+		PreparedStatement hasGraphStmt = null;
+
+		ArrayList<String> args = new ArrayList<String>();
+		args.add(module);
+		args.add(rpc);
+		args.add(mode);
+
+		try {
+
+			if (version == null) {
+				results = dbSvc.getData(hasActiveGraphSql, args, null);
+			} else {
+				args.add(version);
+				results = dbSvc.getData(hasVersionGraphSql, args, null);
+			}
+
+			if (results.next()) {
+				int cnt = results.getInt(1);
+
+				if (cnt > 0) {
+					retval = true;
+				}
+
+			}
+		} catch (Exception e) {
+			throw new ConfigurationException("SQL query failed", e);
+		} finally {
+			if (results != null) {
+				try {
+
+					results.close();
+				} catch (SQLException x) {
+				}
+			}
+
+		}
+
+		return (retval);
+
+	}
+
+	public SvcLogicGraph fetch(String module, String rpc, String version,
+			String mode) throws SvcLogicException {
+
+		DbLibService dbSvc = getDbLibService();
+
+		Connection dbConn = null;
+		SvcLogicGraph retval = null;
+		ResultSet results = null;
+
+		String fetchVersionGraphSql = "SELECT graph FROM SVC_LOGIC"
+				+ " WHERE module = ? AND rpc = ? AND mode = ? AND version = ?";
+
+		String fetchActiveGraphSql = "SELECT graph FROM SVC_LOGIC"
+				+ " WHERE module = ? AND rpc = ? AND mode = ? AND active = 'Y'";
+
+
+		try {
+			dbConn = ((DBResourceManager) dbSvc).getConnection();
+			PreparedStatement fetchGraphStmt;
+
+			ArrayList<String> args = new ArrayList<String>();
+			args.add(module);
+			args.add(rpc);
+			args.add(mode);
+
+			if (version == null) {
+				fetchGraphStmt = dbConn.prepareStatement(fetchActiveGraphSql);
+			} else {
+				fetchGraphStmt = dbConn.prepareStatement(fetchVersionGraphSql);
+			}
+
+			fetchGraphStmt.setString(1, module);
+			fetchGraphStmt.setString(2,  rpc);
+			fetchGraphStmt.setString(3, mode);
+			if (version != null) {
+				fetchGraphStmt.setString(4,version);
+			}
+
+			results = fetchGraphStmt.executeQuery();
+
+			if (results.next()) {
+				Blob graphBlob = results.getBlob("graph");
+
+				ObjectInputStream gStream = new ObjectInputStream(
+						graphBlob.getBinaryStream());
+
+				Object graphObj = gStream.readObject();
+				gStream.close();
+
+				if (graphObj instanceof SvcLogicGraph) {
+					retval = (SvcLogicGraph) graphObj;
+				} else {
+					throw new ConfigurationException("invalid type for graph ("
+							+ graphObj.getClass().getName());
+
+				}
+
+			} else {
+				return (null);
+			}
+		} catch (SQLException e) {
+			throw new ConfigurationException("SQL query failed", e);
+		} catch (Exception e) {
+			throw new ConfigurationException("Graph processing failed", e);
+		} finally {
+			if (results != null) {
+				try {
+					results.close();
+				} catch (SQLException x) {
+				}
+			}
+			try {
+				if (dbConn != null && !dbConn.isClosed()) {
+					dbConn.close();
+				}
+			} catch (Throwable exc) {
+				// the exception not monitored
+			} finally {
+				dbConn = null;
+			}
+
+		}
+
+		return (retval);
+
+	}
+
+	public void store(SvcLogicGraph graph) throws SvcLogicException {
+
+		DbLibService dbSvc = getDbLibService();
+
+		String storeGraphSql = "INSERT INTO SVC_LOGIC (module, rpc, version, mode, active, graph)"
+				+ " VALUES(?, ?, ?, ?, ?, ?)";
+
+		if (graph == null) {
+			throw new SvcLogicException("graph cannot be null");
+		}
+
+		byte[] graphBytes = null;
+
+		ByteArrayOutputStream byteStr = null;
+		ObjectOutputStream goutStr = null;
+
+		try {
+			byteStr = new ByteArrayOutputStream();
+			goutStr = new ObjectOutputStream(byteStr);
+			goutStr.writeObject(graph);
+
+			graphBytes = byteStr.toByteArray();
+
+		} catch (Exception e) {
+			throw new SvcLogicException("could not serialize graph", e);
+		} finally {
+
+			if (goutStr != null) {
+				try {
+					goutStr.close();
+				} catch (IOException e) {
+
+				}
+			}
+
+			if (byteStr != null) {
+				try {
+					byteStr.close();
+				} catch (IOException e) {
+
+				}
+			}
+		}
+
+		// If object already stored in database, delete it
+		if (hasGraph(graph.getModule(), graph.getRpc(), graph.getVersion(),
+				graph.getMode())) {
+			delete(graph.getModule(), graph.getRpc(), graph.getVersion(),
+					graph.getMode());
+		}
+
+		Connection dbConn = null;
+
+		try {
+			dbConn = ((DBResourceManager) dbSvc).getConnection();
+			boolean oldAutoCommit = dbConn.getAutoCommit();
+			dbConn.setAutoCommit(false);
+			PreparedStatement storeGraphStmt = dbConn
+					.prepareStatement(storeGraphSql);
+			storeGraphStmt.setString(1, graph.getModule());
+			storeGraphStmt.setString(2, graph.getRpc());
+			storeGraphStmt.setString(3, graph.getVersion());
+			storeGraphStmt.setString(4, graph.getMode());
+			storeGraphStmt.setString(5, "N");
+			storeGraphStmt.setBlob(6, new ByteArrayInputStream(graphBytes));
+
+			storeGraphStmt.executeUpdate();
+			dbConn.commit();
+
+			dbConn.setAutoCommit(oldAutoCommit);
+		} catch (Exception e) {
+			throw new SvcLogicException("Could not write object to database", e);
+		} finally {
+			try {
+				if (dbConn != null && !dbConn.isClosed()) {
+					dbConn.close();
+				}
+			} catch (Throwable exc) {
+				// the exception not monitored
+			} finally {
+				dbConn = null;
+			}
+
+		}
+	}
+
+	public void delete(String module, String rpc, String version, String mode)
+			throws SvcLogicException {
+
+		DbLibService dbSvc = getDbLibService();
+
+		String deleteGraphSql = "DELETE FROM SVC_LOGIC WHERE module = ? AND rpc = ? AND version = ? AND mode = ?";
+
+		ArrayList<String> args = new ArrayList<String>();
+
+		args.add(module);
+		args.add(rpc);
+		args.add(version);
+		args.add(mode);
+
+		try {
+			dbSvc.writeData(deleteGraphSql, args, null);
+		} catch (Exception e) {
+			throw new SvcLogicException(
+					"Could not delete object from database", e);
+		}
+	}
+
+	public void activate(SvcLogicGraph graph) throws SvcLogicException {
+		DbLibService dbSvc = getDbLibService();
+
+		String deactivateSql = "UPDATE SVC_LOGIC SET active = 'N' WHERE module = ? AND rpc = ? AND mode = ?";
+
+		String activateSql = "UPDATE SVC_LOGIC SET active = 'Y' WHERE module = ? AND rpc = ? AND mode = ? AND version = ?";
+
+		ArrayList<String> args = new ArrayList<String>();
+
+		args.add(graph.getModule());
+		args.add(graph.getRpc());
+		args.add(graph.getMode());
+
+		try {
+
+			dbSvc.writeData(deactivateSql, args, null);
+
+			args.add(graph.getVersion());
+			dbSvc.writeData(activateSql, args, null);
+
+		} catch (Exception e) {
+			throw new SvcLogicException("Could not activate graph", e);
+		}
+	}
+
+	@Override
+	public void registerNodeType(String nodeType) throws SvcLogicException {
+
+		String registerNodeSql = "INSERT INTO NODE_TYPES (nodetype) VALUES(?)";
+
+		if (isValidNodeType(nodeType)) {
+			return;
+		}
+
+		DbLibService dbSvc = getDbLibService();
+		ArrayList<String> args = new ArrayList<String>();
+
+		args.add(nodeType);
+
+		try {
+			dbSvc.writeData(registerNodeSql, args, null);
+		} catch (Exception e) {
+			throw new SvcLogicException("Could not add node type to database",
+					e);
+		}
+
+	}
+
+	@Override
+	public void unregisterNodeType(String nodeType) throws SvcLogicException {
+
+		if (!isValidNodeType(nodeType)) {
+			return;
+		}
+
+		String unregisterNodeSql = "DELETE FROM NODE_TYPES WHERE nodetype = ?";
+
+		DbLibService dbSvc = getDbLibService();
+		ArrayList<String> args = new ArrayList<String>();
+
+		args.add(nodeType);
+
+		try {
+			dbSvc.writeData(unregisterNodeSql, args, null);
+		} catch (Exception e) {
+			throw new SvcLogicException(
+					"Could not delete node type from database", e);
+		}
+
+	}
+
+	@Override
+	public boolean isValidNodeType(String nodeType) throws SvcLogicException {
+
+		String validateNodeSql = "SELECT count(*) FROM NODE_TYPES WHERE nodetype = ?";
+
+		DbLibService dbSvc = getDbLibService();
+
+		ArrayList<String> args = new ArrayList<String>();
+
+		args.add(nodeType);
+
+		boolean isValid = false;
+
+		CachedRowSet results = null;
+		try {
+			results = dbSvc.getData(validateNodeSql, args, null);
+			if (results != null) {
+				if (results.next()) {
+					int cnt = results.getInt(1);
+
+					if (cnt > 0) {
+						isValid = true;
+					}
+				}
+			}
+		} catch (Exception e) {
+			throw new SvcLogicException(
+					"Cannot select node type from database", e);
+		} finally {
+			if (results != null) {
+				try {
+					results.close();
+				} catch (SQLException x) {
+				}
+			}
+
+		}
+
+		return (isValid);
+	}
+
+	private DbLibService getDbLibService() {
+
+		// Get DbLibService interface object.
+		DbLibService dblibSvc = null;
+		ServiceReference sref = null;
+		BundleContext bctx = null;
+
+		Bundle bundle = FrameworkUtil.getBundle(SvcLogicDblibStore.class);
+
+		if (bundle != null) {
+			bctx = bundle.getBundleContext();
+
+			if (bctx != null) {
+				sref = bctx.getServiceReference(DBLIB_SERVICE);
+			}
+
+			if (sref == null) {
+				LOG.warn("Could not find service reference for DBLIB service ("
+						+ DBLIB_SERVICE + ")");
+			} else {
+				dblibSvc = (DbLibService) bctx.getService(sref);
+				if (dblibSvc == null) {
+
+					LOG.warn("Could not find service reference for DBLIB service ("
+							+ DBLIB_SERVICE + ")");
+				}
+			}
+		}
+
+		// initialize a stand-alone instance of dblib resource
+		else {
+			// Try to create a DbLibService object from dblib properties
+			if(JavaSingleton.getInstance() == null){
+				Properties dblibProps = new Properties();
+
+				String propDir = System.getenv(SDNC_CONFIG_DIR);
+				if (propDir == null) {
+
+					propDir = "/opt/sdnc/data/properties";
+				}
+				String propPath = propDir + "/dblib.properties";
+
+				File propFile = new File(propPath);
+
+				if (!propFile.exists()) {
+
+					LOG.warn(
+							"Missing configuration properties file : "
+									+ propFile);
+					return(null);
+				}
+
+				try {
+
+					dblibProps.load(new FileInputStream(propFile));
+				} catch (Exception e) {
+					LOG.warn(
+							"Could not load properties file " + propPath, e);
+					return(null);
+
+				}
+
+				try {
+					dblibSvc = DBResourceManager.create(dblibProps);
+					JavaSingleton.setInstance(dblibSvc);
+				} catch (Exception e) {
+					LOG.warn("Caught exception trying to create DBResourceManager", e);
+				}
+			} else {
+				dblibSvc = JavaSingleton.getInstance();
+			}
+		}
+		return (dblibSvc);
+	}
+
+
+	static class JavaSingleton {
+	     /* Private constructor     */
+	     private JavaSingleton() {
+	        /* the body of the constructor here */
+	     }
+
+	     /* instance of the singleton declaration */
+	     private static volatile  DbLibService INSTANCE ;
+
+	     /* Access point to the unique instance of the singleton */
+	     public static DbLibService getInstance() {
+	        return INSTANCE;
+	     }
+
+	     public static void setInstance(DbLibService dbresource) {
+		        INSTANCE = dbresource;
+		     }
+	}
+}
diff --git a/sli/common/src/main/java/org/openecomp/sdnc/sli/SvcLogicException.java b/sli/common/src/main/java/org/openecomp/sdnc/sli/SvcLogicException.java
new file mode 100644
index 00000000..c087b8ad
--- /dev/null
+++ b/sli/common/src/main/java/org/openecomp/sdnc/sli/SvcLogicException.java
@@ -0,0 +1,46 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdnc.sli;
+
+public class SvcLogicException extends Exception {
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	public SvcLogicException()
+	{
+		super();
+	}
+	
+	public SvcLogicException(String message)
+	{
+		super(message);
+	}
+	
+	public SvcLogicException(String message, Throwable t)
+	{
+		super(message, t);
+	}
+
+}
diff --git a/sli/common/src/main/java/org/openecomp/sdnc/sli/SvcLogicExprListener.java b/sli/common/src/main/java/org/openecomp/sdnc/sli/SvcLogicExprListener.java
new file mode 100644
index 00000000..4fef12fb
--- /dev/null
+++ b/sli/common/src/main/java/org/openecomp/sdnc/sli/SvcLogicExprListener.java
@@ -0,0 +1,316 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdnc.sli;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import org.antlr.v4.runtime.tree.TerminalNode;
+import org.openecomp.sdnc.sli.ExprGrammarParser.AddExprContext;
+import org.openecomp.sdnc.sli.ExprGrammarParser.AtomContext;
+import org.openecomp.sdnc.sli.ExprGrammarParser.CompareExprContext;
+import org.openecomp.sdnc.sli.ExprGrammarParser.ConstantContext;
+import org.openecomp.sdnc.sli.ExprGrammarParser.ExprContext;
+import org.openecomp.sdnc.sli.ExprGrammarParser.FuncExprContext;
+import org.openecomp.sdnc.sli.ExprGrammarParser.MultExprContext;
+import org.openecomp.sdnc.sli.ExprGrammarParser.ParenExprContext;
+import org.openecomp.sdnc.sli.ExprGrammarParser.RelExprContext;
+import org.openecomp.sdnc.sli.ExprGrammarParser.VariableContext;
+import org.openecomp.sdnc.sli.ExprGrammarParser.VariableLeadContext;
+import org.openecomp.sdnc.sli.ExprGrammarParser.VariableTermContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class SvcLogicExprListener extends ExprGrammarBaseListener 
+{
+
+
+
+
+	private static final Logger LOG = LoggerFactory
+			.getLogger(SvcLogicExprListener.class);
+	
+	private SvcLogicExpression curExpr;
+	private SvcLogicExpression topExpr;
+	private LinkedList<SvcLogicExpression> exprStack;
+	
+	public SvcLogicExprListener()
+	{
+		exprStack = new LinkedList<SvcLogicExpression>();
+	}
+	
+	public SvcLogicExpression getParsedExpr()
+	{
+		return(curExpr);
+	}
+
+	private void pushOperand(SvcLogicExpression operand)
+	{
+		if (curExpr == null)
+		{
+			curExpr = operand;
+		}
+		else
+		{
+			curExpr.addOperand(operand);
+		}
+	}
+	
+	private void pushExpr(SvcLogicExpression expr)
+	{
+		LOG.trace("Pushing expression ["+expr.getClass().getName()+"]");
+		if (curExpr != null)
+		{
+			exprStack.push(curExpr);
+		}
+		curExpr = expr;
+	}
+	
+	private void popExpr()
+	{
+		if (exprStack.isEmpty())
+		{
+			LOG.trace("Popping last expression");
+			topExpr = curExpr;
+		}
+		else
+		{
+			SvcLogicExpression lastExpr = curExpr;
+			curExpr = exprStack.pop();
+			curExpr.addOperand(lastExpr);
+			LOG.trace("New curExpr is ["+curExpr.getClass().getName()+"]");
+		}
+		
+	}
+	
+	@Override
+	public void enterAtom(AtomContext ctx) {
+		
+		String atomText = ctx.getText();
+		
+		LOG.trace("enterAtom: text = "+atomText);
+
+		
+		SvcLogicAtom newAtom = new SvcLogicAtom(atomText);
+		
+		pushExpr(newAtom);
+	}
+
+
+	@Override
+	public void enterMultExpr(MultExprContext ctx) {
+		LOG.trace("enterMultExpr: text = "+ctx.getText());
+		
+		SvcLogicBinaryExpression curBinExpr = new SvcLogicBinaryExpression();
+		pushExpr(curBinExpr);
+		
+		List<TerminalNode> opList = ctx.MULTOP();
+		
+		for (TerminalNode nd : opList)
+		{
+			LOG.trace("enterMultExpr: operator - "+nd.getText());
+			curBinExpr.addOperator(nd.getText());
+		}
+
+	}
+
+	@Override
+	public void exitMultExpr(MultExprContext ctx) {
+
+		LOG.trace("exitMultExpr: text = "+ctx.getText());
+
+		popExpr();
+		
+	}
+
+	@Override
+	public void exitAtom(AtomContext ctx) {
+		LOG.trace("exitAtom: text = "+ctx.getText());
+		popExpr();
+	}
+
+	@Override
+	public void enterAddExpr(AddExprContext ctx) {
+		LOG.trace("enterAddExpr: text = "+ctx.getText());
+		List<TerminalNode> opList = ctx.ADDOP();
+		
+
+		SvcLogicBinaryExpression curBinExpr = new SvcLogicBinaryExpression();
+		pushExpr(curBinExpr);
+
+		
+		for (TerminalNode nd : opList)
+		{
+			LOG.trace("enterAddExpr: operator - "+nd.getText());
+			curBinExpr.addOperator(nd.getText());
+		}
+		
+	}
+
+	@Override
+	public void exitAddExpr(AddExprContext ctx) {
+		LOG.trace("exitAddExpr: text = "+ctx.getText());
+		
+		popExpr();
+	}
+
+	@Override
+	public void enterFuncExpr(FuncExprContext ctx) {
+		LOG.trace("enterFuncExpr: text = "+ctx.getText());
+		LOG.trace("enterFuncExpr - IDENTIFIER : "+ctx.IDENTIFIER().getText());
+		
+		for (ExprContext expr: ctx.expr())
+		{
+			LOG.trace("enterFuncExpr - expr = "+expr.getText());
+		}
+		
+
+		pushExpr(new SvcLogicFunctionCall(ctx.IDENTIFIER().getText()));
+	}
+
+	@Override
+	public void exitFuncExpr(FuncExprContext ctx) {
+		LOG.trace("exitFuncExpr: text = "+ctx.getText());
+		
+		popExpr();
+	}
+
+	@Override
+	public void enterParenExpr(ParenExprContext ctx) {
+		LOG.trace("enterParenExpr: text = "+ctx.getText());
+		LOG.trace("enterParenExpr: expr = "+ctx.expr().getText());
+	}
+
+	@Override
+	public void exitParenExpr(ParenExprContext ctx) {
+		LOG.trace("exitParenExpr: text = "+ctx.getText());
+	}
+
+	@Override
+	public void enterRelExpr(RelExprContext ctx) {
+		LOG.trace("enterRelExpr: text = "+ctx.getText());
+		
+		List<TerminalNode> opList = ctx.RELOP();
+		
+
+		SvcLogicBinaryExpression curBinExpr = new SvcLogicBinaryExpression();
+		pushExpr(curBinExpr);
+
+		
+		for (TerminalNode nd : opList)
+		{
+			LOG.trace("enterRelExpr: operator - "+nd.getText());
+			curBinExpr.addOperator(nd.getText());
+		}
+		
+	}
+
+	@Override
+	public void exitRelExpr(RelExprContext ctx) {
+		LOG.trace("exitRelExpr: text = "+ctx.getText());
+		
+		popExpr();
+	}
+
+	@Override
+	public void enterCompareExpr(CompareExprContext ctx) {
+		LOG.trace("enterCompareExpr: text = "+ctx.getText());
+		
+		TerminalNode nd = ctx.COMPAREOP();
+
+		SvcLogicBinaryExpression curBinExpr = new SvcLogicBinaryExpression();
+		pushExpr(curBinExpr);
+
+		LOG.trace("enterCompareExpr: operator - "+nd.getText());
+		curBinExpr.addOperator(nd.getText());
+
+	}
+
+	@Override
+	public void exitCompareExpr(CompareExprContext ctx) {
+		LOG.trace("exitCompareExpr : text = "+ctx.getText());
+		
+		popExpr();
+	}
+
+
+	
+	@Override 
+	public void enterConstant(ConstantContext ctx) {
+		LOG.trace("enterConstant: text = "+ctx.getText());
+	}
+
+	@Override
+	public void exitConstant(ConstantContext ctx) {
+		LOG.trace("exitConstant: text = "+ctx.getText());
+	}
+
+
+	@Override
+	public void enterVariable(VariableContext ctx) {
+		LOG.trace("enterVariable: text = "+ctx.getText());
+		
+		
+	}
+
+	@Override
+	public void exitVariable(VariableContext ctx) {
+		LOG.debug("exitVariable: text ="+ctx.getText());
+		
+	}
+	
+
+	@Override
+	public void enterVariableLead(VariableLeadContext ctx) {
+
+		LOG.debug("enterVariableLead: text ="+ctx.getText());
+		
+
+	}
+
+	@Override
+	public void exitVariableLead(VariableLeadContext ctx) {
+
+		LOG.trace("exitVariableLead: text ="+ctx.getText());
+	}
+
+	@Override
+	public void enterVariableTerm(VariableTermContext ctx) {
+		LOG.trace("enterVariableTerm: text ="+ctx.getText());
+		
+		String name = ctx.getText();
+		
+		int subscrStart = name.indexOf("[");
+		if (subscrStart > -1)
+		{
+			name = name.substring(0, subscrStart);
+		}
+		SvcLogicVariableTerm vterm = new SvcLogicVariableTerm(name);
+		pushExpr(vterm);
+	}
+
+	@Override
+	public void exitVariableTerm(VariableTermContext ctx) {
+		LOG.trace("exitVariableTerm: text="+ctx.getText());
+		popExpr();
+	}
+}
diff --git a/sli/common/src/main/java/org/openecomp/sdnc/sli/SvcLogicExprParserErrorListener.java b/sli/common/src/main/java/org/openecomp/sdnc/sli/SvcLogicExprParserErrorListener.java
new file mode 100644
index 00000000..4c7dd22b
--- /dev/null
+++ b/sli/common/src/main/java/org/openecomp/sdnc/sli/SvcLogicExprParserErrorListener.java
@@ -0,0 +1,44 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdnc.sli;
+
+import org.antlr.v4.runtime.BaseErrorListener;
+import org.antlr.v4.runtime.RecognitionException;
+import org.antlr.v4.runtime.Recognizer;
+import org.antlr.v4.runtime.misc.ParseCancellationException;
+
+public class SvcLogicExprParserErrorListener extends BaseErrorListener {
+	
+	private static final SvcLogicExprParserErrorListener instance = new SvcLogicExprParserErrorListener();
+	
+	public static SvcLogicExprParserErrorListener getInstance() {
+		return(instance);
+	}
+	
+	@Override
+	public void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol, int line, int charPositionInLine,
+			String msg, RecognitionException e) throws ParseCancellationException {
+		throw new ParseCancellationException(msg);
+	}
+	
+
+}
diff --git a/sli/common/src/main/java/org/openecomp/sdnc/sli/SvcLogicExpression.java b/sli/common/src/main/java/org/openecomp/sdnc/sli/SvcLogicExpression.java
new file mode 100644
index 00000000..a6af8201
--- /dev/null
+++ b/sli/common/src/main/java/org/openecomp/sdnc/sli/SvcLogicExpression.java
@@ -0,0 +1,51 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdnc.sli;
+
+import java.io.Serializable;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+
+
+public abstract class SvcLogicExpression implements Serializable {
+	
+	private List<SvcLogicExpression> operands = new LinkedList<SvcLogicExpression>();
+	
+	
+	public void addOperand(SvcLogicExpression expr)
+	{
+		operands.add(expr);
+	}
+
+	public List<SvcLogicExpression> getOperands() {
+		return operands;
+	}
+	
+	public int numOperands()
+	{
+		return(operands.size());
+	}
+	
+	public abstract String asParsedExpr();
+
+}
diff --git a/sli/common/src/main/java/org/openecomp/sdnc/sli/SvcLogicExpressionFactory.java b/sli/common/src/main/java/org/openecomp/sdnc/sli/SvcLogicExpressionFactory.java
new file mode 100644
index 00000000..cce8e044
--- /dev/null
+++ b/sli/common/src/main/java/org/openecomp/sdnc/sli/SvcLogicExpressionFactory.java
@@ -0,0 +1,99 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdnc.sli;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.antlr.v4.runtime.ANTLRInputStream;
+import org.antlr.v4.runtime.CharStream;
+import org.antlr.v4.runtime.CommonTokenStream;
+import org.antlr.v4.runtime.tree.ParseTreeWalker;
+import org.openecomp.sdnc.sli.ExprGrammarParser.ExprContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+public class SvcLogicExpressionFactory {
+	
+	private static final Logger LOG = LoggerFactory
+			.getLogger(SvcLogicExpressionFactory.class);
+
+	
+	public static SvcLogicExpression parse(String exprStr) throws IOException
+	{
+		LOG.trace("parse("+exprStr+")");
+		InputStream exprStream = new ByteArrayInputStream(exprStr.getBytes());
+		CharStream input = new ANTLRInputStream(exprStream);
+		ExprGrammarLexer lexer = new ExprGrammarLexer(input);
+		CommonTokenStream tokens = new CommonTokenStream(lexer);
+		ExprGrammarParser parser = new ExprGrammarParser(tokens);
+
+		lexer.removeErrorListeners();
+		lexer.addErrorListener(SvcLogicExprParserErrorListener.getInstance());		
+		parser.removeErrorListeners();
+		parser.addErrorListener(SvcLogicExprParserErrorListener.getInstance());
+
+		ExprContext expression = null;
+		
+		try {
+			expression = parser.expr();
+		} catch (Exception e) {
+			String errorMsg = e.getMessage();
+			
+			LOG.error(errorMsg);
+			throw new SvcLogicParserException(errorMsg);
+		}
+		
+	
+		ParseTreeWalker walker = new ParseTreeWalker();
+		SvcLogicExprListener listener = new SvcLogicExprListener();
+		walker.walk(listener, expression);
+		
+		
+		return(listener.getParsedExpr());
+	}
+	
+	public static void main(String argv[]) {
+
+
+		System.setProperty(org.slf4j.impl.SimpleLogger.DEFAULT_LOG_LEVEL_KEY, "debug");
+
+		StringBuffer sbuff = new StringBuffer();
+		
+		for (int i = 0 ; i < argv.length ; i++)
+		{
+			if (sbuff.length() > 0)
+			{
+				sbuff.append(" ");
+			}
+			sbuff.append(argv[i]);
+		}
+		
+		try {
+			SvcLogicExpressionFactory.parse(sbuff.toString());
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+}
diff --git a/sli/common/src/main/java/org/openecomp/sdnc/sli/SvcLogicFunctionCall.java b/sli/common/src/main/java/org/openecomp/sdnc/sli/SvcLogicFunctionCall.java
new file mode 100644
index 00000000..a98cf6b2
--- /dev/null
+++ b/sli/common/src/main/java/org/openecomp/sdnc/sli/SvcLogicFunctionCall.java
@@ -0,0 +1,80 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdnc.sli;
+
+public class SvcLogicFunctionCall extends SvcLogicExpression {
+	
+	private String functionName;
+	
+	public SvcLogicFunctionCall(String functionName)
+	{
+		this.functionName = functionName;
+	}
+
+	public String getFunctionName() {
+		return functionName;
+	}
+
+	public void setFunctionName(String functionName) {
+		this.functionName = functionName;
+	}
+	
+	public String toString()
+	{
+		StringBuffer sbuff = new StringBuffer();
+		
+		sbuff.append(functionName);
+		sbuff.append("(");
+		boolean needComma = false;
+		for (SvcLogicExpression operand: getOperands())
+		{
+			if (needComma)
+			{
+				sbuff.append(",");
+			}
+			else
+			{
+				needComma = true;
+			}
+			sbuff.append(operand.toString());
+			
+		}
+		sbuff.append(")");
+		return(sbuff.toString());
+	}
+	
+	public String asParsedExpr()
+	{
+		StringBuffer sbuff = new StringBuffer();
+		
+		sbuff.append("(");
+		sbuff.append(functionName);
+		for (SvcLogicExpression operand: getOperands())
+		{
+			sbuff.append(" ");
+			sbuff.append(operand.asParsedExpr());
+		}
+		sbuff.append(")");
+		return(sbuff.toString());
+	}
+
+}
diff --git a/sli/common/src/main/java/org/openecomp/sdnc/sli/SvcLogicGraph.java b/sli/common/src/main/java/org/openecomp/sdnc/sli/SvcLogicGraph.java
new file mode 100644
index 00000000..d3d6d950
--- /dev/null
+++ b/sli/common/src/main/java/org/openecomp/sdnc/sli/SvcLogicGraph.java
@@ -0,0 +1,184 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdnc.sli;
+
+import java.io.PrintStream;
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+public class SvcLogicGraph implements Serializable {
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	
+	private String module = null;
+	private String rpc = null;
+	private String mode = null;
+	private String version = null;
+	
+	private Map<String, Serializable> attributes;
+	private Map<String, SvcLogicNode> namedNodes;
+	private SvcLogicNode rootNode;
+	
+	public SvcLogicGraph()
+	{
+		attributes = new HashMap<String, Serializable>();
+		namedNodes = new HashMap<String, SvcLogicNode>();
+		rootNode = null;
+	}
+	
+	
+	public String getModule() {
+		return module;
+	}
+
+
+	public void setModule(String module) {
+		this.module = module;
+	}
+
+
+	public String getRpc() {
+		return rpc;
+	}
+
+
+	public void setRpc(String rpc) {
+		this.rpc = rpc;
+	}
+
+	
+
+
+	public String getMode() {
+		return mode;
+	}
+
+
+	public void setMode(String mode) {
+		this.mode = mode;
+	}
+
+
+	public String getVersion() {
+		return version;
+	}
+
+
+	public void setVersion(String version) {
+		this.version = version;
+	}
+
+
+	public void setRootNode(SvcLogicNode rootNode)
+	{
+		this.rootNode = rootNode;
+	}
+	
+	public SvcLogicNode getRootNode()
+	{
+		return(rootNode);
+	}
+	
+	public Serializable getAttribute(String name)
+	{
+		if (attributes.containsKey(name))
+		{
+			return(attributes.get(name));
+		}
+		else
+		{
+			return(null);
+		}
+			
+	}
+	
+	public void setAttribute(String name, Serializable value) throws DuplicateValueException
+	{
+		if (attributes.containsKey(name))
+		{
+			throw new DuplicateValueException("Duplicate attribute "+name);
+		}
+		
+		attributes.put(name, value);
+	}
+	
+	public SvcLogicNode getNamedNode(String nodeName)
+	{
+		if (namedNodes.containsKey(nodeName))
+		{
+			return(namedNodes.get(nodeName));
+		}
+		else
+		{
+			return(null);
+		}
+	}
+
+	public void setNamedNode(String nodeName, SvcLogicNode node) throws DuplicateValueException
+	{
+		if (namedNodes.containsKey(nodeName))
+		{
+			throw new DuplicateValueException("Duplicate node name "+nodeName);
+		}
+		
+		namedNodes.put(nodeName, node);
+	}
+	
+	
+	
+	public void printAsGv(PrintStream pstr)
+	{
+		pstr.println("digraph g {");
+		pstr.println("START [label=\"START\\n"+module+":"+rpc+"\"];");
+		
+		if (rootNode != null)
+		{
+			pstr.println("START -> node"+rootNode.getNodeId()+";");
+			rootNode.setVisited(false, true);
+			rootNode.printAsGv(pstr);
+		}
+		pstr.println("}");
+	}
+	
+	public void printAsXml(PrintStream pstr)
+	{
+		pstr.println("<service-logic module='"+getModule()+"' version='"+getVersion()+"'>");
+		pstr.println("  <method rpc='"+getRpc()+"' mode='"+getMode()+"'>");
+		if (rootNode != null)
+		{
+			rootNode.setVisited(false, true);
+			rootNode.printAsXml(pstr, 2);
+		}
+		pstr.println("  </method>");
+		pstr.println("</service-logic>");
+	}
+	
+	@Override
+	public String toString() {
+	    return "SvcLogicGraph [module=" + module + ", rpc=" + rpc + ", mode=" + mode + ", version=" + version + "]";
+	}
+	
+}
diff --git a/sli/common/src/main/java/org/openecomp/sdnc/sli/SvcLogicJavaPlugin.java b/sli/common/src/main/java/org/openecomp/sdnc/sli/SvcLogicJavaPlugin.java
new file mode 100644
index 00000000..ac14cacc
--- /dev/null
+++ b/sli/common/src/main/java/org/openecomp/sdnc/sli/SvcLogicJavaPlugin.java
@@ -0,0 +1,34 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdnc.sli;
+
+import java.util.Map;
+
+public interface SvcLogicJavaPlugin {
+	
+	/**
+	 * A marker interface, used to indicate that a class exposes methods that can be
+	 * called from an <execute> node.  Such methods must have the signature:
+	 *   void methodName(Map, SvcLogicContext)
+	 */
+
+}
diff --git a/sli/common/src/main/java/org/openecomp/sdnc/sli/SvcLogicJdbcStore.java b/sli/common/src/main/java/org/openecomp/sdnc/sli/SvcLogicJdbcStore.java
new file mode 100644
index 00000000..b9e7f80e
--- /dev/null
+++ b/sli/common/src/main/java/org/openecomp/sdnc/sli/SvcLogicJdbcStore.java
@@ -0,0 +1,895 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdnc.sli;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.sql.Blob;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.Driver;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Properties;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+public class SvcLogicJdbcStore implements SvcLogicStore {
+	private static final Logger LOG = LoggerFactory
+			.getLogger(SvcLogicJdbcStore.class);
+
+	private String dbUrl = null;
+	private String dbName = null;
+	private String dbUser = null;
+	private String dbPasswd = null;
+	private String dbDriver = null;
+        
+	private Connection dbConn;
+	private PreparedStatement hasActiveGraphStmt = null;
+	private PreparedStatement hasVersionGraphStmt = null;
+	private PreparedStatement fetchActiveGraphStmt = null;
+	private PreparedStatement fetchVersionGraphStmt = null;
+	private PreparedStatement storeGraphStmt = null;
+	private PreparedStatement deleteGraphStmt = null;
+	
+	private PreparedStatement deactivateStmt = null;
+	private PreparedStatement activateStmt = null;
+	
+	private PreparedStatement registerNodeStmt = null;
+	private PreparedStatement unregisterNodeStmt = null;
+	private PreparedStatement validateNodeStmt = null;
+        	
+	private void getConnection() throws ConfigurationException
+	{
+
+		Properties jdbcProps = new Properties();
+		
+		jdbcProps.setProperty("user", dbUser);
+		jdbcProps.setProperty("password", dbPasswd);
+		
+		try {
+			Driver dvr = new com.mysql.jdbc.Driver();
+			if (dvr.acceptsURL(dbUrl))
+			{
+				LOG.debug("Driver com.mysql.jdbc.Driver accepts "+dbUrl);
+			}
+			else
+			{
+				LOG.warn("Driver com.mysql.jdbc.Driver does not accept "+dbUrl);
+			}
+		} catch (SQLException e1) {
+			LOG.error("Caught exception trying to load com.mysql.jdbc.Driver", e1);
+
+
+		}
+		
+		
+		try
+		{
+			this.dbConn = DriverManager.getConnection(dbUrl, jdbcProps);
+		}
+		catch (Exception e)
+		{
+			throw new ConfigurationException("failed to get database connection ["+dbUrl+"]", e);
+		}	
+		
+	}
+	
+	private void createTable() throws ConfigurationException
+	{
+
+
+		DatabaseMetaData dbm = null;
+		
+		
+		try {
+			dbm = dbConn.getMetaData();
+		} catch (SQLException e) {
+
+			throw new ConfigurationException("could not get databse metadata", e);
+		}
+
+		// See if table SVC_LOGIC exists.  If not, create it.
+		try
+		{
+
+
+			ResultSet tables = dbm.getTables(null, null, "SVC_LOGIC", null);
+			if (tables.next()) {
+				// Table exists
+			}
+			else {
+
+				String crTableCmd = "CREATE TABLE "+dbName+".SVC_LOGIC ("
+						+ "module varchar(80) NOT NULL,"
+						+ "rpc varchar(80) NOT NULL,"
+						+ "version varchar(40) NOT NULL,"
+						+ "mode varchar(5) NOT NULL,"
+						+ "active varchar(1) NOT NULL,"
+						+ "graph BLOB,"
+						+ "CONSTRAINT P_SVC_LOGIC PRIMARY KEY(module, rpc, version, mode))";
+
+				Statement stmt = null;
+				ConfigurationException myExc = null;
+				try
+				{
+					stmt = dbConn.createStatement();
+					stmt.executeUpdate(crTableCmd);
+				}
+				catch (SQLException e1)
+				{
+					myExc = new ConfigurationException("cannot create SVC_LOGIC table", e1);
+				}
+				finally
+				{
+					if (stmt != null)
+					{
+						stmt.close();
+					}
+				}
+
+				if (myExc != null)
+				{
+					throw myExc;
+				}
+			}
+		}
+		catch (Exception e)
+		{
+			throw new ConfigurationException("could not create SVC_LOGIC table", e);
+		}
+		
+		// See if NODE_TYPES table exists and, if not, create it
+		
+		try
+		{
+
+
+			ResultSet tables = dbm.getTables(null, null, "NODE_TYPES", null);
+			if (tables.next()) {
+				// Table exists
+			}
+			else {
+
+				String crTableCmd = "CREATE TABLE "+dbName+".NODE_TYPES ("
+						+ "nodetype varchar(80) NOT NULL,"
+						+ "CONSTRAINT P_NODE_TYPES PRIMARY KEY(nodetype))";
+
+				Statement stmt = null;
+				ConfigurationException myExc = null;
+				try
+				{
+					stmt = dbConn.createStatement();
+					stmt.executeUpdate(crTableCmd);
+				}
+				catch (SQLException e1)
+				{
+					myExc = new ConfigurationException("cannot create SVC_LOGIC table", e1);
+				}
+				finally
+				{
+					if (stmt != null)
+					{
+						stmt.close();
+					}
+				}
+
+				if (myExc != null)
+				{
+					throw myExc;
+				}
+			}
+		}
+		catch (Exception e)
+		{
+			throw new ConfigurationException("could not create SVC_LOGIC table", e);
+		}
+	}
+	
+	private void prepStatements() throws ConfigurationException
+	{
+
+		// Prepare statements
+		String hasVersionGraphSql = "SELECT count(*) FROM "+dbName+".SVC_LOGIC"
+				+ " WHERE module = ? AND rpc = ? AND mode = ? AND version = ?";
+		
+		try
+		{
+			hasVersionGraphStmt = dbConn.prepareStatement(hasVersionGraphSql);
+		}
+		catch (Exception e)
+		{
+			throw new ConfigurationException("could not prepare statement "+hasVersionGraphSql, e);
+			
+		}
+		
+		String hasActiveGraphSql = "SELECT count(*) FROM "+dbName+".SVC_LOGIC"
+				+ " WHERE module = ? AND rpc = ? AND mode = ? AND active = 'Y'";
+		
+		try
+		{
+			hasActiveGraphStmt = dbConn.prepareStatement(hasActiveGraphSql);
+		}
+		catch (Exception e)
+		{
+			throw new ConfigurationException("could not prepare statement "+hasVersionGraphSql, e);
+			
+		}
+		
+		String fetchVersionGraphSql = "SELECT graph FROM "+dbName+".SVC_LOGIC"
+				+ " WHERE module = ? AND rpc = ? AND mode = ? AND version = ?";
+		
+		try
+		{
+			fetchVersionGraphStmt = dbConn.prepareStatement(fetchVersionGraphSql);
+		}
+		catch (Exception e)
+		{
+			throw new ConfigurationException("could not prepare statement "+fetchVersionGraphSql, e);
+			
+		}
+		
+		String fetchActiveGraphSql = "SELECT graph FROM "+dbName+".SVC_LOGIC"
+				+ " WHERE module = ? AND rpc = ? AND mode = ? AND active = 'Y'";
+		
+		try
+		{
+			fetchActiveGraphStmt = dbConn.prepareStatement(fetchActiveGraphSql);
+		}
+		catch (Exception e)
+		{
+			throw new ConfigurationException("could not prepare statement "+fetchVersionGraphSql, e);
+			
+		}
+		
+		String storeGraphSql = "INSERT INTO "+dbName+".SVC_LOGIC (module, rpc, version, mode, active, graph)"
+				+ " VALUES(?, ?, ?, ?, ?, ?)";
+		
+		try
+		{
+			storeGraphStmt = dbConn.prepareStatement(storeGraphSql);
+		}
+		catch (Exception e)
+		{
+			throw new ConfigurationException("could not prepare statement "+storeGraphSql, e);
+		}
+		
+		String deleteGraphSql = "DELETE FROM "+dbName+".SVC_LOGIC WHERE module = ? AND rpc = ? AND version = ? AND mode = ?";
+		
+		try
+		{
+			deleteGraphStmt = dbConn.prepareStatement(deleteGraphSql);
+		}
+		catch (Exception e)
+		{
+			throw new ConfigurationException("could not prepare statement "+deleteGraphSql, e);
+		}
+		
+		String deactivateSql = "UPDATE "+dbName+".SVC_LOGIC SET active = 'N' WHERE module = ? AND rpc = ? AND mode = ?";
+		
+		try
+		{
+			deactivateStmt = dbConn.prepareStatement(deactivateSql);
+		}
+		catch (Exception e)
+		{
+			throw new ConfigurationException("could not prepare statement "+deactivateSql, e);
+		}
+		
+		String activateSql = "UPDATE "+dbName+".SVC_LOGIC SET active = 'Y' WHERE module = ? AND rpc = ? AND version = ? AND mode = ?";
+		
+		try
+		{
+			activateStmt = dbConn.prepareStatement(activateSql);
+		}
+		catch (Exception e)
+		{
+			throw new ConfigurationException("could not prepare statement "+activateSql, e);
+		}
+		
+		String registerNodeSql = "INSERT INTO "+dbName+".NODE_TYPES (nodetype) VALUES(?)";
+		try
+		{
+			registerNodeStmt = dbConn.prepareStatement(registerNodeSql);
+		}
+		catch (Exception e)
+		{
+			throw new ConfigurationException("could not prepare statement "+registerNodeSql, e);
+		}
+		
+		String unregisterNodeSql = "DELETE FROM "+dbName+".NODE_TYPES WHERE nodetype = ?";
+		try
+		{
+			unregisterNodeStmt = dbConn.prepareStatement(unregisterNodeSql);
+		}
+		catch (Exception e)
+		{
+			throw new ConfigurationException("could not prepare statement "+unregisterNodeSql, e);
+		}
+		
+		String validateNodeSql = "SELECT count(*) FROM "+dbName+".NODE_TYPES WHERE nodetype = ?";
+		try
+		{
+			validateNodeStmt = dbConn.prepareStatement(validateNodeSql);
+		}
+		catch (Exception e)
+		{
+			throw new ConfigurationException("could not prepare statement "+validateNodeSql, e);
+		}
+	}
+	
+	private void initDbResources() throws ConfigurationException
+	{
+		if ((dbDriver != null) && (dbDriver.length() > 0))
+		{
+		
+		    try
+		    {
+			    Class.forName(dbDriver);
+		    }
+		    catch (Exception e)
+		    {
+		    	throw new ConfigurationException("could not load driver class "+dbDriver, e);
+		    }
+		}
+		getConnection();
+		createTable();
+		prepStatements();
+	}
+	
+
+	public void init(Properties props) throws ConfigurationException {
+		
+		
+		dbUrl = props.getProperty("org.openecomp.sdnc.sli.jdbc.url");
+		if ((dbUrl == null) || (dbUrl.length() == 0))
+		{
+			throw new ConfigurationException("property org.openecomp.sdnc.sli.jdbc.url unset");
+		}
+		
+		dbName = props.getProperty("org.openecomp.sdnc.sli.jdbc.database");
+		if ((dbName == null) || (dbName.length() == 0))
+		{
+			throw new ConfigurationException("property org.openecomp.sdnc.sli.jdbc.database unset");
+		}
+		
+		dbUser = props.getProperty("org.openecomp.sdnc.sli.jdbc.user");
+		if ((dbUser == null) || (dbUser.length() == 0))
+		{
+			throw new ConfigurationException("property org.openecomp.sdnc.sli.jdbc.user unset");
+		}
+
+		
+		dbPasswd = props.getProperty("org.openecomp.sdnc.sli.jdbc.password");
+		if ((dbPasswd == null) || (dbPasswd.length() == 0))
+		{
+			throw new ConfigurationException("property org.openecomp.sdnc.sli.jdbc.password unset");
+		}
+		
+		dbDriver = props.getProperty("org.openecomp.sdnc.sli.jdbc.driver");
+
+			
+		initDbResources();
+		
+	}
+	
+	private boolean isDbConnValid()
+	{
+
+		boolean isValid = false;
+		
+		try
+		{
+			if (dbConn != null)
+			{
+				isValid = dbConn.isValid(1);
+			}
+		}
+		catch (SQLException e)
+		{}
+		
+		return(isValid);
+	}
+public boolean hasGraph(String module, String rpc, String version, String mode) throws SvcLogicException {
+
+
+		
+		
+		if (!isDbConnValid())
+		{
+			
+			// Try reinitializing
+			initDbResources();
+			
+			if (!isDbConnValid())
+			{
+				throw new ConfigurationException("no jdbc connection");
+			}
+		}
+
+		
+		
+		boolean retval = false;
+		ResultSet results = null;
+		
+		PreparedStatement hasGraphStmt = null;
+		if (version == null)
+		{
+			hasGraphStmt = hasActiveGraphStmt;
+		}
+		else
+		{
+			hasGraphStmt = hasVersionGraphStmt;
+		}
+		
+
+		
+		try
+		{
+			hasGraphStmt.setString(1, module);
+			hasGraphStmt.setString(2,  rpc);
+			hasGraphStmt.setString(3,  mode);
+
+			
+			if (version != null)
+			{
+				hasGraphStmt.setString(4, version);
+			}
+			boolean oldAutoCommit = dbConn.getAutoCommit();
+			dbConn.setAutoCommit(false);
+			results = hasGraphStmt.executeQuery();
+			dbConn.commit();
+			dbConn.setAutoCommit(oldAutoCommit);
+			
+			if (results.next())
+			{
+				int cnt = results.getInt(1);
+				
+				if (cnt > 0)
+				{
+					retval = true;
+				}
+
+			}
+		}
+		catch (Exception e)
+		{
+			throw new ConfigurationException("SQL query failed", e);
+		}
+		finally
+		{
+			if (results != null)
+			{
+				try
+				{
+					
+					results.close();
+				}
+				catch (SQLException x)
+				{}
+			}
+			
+		}
+		
+		
+		return(retval);
+		
+		
+	}
+
+	public SvcLogicGraph fetch(String module, String rpc, String version, String mode) throws SvcLogicException {
+
+
+		
+		
+		if (!isDbConnValid())
+		{
+			
+			// Try reinitializing
+			initDbResources();
+			
+			if (!isDbConnValid())
+			{
+				throw new ConfigurationException("no jdbc connection");
+			}
+		}
+
+		
+		
+		SvcLogicGraph retval = null;
+		ResultSet results = null;
+		
+		PreparedStatement fetchGraphStmt = null;
+		if (version == null)
+		{
+			fetchGraphStmt = fetchActiveGraphStmt;
+		}
+		else
+		{
+			fetchGraphStmt = fetchVersionGraphStmt;
+		}
+		try
+		{
+			fetchGraphStmt.setString(1, module);
+			fetchGraphStmt.setString(2,  rpc);
+			fetchGraphStmt.setString(3,  mode);
+
+			
+			if (version != null)
+			{
+				fetchGraphStmt.setString(4, version);
+			}
+			boolean oldAutoCommit = dbConn.getAutoCommit();
+			dbConn.setAutoCommit(false);
+			results = fetchGraphStmt.executeQuery();
+			dbConn.commit();
+			dbConn.setAutoCommit(oldAutoCommit);
+			
+			if (results.next())
+			{
+				Blob graphBlob = results.getBlob("graph");
+				
+				ObjectInputStream gStream = new ObjectInputStream(graphBlob.getBinaryStream());
+				
+				Object graphObj = gStream.readObject();
+				gStream.close();
+				
+				if (graphObj instanceof SvcLogicGraph)
+				{
+					retval = (SvcLogicGraph) graphObj;
+				}
+				else
+				{
+					throw new ConfigurationException("invalid type for graph ("+graphObj.getClass().getName());
+					
+				}
+				
+			}
+			else
+			{
+				return(null);
+			}
+		}
+		catch (Exception e)
+		{
+			throw new ConfigurationException("SQL query failed", e);
+		}
+		finally
+		{
+			if (results != null)
+			{
+				try
+				{
+					results.close();
+				}
+				catch (SQLException x)
+				{}
+			}
+			
+		}
+		
+		
+		return(retval);
+		
+		
+	}
+
+	public void store(SvcLogicGraph graph) throws SvcLogicException {
+		
+		
+		if (!isDbConnValid())
+		{
+			
+			// Try reinitializing
+			initDbResources();
+			
+			if (!isDbConnValid())
+			{
+				throw new ConfigurationException("no jdbc connection");
+			}
+		}
+
+		if (graph == null)
+		{
+			throw new SvcLogicException("graph cannot be null");
+		}
+		
+		byte[] graphBytes = null;
+		
+		ByteArrayOutputStream byteStr = null;
+		ObjectOutputStream goutStr = null;
+		
+		try
+		{
+			byteStr = new ByteArrayOutputStream();
+			goutStr = new ObjectOutputStream(byteStr);
+			goutStr.writeObject(graph);
+			
+			graphBytes = byteStr.toByteArray();
+			
+		}
+		catch (Exception e)
+		{
+			throw new SvcLogicException("could not serialize graph", e);
+		}
+		finally
+		{
+			
+			if (goutStr != null)
+			{
+				try {
+					goutStr.close();
+				} catch (IOException e) {
+	
+				}
+			}
+			
+			if (byteStr != null)
+			{
+				try {
+					byteStr.close();
+				} catch (IOException e) {
+	
+				}
+			}
+		}
+		
+		
+		// If object already stored in database, delete it
+		if (hasGraph(graph.getModule(), graph.getRpc(), graph.getVersion(), graph.getMode()))
+		{
+			delete(graph.getModule(), graph.getRpc(), graph.getVersion(), graph.getMode());
+		}
+		
+		try
+		{
+			boolean oldAutoCommit = dbConn.getAutoCommit();
+			dbConn.setAutoCommit(false);
+			storeGraphStmt.setString(1,  graph.getModule());
+			storeGraphStmt.setString(2,  graph.getRpc());
+			storeGraphStmt.setString(3, graph.getVersion());
+			storeGraphStmt.setString(4, graph.getMode());
+			storeGraphStmt.setString(5, "N");
+			storeGraphStmt.setBlob(6,  new ByteArrayInputStream(graphBytes));
+			
+			storeGraphStmt.executeUpdate();
+			dbConn.commit();
+			
+			dbConn.setAutoCommit(oldAutoCommit);
+		}
+		catch (Exception e)
+		{
+			throw new SvcLogicException("Could not write object to database", e);
+		}	
+	}
+	
+	public void delete(String module, String rpc, String version, String mode) throws SvcLogicException
+	{		
+		if (!isDbConnValid())
+		{
+			
+			// Try reinitializing
+			initDbResources();
+			
+			if (!isDbConnValid())
+			{
+				throw new ConfigurationException("no jdbc connection");
+			}
+		}
+
+		try
+		{
+			boolean oldAutoCommit = dbConn.getAutoCommit();
+			dbConn.setAutoCommit(false);
+			deleteGraphStmt.setString(1,  module);
+			deleteGraphStmt.setString(2,  rpc);
+			deleteGraphStmt.setString(3, version);
+			deleteGraphStmt.setString(4,  mode);
+
+			
+			deleteGraphStmt.executeUpdate();
+			dbConn.commit();
+			dbConn.setAutoCommit(oldAutoCommit);
+		}
+		catch (Exception e)
+		{
+			throw new SvcLogicException("Could not delete object from database", e);
+		}	
+	}
+
+	public void activate(SvcLogicGraph graph) throws SvcLogicException
+	{
+		try
+		{
+			boolean oldAutoCommit = dbConn.getAutoCommit();
+			
+			dbConn.setAutoCommit(false);
+			
+			// Deactivate any current active version
+			deactivateStmt.setString(1,  graph.getModule());
+			deactivateStmt.setString(2, graph.getRpc());
+			deactivateStmt.setString(3, graph.getMode());
+			deactivateStmt.executeUpdate();
+			
+			// Activate this version
+			activateStmt.setString(1,  graph.getModule());
+			activateStmt.setString(2, graph.getRpc());
+			activateStmt.setString(3, graph.getVersion());
+			activateStmt.setString(4, graph.getMode());
+			activateStmt.executeUpdate();
+			
+			dbConn.commit();
+			
+			dbConn.setAutoCommit(oldAutoCommit);
+			
+		}
+		catch (Exception e)
+		{
+			throw new SvcLogicException("Could not activate graph", e);
+		}
+	}
+
+	@Override
+	public void registerNodeType(String nodeType) throws SvcLogicException {
+		
+		if (isValidNodeType(nodeType))
+		{
+			return;
+		}
+		
+		if (!isDbConnValid())
+		{
+			
+			// Try reinitializing
+			initDbResources();
+			
+			if (!isDbConnValid())
+			{
+				throw new ConfigurationException("no jdbc connection");
+			}
+		}
+		
+		try
+		{
+			boolean oldAutoCommit = dbConn.getAutoCommit();
+			dbConn.setAutoCommit(false);
+			registerNodeStmt.setString(1,  nodeType);
+			registerNodeStmt.executeUpdate();
+			dbConn.commit();
+			dbConn.setAutoCommit(oldAutoCommit);
+		}
+		catch (Exception e)
+		{
+			throw new SvcLogicException("Could not add node type to database", e);
+		}
+		
+	}
+
+	@Override
+	public void unregisterNodeType(String nodeType) throws SvcLogicException {
+		
+		if (!isValidNodeType(nodeType))
+		{
+			return;
+		}
+		
+		if (!isDbConnValid())
+		{
+			
+			// Try reinitializing
+			initDbResources();
+			
+			if (!isDbConnValid())
+			{
+				throw new ConfigurationException("no jdbc connection");
+			}
+		}
+		
+		try
+		{
+			boolean oldAutoCommit = dbConn.getAutoCommit();
+			dbConn.setAutoCommit(false);
+			unregisterNodeStmt.setString(1,  nodeType);
+			unregisterNodeStmt.executeUpdate();
+			dbConn.commit();
+			dbConn.setAutoCommit(oldAutoCommit);
+		}
+		catch (Exception e)
+		{
+			throw new SvcLogicException("Could not delete node type from database", e);
+		}
+		
+	}
+
+	@Override
+	public boolean isValidNodeType(String nodeType) throws SvcLogicException {
+		
+		boolean isValid = false;
+		
+		if (!isDbConnValid())
+		{
+			
+			// Try reinitializing
+			initDbResources();
+			
+			if (!isDbConnValid())
+			{
+				throw new ConfigurationException("no jdbc connection");
+			}
+		}
+		
+		ResultSet results = null;
+		try
+		{
+			validateNodeStmt.setString(1, nodeType);
+			
+			boolean oldAutoCommit = dbConn.getAutoCommit();
+			dbConn.setAutoCommit(false);
+			results = validateNodeStmt.executeQuery();
+			dbConn.commit();
+			dbConn.setAutoCommit(oldAutoCommit);
+			
+			if (results != null)
+			{
+				if (results.next())
+				{
+					int cnt = results.getInt(1);
+					
+					if (cnt > 0)
+					{
+						isValid = true;
+					}
+				}
+			}
+			
+		}
+		catch (Exception e)
+		{
+			throw new SvcLogicException("Cannot select node type from database", e);
+		}
+		finally
+		{
+			if (results != null)
+			{
+				try
+				{
+					results.close();
+				}
+				catch (SQLException x)
+				{}
+			}
+			
+		}
+		
+		return(isValid);
+	}
+	
+	
+}
diff --git a/sli/common/src/main/java/org/openecomp/sdnc/sli/SvcLogicNode.java b/sli/common/src/main/java/org/openecomp/sdnc/sli/SvcLogicNode.java
new file mode 100644
index 00000000..6828e9ad
--- /dev/null
+++ b/sli/common/src/main/java/org/openecomp/sdnc/sli/SvcLogicNode.java
@@ -0,0 +1,456 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+/**
+ * 
+ */
+package org.openecomp.sdnc.sli;
+
+import java.io.IOException;
+import java.io.PrintStream;
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+
+import org.apache.commons.lang3.StringEscapeUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.xml.sax.Locator;
+
+
+public class SvcLogicNode implements Serializable {
+	
+	private static final Logger LOG = LoggerFactory
+			.getLogger(SvcLogicExprListener.class);
+	
+	private static final long serialVersionUID = 2L;
+	
+	private String nodeName;
+	private int nodeId;
+	private String nodeType;
+	private boolean visited;
+	private SvcLogicGraph graph;
+
+
+	private HashMap<String, SvcLogicExpression> attributes;
+	private HashMap<String, SvcLogicNode> outcomes;
+	private HashMap<String, SvcLogicExpression> parameters;
+	
+	public SvcLogicNode(int nodeId, String nodeType, SvcLogicGraph graph)
+	{
+		this.nodeId = nodeId;
+		nodeName = "";
+		this.nodeType = nodeType;
+		this.graph = graph;
+		attributes = new HashMap<String, SvcLogicExpression> ();
+		parameters = new HashMap<String, SvcLogicExpression> ();
+		outcomes = null;
+		
+	}
+	
+	public SvcLogicNode(int nodeId, String nodeType, String nodeName, SvcLogicGraph graph) throws DuplicateValueException
+	{
+		this.nodeId = nodeId;
+		this.nodeName = nodeName;
+		this.nodeType = nodeType;
+		this.graph = graph;
+		attributes = new HashMap<String, SvcLogicExpression> ();
+		parameters = new HashMap<String, SvcLogicExpression> ();
+		outcomes = null;
+		graph.setNamedNode(nodeName, this);
+	}
+	
+	
+	public int getNodeId()
+	{
+		return nodeId;
+	}
+	
+	public String getNodeName()
+	{
+		return(nodeName);
+	}
+	
+	public String getNodeType()
+	{
+		return(nodeType);
+	}
+	
+	public SvcLogicGraph getGraph()
+	{
+		return(graph);
+	}
+	
+	public int getNumOutcomes()
+	{
+		if (outcomes == null)
+		{
+			return(0);
+		}
+		else
+		{
+			return(outcomes.size());
+		}
+	}
+	
+	public SvcLogicExpression getAttribute(String name)
+	{
+		if (attributes.containsKey(name))
+		{
+			return(attributes.get(name));
+		}
+		else
+		{
+			return(null);
+		}
+			
+	}
+	
+	public void setAttribute(String name, String value) throws SvcLogicException
+	{
+		setAttribute(name, new SvcLogicAtom("STRING", value));
+	}
+	
+	public void setAttribute(String name, SvcLogicExpression value) throws SvcLogicException
+	{
+		if (attributes.containsKey(name))
+		{
+			throw new DuplicateValueException("Duplicate attribute "+name);
+		}
+		
+		attributes.put(name, value);
+	}
+	
+
+	public void mapParameter(String name, String value) throws SvcLogicException
+	{
+		
+		if (parameters.containsKey(name))
+		{
+			throw new DuplicateValueException("Duplicate parameter "+name);
+		}
+		try
+		{
+			SvcLogicExpression parmValue;
+			if ((value == null) || (value.length() == 0))
+			{
+				parmValue = new SvcLogicAtom("STRING", "");
+			}
+			else if (value.trim().startsWith("`"))
+			{
+				int lastParen = value.lastIndexOf("`");
+				String evalExpr = value.trim().substring(1, lastParen);
+				parmValue = SvcLogicExpressionFactory.parse(evalExpr);
+				
+			}
+			else
+			{
+				if (Character.isDigit(value.charAt(0)))
+				{
+					parmValue = new SvcLogicAtom("NUMBER", value);
+				}
+				else
+				{
+					parmValue = new SvcLogicAtom("STRING", value);
+				}
+			}
+			LOG.debug("Setting parameter "+name+" = "+value+" = "+parmValue.asParsedExpr());
+			parameters.put(name, parmValue);
+		}
+		catch (IOException e) {
+
+			LOG.error("Invalid parameter value expression ("+value+")");
+			throw new SvcLogicException(e.getMessage());
+		}
+	}
+	
+	public SvcLogicExpression getParameter(String name)
+	{
+		if (parameters.containsKey(name))
+		{
+			return(parameters.get(name));
+		}
+		else
+		{
+			return(null);
+		}
+	}
+	
+	public boolean isVisited() {
+		return visited;
+	}
+
+	public void setVisited(boolean visited, boolean recursive) {
+		this.visited = visited;
+		
+		if (recursive)
+		{
+			Set<Map.Entry<String, SvcLogicNode>> outcomeSet = getOutcomeSet();
+			
+			if (outcomeSet == null)
+			{
+				return;
+			}
+			
+			for (Iterator<Map.Entry<String, SvcLogicNode>> iter = outcomeSet.iterator(); iter.hasNext();)
+			{
+				Map.Entry<String, SvcLogicNode> curOutcome = iter.next();
+				SvcLogicNode outNode = curOutcome.getValue();
+				outNode.setVisited(visited, recursive);
+			}
+		}
+	}
+	
+	public void addOutcome(String outcomeValue, SvcLogicNode node) throws SvcLogicException
+	{
+		if (outcomes == null)
+		{
+			outcomes = new HashMap<String, SvcLogicNode>();
+		}
+		
+		if (outcomeValue.length() == 0) {
+			outcomeValue = "\"\"";
+		}
+		if (outcomes.containsKey(outcomeValue))
+		{
+			throw new DuplicateValueException("Duplicate outcome value "+outcomeValue);
+		}
+		
+		outcomes.put(outcomeValue, node);
+	}
+	
+	public Set<Map.Entry<String, SvcLogicNode>> getOutcomeSet()
+	{
+		if (outcomes == null)
+		{
+			return null;
+		}
+		
+		return(outcomes.entrySet());
+		
+	}
+	
+	public Set<Map.Entry<String, SvcLogicExpression>> getParameterSet()
+	{
+		if (parameters == null)
+		{
+			return null;
+		}
+		
+		return(parameters.entrySet());
+		
+	}
+	
+	public void printAsGv(PrintStream pstr)
+	{
+		
+		if (visited)
+		{
+			return;
+		}
+		else
+		{
+			visited = true;
+		}
+		
+		StringBuffer sbuff = new StringBuffer();
+		
+		sbuff.append("node");
+		sbuff.append(nodeId);
+		sbuff.append(" [ shape=none, margin=0, label=<<table border=\"0\" cellborder=\"1\" align=\"left\">");
+		sbuff.append("<tr><td colspan=\"2\"><b>");
+		sbuff.append(nodeId);
+		sbuff.append(" : ");
+		sbuff.append(nodeType);
+		sbuff.append("</b></td></tr><th><td><i>Attribute</i></td><td><i>Value</i></td></th>");
+
+		if (nodeName.length() > 0)
+		{
+			sbuff.append("<tr><td>name</td><td>");
+			sbuff.append(nodeName);
+			sbuff.append("</td></tr>");
+		}
+		
+		Set<Map.Entry<String, SvcLogicExpression>> attrSet = attributes.entrySet();
+		for (Iterator<Map.Entry<String, SvcLogicExpression>> iter = attrSet.iterator() ; iter.hasNext();)
+		{
+			Map.Entry<String, SvcLogicExpression> curAttr = iter.next();
+			sbuff.append("<tr><td>");
+			sbuff.append(curAttr.getKey());
+			sbuff.append("</td><td>");
+			sbuff.append(StringEscapeUtils.escapeHtml3(curAttr.getValue().toString()));
+			sbuff.append("</td></tr>");
+		}
+		sbuff.append("</table>>];");
+		
+		pstr.println(sbuff.toString());
+		
+		
+		if (outcomes != null)
+		{
+			TreeMap<String, SvcLogicNode> sortedOutcomes = new TreeMap<String, SvcLogicNode>(outcomes);
+			Set<Map.Entry<String, SvcLogicNode>> outcomeSet = sortedOutcomes.entrySet();
+			
+			for (Iterator<Map.Entry<String, SvcLogicNode>> iter = outcomeSet.iterator(); iter.hasNext();)
+			{
+				Map.Entry<String, SvcLogicNode> curOutcome = iter.next();
+				String outValue = curOutcome.getKey();
+				SvcLogicNode outNode = curOutcome.getValue();
+				pstr.println("node"+nodeId+" -> node"+outNode.getNodeId()+" [label=\""+outValue+"\"];");
+				outNode.printAsGv(pstr);
+			}
+		}
+	}
+	
+	public void printAsXml(PrintStream pstr, int indentLvl)
+	{
+		if (visited)
+		{
+			return;
+		}
+		// Print node tag
+		for (int i = 0 ; i < indentLvl ; i++)
+		{
+			pstr.print("  ");
+		}
+		pstr.print("<");
+		pstr.print(this.getNodeType());
+		
+		Set<Map.Entry<String, SvcLogicExpression>> attrSet = attributes.entrySet();
+		for (Iterator<Map.Entry<String, SvcLogicExpression>> iter = attrSet.iterator() ; iter.hasNext();)
+		{
+			Map.Entry<String, SvcLogicExpression> curAttr = iter.next();
+			pstr.print(" ");
+			pstr.print(curAttr.getKey());
+			pstr.print("='`");
+			pstr.print(curAttr.getValue());
+			pstr.print("'`");
+		}
+		
+		if (((parameters == null) || (parameters.isEmpty())) && 
+				((outcomes == null) || outcomes.isEmpty()))
+		{
+			pstr.print("/>\n");
+			pstr.flush();
+			return;
+		}
+		else
+		{
+			pstr.print(">\n");
+		}
+		
+		// Print parameters (if any)
+		if (parameters != null)
+		{
+			Set<Map.Entry<String, SvcLogicExpression>> paramSet = parameters.entrySet();
+			for (Iterator<Map.Entry<String, SvcLogicExpression>> iter = paramSet.iterator() ; iter.hasNext();)
+			{
+				for (int i = 0 ; i < indentLvl+1 ; i++)
+				{
+					pstr.print("  ");
+				}
+				pstr.print("<parameter");
+				Map.Entry<String, SvcLogicExpression> curAttr = iter.next();
+				pstr.print(" name='");
+				pstr.print(curAttr.getKey());
+				pstr.print("' value='`");
+				pstr.print(curAttr.getValue().toString());
+				pstr.print("`'/>\n");
+			}
+		}
+
+		// Print outcomes (if any)
+		if (outcomes != null)
+		{
+			Set<Map.Entry<String, SvcLogicNode>> outcomeSet = outcomes.entrySet();
+			for (Iterator<Map.Entry<String, SvcLogicNode>> iter = outcomeSet.iterator() ; iter.hasNext();)
+			{
+				for (int i = 0 ; i < indentLvl+1 ; i++)
+				{
+					pstr.print("  ");
+				}
+				pstr.print("<outcome");
+				Map.Entry<String, SvcLogicNode> curAttr = iter.next();
+				pstr.print(" value='");
+				pstr.print(curAttr.getKey());
+				pstr.print("'>\n");
+				SvcLogicNode outNode = curAttr.getValue();
+				outNode.printAsXml(pstr, indentLvl+2);
+				for (int i = 0 ; i < indentLvl+1 ; i++)
+				{
+					pstr.print("  ");
+				}
+				pstr.print("</outcome>\n");
+			}
+		}
+		
+		// Print node end tag
+		for (int i = 0 ; i < indentLvl ; i++)
+		{
+			pstr.print("  ");
+		}
+		pstr.print("</");
+		pstr.print(this.getNodeType());
+		pstr.print(">\n");
+		pstr.flush();
+		
+	}
+
+
+	public SvcLogicNode getOutcomeValue(String value)
+	{
+
+		if (value.length() == 0) {
+			value = "\"\"";
+		}
+		if (outcomes == null)
+		{
+			return(null);
+		}
+		
+		if (outcomes.containsKey(value))
+		{
+			return(outcomes.get(value));
+		}
+		else
+		{
+			StringBuffer keyBuffer = new StringBuffer();
+			keyBuffer.append("{");
+			for (String key : outcomes.keySet()) {
+				keyBuffer.append(" ("+key+")");
+			}
+			keyBuffer.append("}");
+			LOG.info("Outcome (" + value + ") not found, keys are " + keyBuffer.toString());
+
+			if (outcomes.containsKey("Other"))
+			{
+				return(outcomes.get("Other"));
+			}
+			else
+			{
+				return(null);
+			}
+		}
+	}
+}
diff --git a/sli/common/src/main/java/org/openecomp/sdnc/sli/SvcLogicParser.java b/sli/common/src/main/java/org/openecomp/sdnc/sli/SvcLogicParser.java
new file mode 100644
index 00000000..398c28de
--- /dev/null
+++ b/sli/common/src/main/java/org/openecomp/sdnc/sli/SvcLogicParser.java
@@ -0,0 +1,598 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdnc.sli;
+
+import java.io.File;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.LinkedList;
+
+import javax.xml.XMLConstants;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+import javax.xml.validation.Schema;
+import javax.xml.validation.SchemaFactory;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.xml.sax.Attributes;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXNotRecognizedException;
+import org.xml.sax.SAXParseException;
+import org.xml.sax.helpers.DefaultHandler;
+
+/**
+ * @author dt5972
+ *
+ */
+public class SvcLogicParser {
+
+    SvcLogicStore store = null;
+    static final String JAXP_SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage";
+    static final String W3C_XML_SCHEMA = "http://www.w3.org/2001/XMLSchema";
+    static final String JAXP_SCHEMA_SOURCE = "http://java.sun.com/xml/jaxp/properties/schemaSource";
+    static final String JAXP_DYNAMIC_VALIDATION = "http://apache.org/xml/features/validation/dynamic";
+    static final String JAXP_SCHEMA_VALIDATION = "http://apache.org/xml/features/validation/schema";
+
+    private static final String LOAD_MESSAGE = "Getting SvcLogicGraph from database - ";
+    private static final String LOAD_ERROR_MESSAGE = "SvcLogicGraph not found - ";
+    private static final String ACTIVATION_ERROR_MESSAGE = "Could not activate SvcLogicGraph - ";
+    private static final String PRINT_ERROR_MESSAGE = "Could not print SvcLogicGraph - ";
+    private static final String SVC_LOGIC_STORE_ERROR = "Could not get service logic store";
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(SvcLogicParser.class);
+    private static final String SLI_VALIDATING_PARSER = "org.openecomp.sdnc.sli.parser.validate";
+    private static final String SVCLOGIC_XSD = "/svclogic.xsd";
+
+    private class SvcLogicHandler extends DefaultHandler {
+    private Locator locator = null;
+    private String module = null;
+    private String version = null;
+    private LinkedList<SvcLogicGraph> graphs = null;
+    private SvcLogicGraph curGraph = null;
+    private SvcLogicNode curNode = null;
+    private LinkedList<SvcLogicNode> nodeStack = null;
+    private int curNodeId = 0;
+    private String outcomeValue = null;
+    private LinkedList<String> outcomeStack = null;
+    private SvcLogicStore svcLogicStore = null;
+
+    public SvcLogicHandler(LinkedList<SvcLogicGraph> graphs, SvcLogicStore store) {
+        this.graphs = graphs;
+        this.curNode = null;
+        this.nodeStack = new LinkedList<>();
+        this.outcomeStack = new LinkedList<>();
+        this.curNodeId = 1;
+        this.outcomeValue = null;
+        this.svcLogicStore = store;
+
+    }
+
+    @Override
+	public void setDocumentLocator(Locator locator) {
+        this.locator = locator;
+    }
+
+    @Override
+    public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
+
+        // Handle service-logic (graph) tag
+        if ("service-logic".equalsIgnoreCase(qName)) {
+
+        module = attributes.getValue("module");
+        if (module == null || module.length() == 0) {
+            throw new SAXException("line " + locator.getLineNumber() + ":" + locator.getColumnNumber() + " " + "Missing 'module' attribute from service-logic tag");
+        }
+
+        version = attributes.getValue("version");
+        if (version == null || version.length() == 0) {
+            throw new SAXException("line " + locator.getLineNumber() + ":" + locator.getColumnNumber() + " " + "Missing 'version' attribute from service-logic tag");
+        }
+
+        return;
+        }
+
+        if ("method".equalsIgnoreCase(qName)) {
+        if (curGraph != null) {
+            throw new SAXException("line " + locator.getLineNumber() + ":" + locator.getColumnNumber() + " " + "Cannot nest module tags");
+        }
+        curGraph = new SvcLogicGraph();
+        curGraph.setModule(module);
+        curGraph.setVersion(version);
+        this.curNodeId = 1;
+
+        String attrValue = attributes.getValue("rpc");
+        if (attrValue == null || attrValue.length() == 0) {
+            throw new SAXException("line " + locator.getLineNumber() + ":" + locator.getColumnNumber() + " " + "Missing 'rpc' attribute for method tag");
+        }
+        curGraph.setRpc(attrValue);
+
+        attrValue = attributes.getValue("mode");
+        if (attrValue == null || attrValue.length() == 0) {
+            throw new SAXException("line " + locator.getLineNumber() + ":" + locator.getColumnNumber() + " " + "Missing 'mode' attribute for method tag");
+        }
+        curGraph.setMode(attrValue);
+
+        return;
+
+        }
+
+        // Handle outcome (edge) tag
+        if ("outcome".equalsIgnoreCase(qName)) {
+        String refValue = attributes.getValue("ref");
+
+        if (refValue != null) {
+            SvcLogicNode refNode = curGraph.getNamedNode(refValue);
+
+            if (refNode != null) {
+            try {
+                curNode.addOutcome(attributes.getValue("value"), refNode);
+            } catch (SvcLogicException e) {
+                throw new SAXException("line " + locator.getLineNumber() + ":" + locator.getColumnNumber() + " " + "Cannot add outcome", e);
+            }
+            } else {
+            throw new SAXException("line " + locator.getLineNumber() + ":" + locator.getColumnNumber() + " " + "ref to unknown node " + refValue);
+            }
+            return;
+        }
+
+        if (outcomeValue != null) {
+            outcomeStack.push(outcomeValue);
+        }
+        outcomeValue = attributes.getValue("value");
+
+        return;
+        }
+
+        // Handle parameter tag
+        if ("parameter".equalsIgnoreCase(qName)) {
+        String parmName = attributes.getValue("name");
+        String parmValue = attributes.getValue("value");
+
+        if (parmName != null && parmName.length() > 0 && parmValue != null) {
+            try {
+
+            curNode.mapParameter(parmName, parmValue);
+            } catch (Exception e) {
+            throw new SAXException("line " + locator.getLineNumber() + ":" + locator.getColumnNumber() + " " + " cannot set parameter " + parmName + " to " + parmValue + " [" + e.getMessage() + "]");
+            }
+        }
+
+        return;
+        }
+
+        // Handle node tags
+
+        String nodeName = attributes.getValue("name");
+        SvcLogicNode thisNode = null;
+
+        try {
+        if (!svcLogicStore.isValidNodeType(qName)) {
+            throw new SAXNotRecognizedException("line " + locator.getLineNumber() + ":" + locator.getColumnNumber() + " " + "Unknown tag " + qName);
+        }
+        } catch (Exception e) {
+        throw new SAXNotRecognizedException("line " + locator.getLineNumber() + ":" + locator.getColumnNumber() + " " + "Cannot validate node type " + qName);
+        }
+
+        try {
+        if (nodeName != null && nodeName.length() > 0) {
+            thisNode = new SvcLogicNode(curNodeId++, qName, nodeName, curGraph);
+        } else {
+            thisNode = new SvcLogicNode(curNodeId++, qName, curGraph);
+        }
+
+        if (curGraph.getRootNode() == null) {
+            curGraph.setRootNode(thisNode);
+        }
+        } catch (SvcLogicException e) {
+        throw new SAXException("line " + locator.getLineNumber() + ":" + locator.getColumnNumber() + " " + e.getMessage());
+
+        }
+
+        int numAttributes = attributes.getLength();
+
+        for (int i = 0; i < numAttributes; i++) {
+        String attrName = attributes.getQName(i);
+        if (!"name".equalsIgnoreCase(attrName)) {
+            try {
+
+            String attrValueStr = attributes.getValue(i);
+            SvcLogicExpression attrValue = null;
+            if (attrValueStr.trim().startsWith("`")) {
+                int lastParen = attrValueStr.lastIndexOf("`");
+                String evalExpr = attrValueStr.trim().substring(1, lastParen);
+                attrValue = SvcLogicExpressionFactory.parse(evalExpr);
+
+            } else {
+                if (Character.isDigit(attrValueStr.charAt(0))) {
+                attrValue = new SvcLogicAtom("NUMBER", attrValueStr);
+                } else {
+                attrValue = new SvcLogicAtom("STRING", attrValueStr);
+                }
+            }
+            thisNode.setAttribute(attrName, attrValue);
+            } catch (Exception e) {
+            throw new SAXException("line " + locator.getLineNumber() + ":" + locator.getColumnNumber() + " " + "Cannot set attribute " + attrName, e);
+            }
+        }
+        }
+
+        if (curNode != null) {
+        try {
+            if ("block".equalsIgnoreCase(curNode.getNodeType()) || "for".equalsIgnoreCase(curNode.getNodeType()) || "while".equalsIgnoreCase(curNode.getNodeType())) {
+            curNode.addOutcome("" + (curNode.getNumOutcomes() + 1), thisNode);
+            } else {
+            if (outcomeValue == null) {
+                throw new SAXException("line " + locator.getLineNumber() + ":" + locator.getColumnNumber() + " " + curNode.getNodeType() + " node expects outcome, instead found " + thisNode.getNodeType());
+            }
+            curNode.addOutcome(outcomeValue, thisNode);
+            }
+        } catch (SvcLogicException e) {
+            throw new SAXException("line " + locator.getLineNumber() + ":" + locator.getColumnNumber() + " " + e.getMessage());
+        }
+        nodeStack.push(curNode);
+        }
+        curNode = thisNode;
+
+    }
+
+    @Override
+    public void endElement(String uri, String localName, String qName) throws SAXException {
+
+        // Handle close of service-logic tag
+        if ("service-logic".equalsIgnoreCase(qName)) {
+        // Nothing more to do
+        return;
+        }
+
+        // Handle close of method tag
+        if ("method".equalsIgnoreCase(qName)) {
+        graphs.add(curGraph);
+        curGraph = null;
+        return;
+        }
+
+        // Handle close of outcome tag
+        if ("outcome".equalsIgnoreCase(qName)) {
+        // Finished this outcome - pop the outcome stack
+        if (outcomeStack.isEmpty()) {
+            outcomeValue = null;
+        } else {
+            outcomeValue = outcomeStack.pop();
+        }
+        return;
+        }
+
+        // Handle close of parameter tag - do nothing
+        if ("parameter".equalsIgnoreCase(qName)) {
+        return;
+        }
+
+        // Handle close of a node tag
+        if (nodeStack.isEmpty()) {
+        curNode = null;
+        } else {
+        curNode = nodeStack.pop();
+        }
+    }
+
+    @Override
+    public void error(SAXParseException arg0) throws SAXException {
+        throw new SAXException("line " + locator.getLineNumber() + ":" + locator.getColumnNumber() + " " + arg0.getMessage());
+    }
+
+    }
+
+    public SvcLogicParser(SvcLogicStore store) {
+    this.store = store;
+    }
+
+    public SvcLogicParser(String propFile) {
+
+    try {
+        this.store = SvcLogicStoreFactory.getSvcLogicStore(propFile);
+    } catch (Exception e) {
+        LOGGER.error(SVC_LOGIC_STORE_ERROR, e);
+
+    }
+
+    }
+
+    public SvcLogicParser(InputStream propStr) {
+
+    try {
+        this.store = SvcLogicStoreFactory.getSvcLogicStore(propStr);
+    } catch (Exception e) {
+        LOGGER.error(SVC_LOGIC_STORE_ERROR, e);
+
+    }
+
+    }
+
+    public LinkedList<SvcLogicGraph> parse(String fileName) throws SvcLogicException {
+    LinkedList<SvcLogicGraph> graphs = null;
+
+    URL xsdUrl = null;
+    Schema schema = null;
+    String validateSchema = System.getProperty(SLI_VALIDATING_PARSER, "true");
+
+    if (validateSchema != null || validateSchema.equalsIgnoreCase("true")) {
+        xsdUrl = getClass().getResource(SVCLOGIC_XSD);
+
+    }
+
+    if (xsdUrl != null) {
+        try {
+        SchemaFactory schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
+        schema = schemaFactory.newSchema(xsdUrl);
+        } catch (Exception e) {
+        LOGGER.warn("Could not validate using schema " + xsdUrl.getPath(), e);
+        }
+    } else {
+        LOGGER.warn("Could not find resource " + SVCLOGIC_XSD);
+    }
+
+    try {
+        SAXParserFactory factory = SAXParserFactory.newInstance();
+
+        if (schema != null) {
+        factory.setNamespaceAware(true);
+        factory.setSchema(schema);
+        }
+        SAXParser saxParser = factory.newSAXParser();
+
+        if (saxParser.isValidating()) {
+        LOGGER.info("Validating against schema " + xsdUrl.getPath());
+        }
+        graphs = new LinkedList<>();
+
+        saxParser.parse(fileName, new SvcLogicHandler(graphs, store));
+
+    } catch (Exception e) {
+        String msg = e.getMessage();
+        if (msg != null) {
+        LOGGER.error(msg);
+        throw new SvcLogicException("Compiler error: " + fileName + " @ " + msg);
+        } else {
+        LOGGER.info("Caught exception parsing " + fileName, e);
+        throw new SvcLogicException("Compiler error: " + fileName, e);
+        }
+    }
+
+    return graphs;
+    }
+
+    public static void main(String argv[]) {
+
+    if (argv.length == 0) {
+        SvcLogicParser.usage();
+    }
+
+    if ("load".equalsIgnoreCase(argv[0])) {
+        if (argv.length == 3) {
+        String xmlfile = argv[1];
+        String propfile = argv[2];
+
+        SvcLogicStore store = SvcLogicParser.getStore(propfile);
+        try {
+            SvcLogicParser.load(xmlfile, store);
+        } catch (Exception e) {
+            LOGGER.error(e.getMessage(), e);
+        }
+        } else {
+        SvcLogicParser.usage();
+        }
+    } else if ("print".equalsIgnoreCase(argv[0])) {
+        String version = null;
+        String propfile = null;
+
+        switch (argv.length) {
+        case 6:
+        version = argv[4];
+        propfile = argv[5];
+        case 5:
+        if (propfile == null) {
+            propfile = argv[4];
+        }
+        SvcLogicStore store = SvcLogicParser.getStore(propfile);
+        SvcLogicParser.print(argv[1], argv[2], argv[3], version, store);
+        break;
+        default:
+        SvcLogicParser.usage();
+        }
+    } else if ("get-source".equalsIgnoreCase(argv[0])) {
+
+        switch (argv.length) {
+        case 6:
+        SvcLogicStore store = SvcLogicParser.getStore(argv[5]);
+        SvcLogicParser.getSource(argv[1], argv[2], argv[3], argv[4], store);
+        break;
+        default:
+        SvcLogicParser.usage();
+        }
+    } else if ("activate".equalsIgnoreCase(argv[0])) {
+        if (argv.length == 6) {
+        SvcLogicStore store = SvcLogicParser.getStore(argv[5]);
+        SvcLogicParser.activate(argv[1], argv[2], argv[3], argv[4], store);
+        } else {
+        SvcLogicParser.usage();
+        }
+    } else if ("validate".equalsIgnoreCase(argv[0])) {
+        if (argv.length == 3) {
+        String xmlfile = argv[1];
+        String propfile = argv[2];
+
+        System.setProperty(SLI_VALIDATING_PARSER, "true");
+        SvcLogicStore store = SvcLogicParser.getStore(propfile);
+        try {
+            SvcLogicParser.validate(xmlfile, store);
+        } catch (Exception e) {
+            LOGGER.error(e.getMessage(), e);
+        }
+        } else {
+        SvcLogicParser.usage();
+        }
+    }
+
+    System.exit(0);
+    }
+
+    private static SvcLogicStore getStore(String propfile) {
+
+    SvcLogicStore store = null;
+
+    try {
+        store = SvcLogicStoreFactory.getSvcLogicStore(propfile);
+    } catch (Exception e) {
+        LOGGER.error(SVC_LOGIC_STORE_ERROR, e);
+        System.exit(1);
+    }
+
+    return store;
+
+    }
+
+    public static void load(String xmlfile, SvcLogicStore store) throws SvcLogicException {
+    File xmlFile = new File(xmlfile);
+    if (!xmlFile.canRead()) {
+        throw new ConfigurationException("Cannot read xml file (" + xmlfile + ")");
+    }
+
+    SvcLogicParser parser = new SvcLogicParser(store);
+    LinkedList<SvcLogicGraph> graphs = null;
+    try {
+        graphs = parser.parse(xmlfile);
+    } catch (Exception e) {
+        throw new SvcLogicException(e.getMessage(), e);
+    }
+
+    if (graphs == null) {
+        throw new SvcLogicException("Could not parse " + xmlfile);
+    }
+
+    for (SvcLogicGraph graph : graphs) {
+
+        String module = graph.getModule();
+        String rpc = graph.getRpc();
+        String version = graph.getVersion();
+        String mode = graph.getMode();
+        try {
+        LOGGER.info("Saving SvcLogicGraph to database (module:" + module + ",rpc:" + rpc + ",version:" + version + ",mode:" + mode + ")");
+        store.store(graph);
+        } catch (Exception e) {
+        throw new SvcLogicException(e.getMessage(), e);
+        }
+
+    }
+
+    }
+
+    public static void validate(String xmlfile, SvcLogicStore store) throws SvcLogicException {
+    File xmlFile = new File(xmlfile);
+    if (!xmlFile.canRead()) {
+        throw new ConfigurationException("Cannot read xml file (" + xmlfile + ")");
+    }
+
+    SvcLogicParser parser = new SvcLogicParser(store);
+    LinkedList<SvcLogicGraph> graphs = null;
+    try {
+        LOGGER.info("Validating " + xmlfile);
+        graphs = parser.parse(xmlfile);
+    } catch (Exception e) {
+        throw new SvcLogicException(e.getMessage(), e);
+    }
+
+    if (graphs == null) {
+        throw new SvcLogicException("Could not parse " + xmlfile);
+    } else {
+        LOGGER.info("Compilation successful for " + xmlfile);
+    }
+
+    }
+
+    private static void print(String module, String rpc, String mode, String version, SvcLogicStore store) {
+    String details = "(module:" + module + ", rpc:" + rpc + ", version:" + version + ", mode:" + mode + ")";
+
+    try {
+        LOGGER.info(LOAD_MESSAGE + details);
+
+        SvcLogicGraph graph = store.fetch(module, rpc, version, mode);
+        if (graph == null) {
+        LOGGER.error(LOAD_ERROR_MESSAGE + details);
+        System.exit(1);
+        }
+        graph.printAsGv(System.out);
+    } catch (Exception e) {
+        LOGGER.error(PRINT_ERROR_MESSAGE + details, e);
+        System.exit(1);
+    }
+
+    }
+
+    private static void getSource(String module, String rpc, String mode, String version, SvcLogicStore store) {
+    String details = "(module:" + module + ", rpc:" + rpc + ", version:" + version + ", mode:" + mode + ")";
+
+    try {
+        LOGGER.info(LOAD_MESSAGE + details);
+
+        SvcLogicGraph graph = store.fetch(module, rpc, version, mode);
+        if (graph == null) {
+        LOGGER.error(LOAD_ERROR_MESSAGE + details);
+        System.exit(1);
+        }
+        graph.printAsXml(System.out);
+    } catch (Exception e) {
+        LOGGER.error(PRINT_ERROR_MESSAGE + details, e);
+        System.exit(1);
+    }
+
+    }
+
+    private static void activate(String module, String rpc, String version, String mode, SvcLogicStore store) {
+    String details = "(module:" + module + ", rpc:" + rpc + ", version:" + version + ", mode:" + mode + ")";
+
+    try {
+        LOGGER.info(LOAD_MESSAGE + details);
+
+        SvcLogicGraph graph = store.fetch(module, rpc, version, mode);
+        if (graph == null) {
+        LOGGER.error(LOAD_ERROR_MESSAGE + details);
+        System.exit(1);
+        }
+        store.activate(graph);
+    } catch (Exception e) {
+        LOGGER.error(ACTIVATION_ERROR_MESSAGE + details, e);
+        System.exit(1);
+    }
+
+    }
+
+    private static void usage() {
+    System.err.println("Usage: SvcLogicParser load <xml-file> <prop-file>");
+    System.err.println(" OR    SvcLogicParser print <module> <rpc> <mode> [<version>] <prop-file>");
+    System.err.println(" OR    SvcLogicParser get-source <module> <rpc> <mode> <version> <prop-file>");
+    System.err.println(" OR    SvcLogicParser activate <module> <rpc> <version> <mode>");
+    System.exit(1);
+    }
+
+}
diff --git a/sli/common/src/main/java/org/openecomp/sdnc/sli/SvcLogicParserException.java b/sli/common/src/main/java/org/openecomp/sdnc/sli/SvcLogicParserException.java
new file mode 100644
index 00000000..ac9c515e
--- /dev/null
+++ b/sli/common/src/main/java/org/openecomp/sdnc/sli/SvcLogicParserException.java
@@ -0,0 +1,43 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdnc.sli;
+
+import java.io.IOException;
+
+public class SvcLogicParserException extends IOException {
+
+	public SvcLogicParserException() {
+		super();
+	}
+	
+	public SvcLogicParserException(String msg) {
+		super(msg);
+	}
+	
+	public SvcLogicParserException(Throwable t) {
+		super(t);
+	}
+	
+	public SvcLogicParserException(String msg, Throwable t) {
+		super(msg, t);
+	}
+}
diff --git a/sli/common/src/main/java/org/openecomp/sdnc/sli/SvcLogicRecorder.java b/sli/common/src/main/java/org/openecomp/sdnc/sli/SvcLogicRecorder.java
new file mode 100644
index 00000000..8a23adf1
--- /dev/null
+++ b/sli/common/src/main/java/org/openecomp/sdnc/sli/SvcLogicRecorder.java
@@ -0,0 +1,30 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdnc.sli;
+
+import java.util.Map;
+
+public interface SvcLogicRecorder {
+	
+	void record(Map<String, String> parmMap) throws SvcLogicException;
+
+}
diff --git a/sli/common/src/main/java/org/openecomp/sdnc/sli/SvcLogicResource.java b/sli/common/src/main/java/org/openecomp/sdnc/sli/SvcLogicResource.java
new file mode 100644
index 00000000..5fc00f87
--- /dev/null
+++ b/sli/common/src/main/java/org/openecomp/sdnc/sli/SvcLogicResource.java
@@ -0,0 +1,53 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdnc.sli;
+
+import java.sql.SQLException;
+import java.util.Map;
+
+public interface SvcLogicResource {
+	
+	public enum QueryStatus {
+		SUCCESS,
+		NOT_FOUND,
+		FAILURE
+	}
+	
+	public QueryStatus isAvailable(String resource, String key, String prefix, SvcLogicContext ctx) throws SvcLogicException;
+	
+	public QueryStatus exists(String resource, String key, String prefix, SvcLogicContext ctx)  throws SvcLogicException;
+	
+	public QueryStatus query(String resource, boolean localOnly, String select, String key, String prefix, String orderBy, SvcLogicContext ctx)  throws SvcLogicException;
+	
+	public QueryStatus reserve(String resource, String select, String key, String prefix, SvcLogicContext ctx) throws SvcLogicException;
+	
+	public QueryStatus save(String resource, boolean force, boolean localOnly, String key, Map<String, String> parms, String prefix, SvcLogicContext ctx) throws SvcLogicException;
+	
+	public QueryStatus release(String resource, String key, SvcLogicContext ctx)  throws SvcLogicException;
+	
+	public QueryStatus delete(String resource, String key, SvcLogicContext ctx) throws SvcLogicException;
+	
+	public QueryStatus notify(String resource, String action, String key, SvcLogicContext ctx) throws SvcLogicException;
+	
+	public QueryStatus update(String resource, String key, Map<String, String> parms, String prefix, SvcLogicContext ctx) throws SvcLogicException;
+
+}
diff --git a/sli/common/src/main/java/org/openecomp/sdnc/sli/SvcLogicStore.java b/sli/common/src/main/java/org/openecomp/sdnc/sli/SvcLogicStore.java
new file mode 100644
index 00000000..6959c86a
--- /dev/null
+++ b/sli/common/src/main/java/org/openecomp/sdnc/sli/SvcLogicStore.java
@@ -0,0 +1,37 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdnc.sli;
+
+import java.util.Properties;
+
+public interface SvcLogicStore {
+	
+	public void init(Properties props) throws SvcLogicException;
+	public void registerNodeType(String nodeType) throws SvcLogicException;
+	public void unregisterNodeType(String nodeType) throws SvcLogicException;
+	public boolean isValidNodeType(String nodeType) throws SvcLogicException;
+	public boolean hasGraph(String module, String rpc, String version, String mode) throws SvcLogicException;
+	public SvcLogicGraph fetch(String module, String rpc, String version, String mode) throws SvcLogicException;
+	public void store(SvcLogicGraph graph) throws SvcLogicException;
+	public void delete(String module, String rpc, String version, String mode) throws SvcLogicException;
+	public void activate(SvcLogicGraph graph) throws SvcLogicException;
+}
diff --git a/sli/common/src/main/java/org/openecomp/sdnc/sli/SvcLogicStoreFactory.java b/sli/common/src/main/java/org/openecomp/sdnc/sli/SvcLogicStoreFactory.java
new file mode 100644
index 00000000..8b6618be
--- /dev/null
+++ b/sli/common/src/main/java/org/openecomp/sdnc/sli/SvcLogicStoreFactory.java
@@ -0,0 +1,96 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdnc.sli;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.util.Properties;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class SvcLogicStoreFactory {
+
+	private static final Logger LOG = LoggerFactory.getLogger(SvcLogicStoreFactory.class);
+	
+	public static SvcLogicStore getSvcLogicStore(String propfile)
+			throws SvcLogicException {
+		File propFile = new File(propfile);
+		if (!propFile.canRead()) {
+			throw new ConfigurationException("Cannot read property file "
+					+ propfile);
+
+		}
+
+		try {
+			return (getSvcLogicStore(new FileInputStream(propFile)));
+		} catch (Exception e) {
+			throw new ConfigurationException(
+					"Could load service store from properties file " + propfile,
+					e);
+		}
+
+	}
+
+	public static SvcLogicStore getSvcLogicStore(InputStream inStr) throws SvcLogicException
+	{
+		Properties props = new Properties();
+		
+		try {
+			props.load(inStr);
+		} catch (Exception e) {
+			throw new ConfigurationException("Could not get load properties from input stream", e);
+		}
+		
+		return(getSvcLogicStore(props));
+	}
+
+	public static SvcLogicStore getSvcLogicStore(Properties props)
+			throws SvcLogicException {
+		String storeType = props.getProperty("org.openecomp.sdnc.sli.dbtype");
+		if ((storeType == null) || (storeType.length() == 0)) {
+			throw new ConfigurationException(
+					"property org.openecomp.sdnc.sli.dbtype unset");
+
+		}
+
+		SvcLogicStore retval = null;
+		LOG.debug(String.format("Using org.openecomp.sdnc.sli.dbtype=%s", storeType));
+
+		if ("jdbc".equalsIgnoreCase(storeType)) {
+			retval = new SvcLogicJdbcStore();
+
+		} else if ("dblib".equalsIgnoreCase(storeType)) {
+			retval = new SvcLogicDblibStore();
+        } else {
+			throw new ConfigurationException("unsupported dbtype (" + storeType
+					+ ")");
+
+		}
+
+		
+		retval.init(props);
+		return (retval);
+	}
+
+}
diff --git a/sli/common/src/main/java/org/openecomp/sdnc/sli/SvcLogicVariableTerm.java b/sli/common/src/main/java/org/openecomp/sdnc/sli/SvcLogicVariableTerm.java
new file mode 100644
index 00000000..9ddc3c0b
--- /dev/null
+++ b/sli/common/src/main/java/org/openecomp/sdnc/sli/SvcLogicVariableTerm.java
@@ -0,0 +1,77 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdnc.sli;
+
+public class SvcLogicVariableTerm extends SvcLogicExpression {
+	
+	private String name = null;
+	
+	public String getName() {
+		return name;
+	}
+
+	
+	public SvcLogicVariableTerm(String identifier)
+	{
+		this.name = identifier;
+	}
+	
+	public SvcLogicExpression getSubscript()
+	{
+		if (numOperands() > 0)
+		{
+			return(getOperands().get(0));
+		}
+		else
+		{
+			return(null);
+		}
+	}
+
+	
+	public String toString()
+	{
+		String retval = "";
+		
+		if (numOperands() > 0)
+		{
+			retval = name + "[" + getSubscript().toString() + "]";
+		}
+		else
+		{
+			retval = name;
+		}
+		return(retval);
+	}
+
+	@Override
+	public String asParsedExpr() {
+		if (numOperands() == 0) {
+			return("(variable-term "+name+")");
+		}
+		else
+		{
+			return("(variable-term "+name+" "+getSubscript().asParsedExpr()+")");
+		}
+	}
+
+}
diff --git a/sli/common/src/main/resources/crAseNetwork.sql b/sli/common/src/main/resources/crAseNetwork.sql
new file mode 100644
index 00000000..41231176
--- /dev/null
+++ b/sli/common/src/main/resources/crAseNetwork.sql
@@ -0,0 +1,82 @@
+---
+-- ============LICENSE_START=======================================================
+-- openECOMP : SDN-C
+-- ================================================================================
+-- Copyright (C) 2017 AT&T Intellectual Property. All rights
+-- 						reserved.
+-- ================================================================================
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+-- 
+--      http://www.apache.org/licenses/LICENSE-2.0
+-- 
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+-- ============LICENSE_END=========================================================
+---
+
+CREATE TABLE sdnctl.ASE (
+	ase_network_id INT NOT NULL,
+	topology VARCHAR(25),
+	CONSTRAINT P_ASE PRIMARY KEY(ase_network_id));
+	
+CREATE TABLE sdnctl.ASE_PORT (
+	esm_name VARCHAR(25),
+	resource_emt_clli VARCHAR(25) NOT NULL,
+	resource_emt_ip_addr VARCHAR(25) NOT NULL,
+	port_action VARCHAR(25),
+	profile VARCHAR(25) ,
+	port VARCHAR(15) NOT NULL,
+	state VARCHAR(25),
+	resource_mode VARCHAR(25),
+    speed INT,
+    resource_lldp VARCHAR(1),
+	resource_mtu VARCHAR(5),
+	resource_autoneg VARCHAR(10),
+	resource_twamp VARCHAR(10),
+	resource_description VARCHAR(80),
+	uni_circuit_id VARCHAR(45),
+	CONSTRAINT P_ASE_PORT PRIMARY KEY(resource_emt_clli, port));
+	
+CREATE TABLE sdnctl.ASE_EVC (
+	esm_name VARCHAR(25),
+	emt_ip_addr VARCHAR(25) NOT NULL,
+	evc_action VARCHAR(25),
+	service_id VARCHAR(25),
+	serv_type VARCHAR(25),
+	evc_choice VARCHAR(25),
+	uni_port VARCHAR(25) NOT NULL,
+	lag_port VARCHAR(25),
+	mac_onoff VARCHAR(25),	
+	ppcos VARCHAR(25),
+	cir VARCHAR(25),
+	cbs VARCHAR(25),
+	ebs VARCHAR(25),	
+	sgos VARCHAR(25),
+	pe VARCHAR(25),
+	unit VARCHAR(25),
+	qinq VARCHAR(25),	
+	interface VARCHAR(25),
+	evc_description VARCHAR(80),	
+	bandwidth VARCHAR(10),
+	svlan VARCHAR(5),
+	cvlan VARCHAR(5),
+	routing_instance VARCHAR(25),
+	rd VARCHAR(25),
+	rt VARCHAR(25),
+	evc_limit VARCHAR(25),
+	label_block_size VARCHAR(25),
+	site VARCHAR(25),
+	int_mac_limit VARCHAR(5),
+	sgos_grade VARCHAR(25),
+	bum_rate VARCHAR(25),
+	uni_circuit_id VARCHAR(45),
+	leg INT,
+	CONSTRAINT P_ASE_EVC PRIMARY KEY(emt_ip_addr, uni_port,leg));
+	
+	
+	
diff --git a/sli/common/src/main/resources/svclogic.xsd b/sli/common/src/main/resources/svclogic.xsd
new file mode 100755
index 00000000..f74bd5dc
--- /dev/null
+++ b/sli/common/src/main/resources/svclogic.xsd
@@ -0,0 +1,334 @@
+<?xml version = "1.0" encoding = "UTF-8"?>

+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.openecomp.org/sdnc/svclogic" xmlns="http://www.openecomp.org/sdnc/svclogic">

+

+	<xsd:simpleType name="modeType">

+		<xsd:restriction base="xsd:string">

+			<xsd:enumeration value="sync" />

+			<xsd:enumeration value="async" />

+		</xsd:restriction>

+	</xsd:simpleType>

+

+	<xsd:group name="node">

+		<xsd:choice>

+			<xsd:element ref="block" />

+			<xsd:element ref="is-available" />

+			<xsd:element ref="exists" />

+			<xsd:element ref="reserve" />

+			<xsd:element ref="release" />

+			<xsd:element ref="allocate" />

+			<xsd:element ref="get-resource" />

+			<xsd:element ref="configure" />

+			<xsd:element ref="return" />

+			<xsd:element ref="switch" />

+			<xsd:element ref="record" />

+			<xsd:element ref="save" />

+			<xsd:element ref="for" />

+			<xsd:element ref="set" />

+			<xsd:element ref="execute" />

+			<xsd:element ref="delete" />

+			<xsd:element ref="update" />

+			<xsd:element ref="call" />

+			<xsd:element ref="notify" />

+			<xsd:element ref="break" />

+			<xsd:element ref="while" />

+		</xsd:choice>

+	</xsd:group>

+

+	<xsd:element name="service-logic">

+		<xsd:complexType>

+			<xsd:sequence>

+				<xsd:element ref="method" minOccurs="0" maxOccurs="unbounded" />

+			</xsd:sequence>

+			<xsd:attribute name="module" use="required" type="xsd:string" />

+			<xsd:attribute name="version" use="required" type="xsd:string" />

+		</xsd:complexType>

+	</xsd:element>

+

+	<xsd:element name="method">

+		<xsd:complexType>

+			<xsd:sequence>

+				<xsd:group ref="node" minOccurs="0" maxOccurs="unbounded" />

+			</xsd:sequence>

+			<xsd:attribute name="rpc" use="required" type="xsd:string" />

+			<xsd:attribute name="mode" use="optional" type="modeType" />

+		</xsd:complexType>

+	</xsd:element>

+

+	<xsd:element name="block">

+		<xsd:complexType>

+			<xsd:sequence>

+				<xsd:group ref="node" minOccurs="0" maxOccurs="unbounded" />

+			</xsd:sequence>

+			<xsd:attribute name="atomic" use="optional" type="xsd:boolean" />

+		</xsd:complexType>

+	</xsd:element>

+

+	<xsd:element name="is-available">

+		<xsd:complexType>

+			<xsd:sequence>

+				<xsd:element ref="outcome" minOccurs="0" maxOccurs="unbounded" />

+			</xsd:sequence>

+			<xsd:attribute name="pfx" use="optional" type="xsd:string" />

+			<xsd:attribute name="plugin" use="required" type="xsd:string" />

+			<xsd:attribute name="resource" use="required" type="xsd:string" />

+			<xsd:attribute name="key" use="optional" type="xsd:string" />

+		</xsd:complexType>

+	</xsd:element>

+

+	<xsd:element name="exists">

+		<xsd:complexType>

+			<xsd:sequence>

+				<xsd:element ref="outcome" minOccurs="0" maxOccurs="unbounded" />

+			</xsd:sequence>

+			<xsd:attribute name="pfx" use="optional" type="xsd:string" />

+			<xsd:attribute name="plugin" use="required" type="xsd:string" />

+			<xsd:attribute name="resource" use="required" type="xsd:string" />

+			<xsd:attribute name="key" use="required" type="xsd:string" />

+		</xsd:complexType>

+	</xsd:element>

+

+	<xsd:element name="outcome">

+		<xsd:complexType>

+			<xsd:sequence>

+				<xsd:group ref="node" minOccurs="0" maxOccurs="unbounded" />

+			</xsd:sequence>

+			<xsd:attribute name="ref" use="optional" type="xsd:string" />

+			<xsd:attribute name="value" use="required" type="xsd:string" />

+		</xsd:complexType>

+	</xsd:element>

+

+	<xsd:element name="reserve">

+		<xsd:complexType>

+			<xsd:sequence>

+				<!-- This node does not actually read from parameters -->

+				<xsd:element ref="parameter" minOccurs="0" maxOccurs="unbounded" />

+				<xsd:element ref="outcome" minOccurs="0" maxOccurs="unbounded" />

+			</xsd:sequence>

+			<xsd:attribute name="plugin" use="required" type="xsd:string" />

+			<xsd:attribute name="resource" use="required" type="xsd:string" />

+			<xsd:attribute name="key" use="optional" type="xsd:string" />

+			<xsd:attribute name="select" use="optional" type="xsd:string" />

+			<xsd:attribute name="pfx" use="optional" type="xsd:string" />

+		</xsd:complexType>

+	</xsd:element>

+

+	<xsd:element name="release">

+		<xsd:complexType>

+			<xsd:sequence>

+				<xsd:element ref="outcome" minOccurs="0" maxOccurs="unbounded" />

+			</xsd:sequence>

+			<xsd:attribute name="plugin" use="required" type="xsd:string" />

+			<xsd:attribute name="resource" use="required" type="xsd:string" />

+			<xsd:attribute name="key" use="optional" type="xsd:string" />

+			<xsd:attribute name="pfx" use="optional" type="xsd:string" />

+		</xsd:complexType>

+	</xsd:element>

+

+	<xsd:element name="record">

+		<xsd:complexType>

+			<xsd:sequence>

+				<xsd:element ref="parameter" minOccurs="0" maxOccurs="unbounded" />

+				<xsd:element ref="outcome" minOccurs="0" maxOccurs="unbounded" />

+			</xsd:sequence>

+			<xsd:attribute name="plugin" use="required" type="xsd:string" />

+		</xsd:complexType>

+	</xsd:element>

+

+	<xsd:element name="allocate">

+		<xsd:complexType>

+			<xsd:sequence>

+				<!-- This node does not actually read from parameters -->

+				<xsd:element ref="parameter" minOccurs="0" maxOccurs="unbounded" />

+				<xsd:element ref="outcome" minOccurs="0" maxOccurs="unbounded" />

+			</xsd:sequence>

+			<xsd:attribute name="plugin" use="required" type="xsd:string" />

+			<xsd:attribute name="resource" use="required" type="xsd:string" />

+			<xsd:attribute name="key" use="required" type="xsd:string" />

+			<xsd:attribute name="pfx" use="required" type="xsd:string" />

+		</xsd:complexType>

+	</xsd:element>

+

+	<xsd:element name="get-resource">

+		<xsd:complexType>

+			<xsd:sequence>

+				<!-- This node does not actually read from parameters -->

+				<xsd:element ref="parameter" minOccurs="0" maxOccurs="unbounded" />

+				<xsd:element ref="outcome" minOccurs="0" maxOccurs="unbounded" />

+			</xsd:sequence>

+			<xsd:attribute name="plugin" use="required" type="xsd:string" />

+			<xsd:attribute name="resource" use="required" type="xsd:string" />

+			<xsd:attribute name="key" use="optional" type="xsd:string" />

+			<xsd:attribute name="local-only" use="optional" type="xsd:boolean" />

+			<xsd:attribute name="order-by" use="optional" type="xsd:string" />

+			<xsd:attribute name="pfx" use="optional" type="xsd:string" />

+			<!-- force is retired and does not do anything -->

+			<xsd:attribute name="force" use="optional" type="xsd:string" />

+		</xsd:complexType>

+	</xsd:element>

+

+	<xsd:element name="configure">

+		<xsd:complexType>

+			<xsd:sequence>

+				<xsd:element ref="parameter" minOccurs="0" maxOccurs="unbounded" />

+				<xsd:element ref="outcome" minOccurs="0" maxOccurs="unbounded" />

+			</xsd:sequence>

+			<xsd:attribute name="adaptor" use="required" type="xsd:string" />

+			<xsd:attribute name="key" use="required" type="xsd:string" />

+			<xsd:attribute name="activate" use="optional" type="xsd:boolean" />

+		</xsd:complexType>

+	</xsd:element>

+

+

+	<xsd:element name="parameter">

+		<xsd:complexType>

+			<xsd:attribute name="name" use="required" type="xsd:string" />

+			<xsd:attribute name="value" use="required" type="xsd:string" />

+		</xsd:complexType>

+	</xsd:element>

+

+

+	<xsd:element name="return">

+		<xsd:complexType>

+			<xsd:sequence>

+				<xsd:element ref="parameter" minOccurs="0" maxOccurs="unbounded" />

+			</xsd:sequence>

+			<xsd:attribute name="status" use="optional" type="xsd:string" />

+		</xsd:complexType>

+	</xsd:element>

+

+	<xsd:element name="switch">

+		<xsd:complexType>

+			<xsd:sequence>

+				<xsd:element ref="outcome" minOccurs="0" maxOccurs="unbounded" />

+			</xsd:sequence>

+			<xsd:attribute name="test" use="required" type="xsd:string" />

+		</xsd:complexType>

+	</xsd:element>

+

+	<xsd:element name="save">

+		<xsd:complexType>

+			<xsd:sequence>

+				<xsd:element ref="parameter" minOccurs="0" maxOccurs="unbounded" />

+				<xsd:element ref="outcome" minOccurs="0" maxOccurs="unbounded" />

+			</xsd:sequence>

+			<xsd:attribute name="plugin" use="required" type="xsd:string" />

+			<xsd:attribute name="resource" use="required" type="xsd:string" />

+			<xsd:attribute name="key" use="optional" type="xsd:string" />

+			<xsd:attribute name="force" use="optional" type="xsd:boolean" />

+			<xsd:attribute name="local-only" use="optional" type="xsd:boolean" />

+			<xsd:attribute name="pfx" use="optional" type="xsd:string" />

+		</xsd:complexType>

+	</xsd:element>

+

+	<xsd:element name="delete">

+		<xsd:complexType>

+			<xsd:sequence>

+				<!-- This node does not actually read from parameters -->

+				<xsd:element ref="parameter" minOccurs="0" maxOccurs="unbounded" />

+				<xsd:element ref="outcome" minOccurs="0" maxOccurs="unbounded" />

+			</xsd:sequence>

+			<xsd:attribute name="plugin" use="required" type="xsd:string" />

+			<xsd:attribute name="resource" use="required" type="xsd:string" />

+			<xsd:attribute name="key" use="optional" type="xsd:string" />

+			<!-- force is retired and does not do anything -->

+			<xsd:attribute name="force" use="optional" type="xsd:string" />

+			<!-- local-only is retired and does not do anything -->

+			<xsd:attribute name="local-only" use="optional" type="xsd:string" />

+			<!-- pfx is retired and does not do anything -->

+			<xsd:attribute name="pfx" use="optional" type="xsd:string" />

+		</xsd:complexType>

+	</xsd:element>

+

+	<xsd:element name="for">

+		<xsd:complexType>

+			<xsd:sequence>

+				<xsd:group ref="node" minOccurs="0" maxOccurs="unbounded" />

+			</xsd:sequence>

+			<xsd:attribute name="atomic" use="optional" type="xsd:boolean" />

+			<xsd:attribute name="index" use="required" type="xsd:string" />

+			<xsd:attribute name="start" use="required" type="xsd:string" />

+			<xsd:attribute name="end" use="required" type="xsd:string" />

+			<xsd:attribute name="silentFailure" use="optional" type="xsd:boolean" default="false" />

+		</xsd:complexType>

+	</xsd:element>

+

+	<xsd:element name="set">

+		<xsd:complexType>

+			<xsd:sequence>

+				<xsd:element ref="parameter" minOccurs="0" maxOccurs="unbounded" />

+			</xsd:sequence>

+			<xsd:attribute name="only-if-unset" use="optional"

+				type="xsd:boolean" />

+		</xsd:complexType>

+	</xsd:element>

+

+	<xsd:element name="execute">

+		<xsd:complexType>

+			<xsd:sequence>

+				<xsd:element ref="parameter" minOccurs="0" maxOccurs="unbounded" />

+				<xsd:element ref="outcome" minOccurs="0" maxOccurs="unbounded" />

+			</xsd:sequence>

+			<xsd:attribute name="plugin" use="required" type="xsd:string" />

+			<xsd:attribute name="method" use="required" type="xsd:string" />

+			<xsd:attribute name="emitsOutcome" use="optional" type="xsd:boolean" />

+		</xsd:complexType>

+	</xsd:element>

+

+	<xsd:element name="update">

+		<xsd:complexType>

+			<xsd:sequence>

+				<xsd:element ref="parameter" minOccurs="0" maxOccurs="unbounded" />

+				<xsd:element ref="outcome" minOccurs="0" maxOccurs="unbounded" />

+			</xsd:sequence>

+			<xsd:attribute name="plugin" use="required" type="xsd:string" />

+			<xsd:attribute name="resource" use="required" type="xsd:string" />

+			<xsd:attribute name="key" use="optional" type="xsd:string" />

+			<xsd:attribute name="force" use="optional" type="xsd:boolean" />

+			<xsd:attribute name="local-only" use="optional" type="xsd:boolean" />

+			<xsd:attribute name="pfx" use="optional" type="xsd:string" />

+		</xsd:complexType>

+	</xsd:element>

+

+	<xsd:element name="call">

+		<xsd:complexType>

+			<xsd:sequence>

+				<!-- This node does not actually read from parameters -->

+				<xsd:element ref="parameter" minOccurs="0" maxOccurs="unbounded" />

+				<xsd:element ref="outcome" minOccurs="0" maxOccurs="unbounded" />

+			</xsd:sequence>

+			<xsd:attribute name="module" use="optional" type="xsd:string" />

+			<xsd:attribute name="rpc" use="required" type="xsd:string" />

+			<xsd:attribute name="version" use="optional" type="xsd:string" />

+			<xsd:attribute name="mode" use="required" type="xsd:string" />

+		</xsd:complexType>

+	</xsd:element>

+

+	<xsd:element name="notify">

+		<xsd:complexType>

+			<xsd:sequence>

+				<xsd:element ref="outcome" minOccurs="0" maxOccurs="unbounded" />

+			</xsd:sequence>

+			<xsd:attribute name="plugin" use="optional" type="xsd:string" />

+			<xsd:attribute name="resource" use="optional" type="xsd:string" />

+			<xsd:attribute name="action" use="required" type="xsd:string" />

+			<xsd:attribute name="key" use="optional" type="xsd:string" />

+			<!-- force is retired and does not do anything -->

+			<xsd:attribute name="force" use="optional" type="xsd:string" />

+		</xsd:complexType>

+	</xsd:element>

+

+	<xsd:element name="break">

+		<xsd:complexType />

+	</xsd:element>

+

+	<xsd:element name="while">

+		<xsd:complexType>

+			<xsd:sequence>

+				<xsd:group ref="node" minOccurs="0" maxOccurs="unbounded" />

+			</xsd:sequence>

+			<xsd:attribute name="test" use="required" type="xsd:string" />

+			<xsd:attribute name="do" use="optional" type="xsd:boolean" />

+		</xsd:complexType>

+	</xsd:element>

+

+</xsd:schema>

diff --git a/sli/common/src/main/yang/ase-network.yang b/sli/common/src/main/yang/ase-network.yang
new file mode 100755
index 00000000..ae654ae0
--- /dev/null
+++ b/sli/common/src/main/yang/ase-network.yang
@@ -0,0 +1,179 @@
+module ase {
+  namespace "att:ase";
+  prefix ase;
+  revision "2014-06-03" {
+    description "Example ASE Network Module";
+  }
+
+  container ase {
+      config true;
+      leaf ase-network-id{
+        type uint32;
+      }
+      leaf topology {
+        type string ; // check enum
+      }
+  }
+
+  container ase-port {
+      config true;
+      // is this really a list of cpe ports one for each  uni-ckt
+      leaf esm-name {
+		type string;
+      }
+      
+      leaf resource-emt-clli {
+      	type string;
+      }
+      
+      leaf resource-emt-ip-addr{
+		type string;
+      }
+      leaf port-action {
+		type string;
+      }
+      leaf profile  {
+		type string;
+      }
+      leaf port {
+		type string;
+      }
+      leaf state {
+		type string;
+      }
+      leaf resource-mode {
+		type string;
+      }
+      leaf speed {
+		type string;
+      }
+      leaf resource-lldp {
+		type string;
+      }
+      leaf  resource-mtu {
+		type string;
+      }
+      leaf resource-autoneg{
+		type string;
+      }
+      leaf  resource-twamp {
+		type string;
+      }
+      leaf resource-description {
+		type string;
+      }
+      leaf uni-circuit-id {
+      	type string;
+      }
+    } // ase-port container  
+
+    container ase-evc {
+//  Port contains a list of EVC
+//     EVCs are either point to point or multipoint (topology)
+//     EVCs are connected ? what ID is used to connected them ? (network-id) ?
+      config true;
+      leaf esm-name {	
+		type string;
+      }	
+	  leaf emt-ip-addr {
+		type string;
+      }	
+	  leaf evc-action {
+		type string;
+      }	
+	  leaf service-id {
+		type string;
+      }	
+
+	  leaf serv-type {
+		type string;
+      }	
+	  leaf evc-choice {
+		type string;
+      }	
+	  leaf uni-port {
+		type string;
+      }	
+	  leaf lag-port {
+		type string;
+      }	
+	  leaf mac-onoff {
+		type string;
+      }	
+
+	  leaf ppcos {
+		type string;
+      }	
+	  leaf cir {
+		type string;
+      }	
+	  leaf cbs {
+		type string;
+      }	
+	  leaf ebs {
+		type string;
+     }	
+	 leaf sgos {
+		type string;
+     }	
+// ipag Device Data
+	leaf pe {
+		type string;
+      }	
+	leaf unit {
+		type string;
+      }	
+	  leaf qinq {
+		type string;
+      }	
+	  leaf interface {
+		type string;
+      }	
+	  leaf evc-description {
+		type string;
+      }	
+	  leaf bandwidth {
+		type string;
+      }	
+	  leaf svlan {
+		type string;
+		description "Service VLAN is either outer tag or only tag depending on QinQ";
+      }	
+	  leaf cvlan  {
+		type string;
+		description "Customer VLAN is null if not QinQ";
+      }	
+	  leaf routing-instance {
+		type string;
+      }	
+	  leaf rd {
+		type string;
+      }	
+	  leaf rt {
+		type string;
+      }	
+	  leaf limit {
+		type string;
+      }	
+	  leaf label-block-size {
+		type string;
+      }	
+	  leaf site {
+		type string;
+      }	
+	  leaf int-mac-limit {
+		type string;
+      }	
+	  leaf sgos-grade {
+		type string;
+      }	
+	  leaf bum-rate {
+		type string;
+      }	
+      leaf uni-circuit-id {
+      	type string;
+      }
+    } // ase-evc container
+
+} // module ase-network 
+
diff --git a/sli/common/src/main/yang/ase-type.yang b/sli/common/src/main/yang/ase-type.yang
new file mode 100755
index 00000000..2de186e6
--- /dev/null
+++ b/sli/common/src/main/yang/ase-type.yang
@@ -0,0 +1,561 @@
+module ase-type {
+
+  namespace "att:ase:type";
+  prefix ase-type;
+
+  organization "AT&T ASE";
+
+  revision 2014-06-09 {
+    description
+      "Initial version";
+  }
+  
+  /////////////////////////////////////////////////////
+  // ASE Service Model Typedefs & Groupings
+  /////////////////////////////////////////////////////
+
+  typedef query-type {
+    type enumeration {
+      enum getDevicePortDetails{
+	value 0;
+      }
+      enum GetServiceDetailsRequest{
+	value 1;
+      }
+    }
+  }
+
+  typedef uni-action-type {   
+    type enumeration {
+      enum PortPreReserveRequest{
+	value 0;
+      }
+      enum PortReleaseRequest{
+	value 1;
+      }
+      enum PortDeProvRequest{
+	value 2;
+      }
+      enum ChangePortProvRequest{
+	value 3;
+      }
+      enum PortActivateRequest{
+	value 4;
+      }
+      enum ChangePortActivateRequest{
+	value 5;
+      }
+      enum DisconnectPortRequest{
+	value 6;
+      }
+      enum getDevicePortDetails{
+	value 7;
+      }
+    }
+  }
+
+  typedef evc-action-type {   
+    type enumeration {
+      enum ConnectionProvRequest{
+	value 0;
+      }
+      enum ChangeConnectionProvRequest{
+	value 1;
+      }
+      enum ConnectionDeProvrequest{
+	value 2;
+      }
+      enum ConnectionActivateRequest{
+	value 3;
+      }
+      enum ChangeConnectionActivateRequest{
+	value 4;
+      }
+      enum DisconnectConnectionRequest{
+	value 5;
+      }
+      enum GetServiceDetailsRequest{
+	value 6;
+      }
+    }
+  }
+  
+  typedef evc-gos-type {
+    type enumeration {
+      enum "REAL-TIME"{
+	value 0;
+      }
+      enum "INTERACTIVE"{
+	value 1;
+      }
+      enum "BUSINESS-CRITICAL-HIGH"{
+	value 2;
+      }
+      enum "BUSINESS-CRITICAL-MEDIUM"{
+	value 3;
+      }
+      enum "NON-CRITICAL-HIGH"{
+	value 4;
+      }
+      enum "NON-CRITICAL-LOW"{
+	value 5;
+      }
+    }
+  }
+
+  typedef cir-rate-type {
+    type enumeration {
+      enum "Mbps"{
+	value 0;
+      }
+      enum "Gbps"{
+	value 1;
+      }
+    }
+  } 
+  
+  typedef ase-yes-no-type {
+    type enumeration {
+      enum "Y"{
+	value 0;
+      }
+      enum "N"{
+	value 1;
+      }
+    }
+  }
+  
+  typedef provisioning-indicator {
+     type enumeration {
+      enum "Y"{
+	value 0;
+      }
+      enum "N"{
+	value 1;
+      }
+    }
+  }
+
+  typedef media-type {
+    type enumeration {
+      enum "SFP-1GE-SX"{
+	value 0;
+      }
+      enum "SFP-1GE-LX"{
+	value 1;
+      }
+      enum "SFP-1GE"{
+	value 2;
+      }
+      enum "Ethernet-10_100_1000M"{
+	value 3;
+      }
+    }
+  }
+
+  typedef media-speed-type {
+    type enumeration {
+      enum "100"{
+	value 0;
+      }
+      enum "1000"{
+	value 1;
+      }
+      enum "10000"{
+	value 2;
+      }
+    }
+  }
+
+  typedef cos-category-type {
+    type enumeration {
+      enum "GOS"{
+	value 0;
+      }
+      enum "PPCOS"{
+	value 1;
+      }
+    }
+  }
+
+  typedef uni-gos-type {
+    type enumeration {
+      enum "INTERACTIVE"{
+	value 0;
+      }
+      enum "BUSINESS-CRITICAL-HIGH"{
+	value 1;
+      }
+      enum "BUSINESS-CRITICAL-MEDIUM"{
+	value 2;
+      }
+      enum "NON-CRITICAL-HIGH"{
+	value 3;
+      }
+    }
+  }
+
+  typedef uni-cir-value-type {
+    type enumeration {
+      enum "2"{
+	value 0;
+      }
+      enum "4"{
+	value 1;
+      }
+      enum "5"{
+	value 2;
+      }
+      enum "8"{
+	value 3;
+      }
+      enum "10"{
+	value 4;
+      }
+      enum "20"{
+	value 5;
+      }
+      enum "30"{
+	value 6;
+      }
+      enum "40"{
+	value 7;
+      }
+      enum "50"{
+	value 8;
+      }
+      enum "60"{
+	value 9;
+      }
+      enum "70"{
+	value 10;
+      }
+      enum "80"{
+	value 11;
+      }
+      enum "90"{
+	value 12;
+      }
+      enum "100"{
+	value 13;
+      }
+      enum "125"{
+	value 14;
+      }
+      enum "150"{
+	value 15;
+      }
+      enum "175"{
+	value 16;
+      }
+      enum "200"{
+	value 17;
+      }
+      enum "225"{
+	value 18;
+      }
+      enum "250"{
+	value 19;
+      }
+    }
+  }
+
+  typedef uni-mac-limit-type {
+    description "MAC address limit for UNI port";
+    type enumeration {
+      enum "Y"{
+	value 0;
+      }
+      enum "N"{
+	value 1;
+      }
+    } 
+  }
+
+  typedef port-tagging-type {
+    type enumeration {
+      enum "port-based"{
+	value 0;
+      }
+      enum "vlan-based"{
+	value 1;
+      }
+    }
+  }
+  
+  typedef port-status {
+    type enumeration {
+      enum "Available"{
+	value 0;
+      }
+      enum "Reserved"{
+	value 1;
+      }
+      enum "Active" {
+      	value 2;
+      }
+    }
+  }
+
+  grouping uni-common-request-hdr {        
+    leaf request-id {
+      type string;
+      mandatory true;
+    }
+    leaf source {
+      description "The source system requesting action or info";
+      type string;
+      mandatory true;
+    }
+    leaf request-action {
+      description "action indicator for this service instance";
+      type uni-action-type;
+    }
+    leaf undo-indicator {
+      type provisioning-indicator;
+    }  
+    leaf notification-url {
+      description "When this field exists, NCS will return an "
+	+ "acknowledgement that the request is legal "
+	+ "Once the activate is finished (or fails) NCS"
+	+ "will utilize the URL to indicate the status";
+      type string;
+    }
+  }
+  
+  grouping uni-common-return-hdr {
+    leaf request-action {
+      description "action indicator for this service instance";
+      type uni-action-type;
+    } 
+    leaf request-id {
+      description "Identifier for the request from NGO";
+      type string;
+      
+    } 
+  }
+
+  grouping uni-common-error-format {
+    leaf error-code {
+      description "Error code";
+      type int32;
+    }
+    leaf error-message {
+      description "Error text describing the API error occurance";
+      type string;
+    }
+  }
+
+  grouping query-common-hdr {
+    leaf request-id {
+      description "Identifier for the request from NGO";
+      type string;    
+    }
+    leaf request-type {
+      description "action indicator for this service instance";
+      type query-type;
+    }
+  }
+
+  grouping query-error-format {
+    leaf error-code {
+      description "Error code";
+      type int32;
+    }
+    leaf error-message {
+      description "Error text describing the API error occurance";
+      type string;
+    }
+  }
+
+  grouping evc-common-request-hdr {
+    leaf request-id {
+      description "Identifier for the request from NGO";
+      type string;
+    }
+    leaf source {
+      description "The source system requesting action or info";
+      type string;
+      mandatory true;
+    }
+    leaf uni-order-number {
+      type string;
+    }
+    leaf request-action {
+      description "action indicator for this service instance";
+      type evc-action-type;
+      mandatory true;
+    }
+    leaf undo-indicator {
+      type provisioning-indicator;
+    }  
+    leaf notification-url {
+      description "When this field exists, NCS will return an "
+	+ "acknowledgement that the request is legal "
+	+ "Once the activate is finished (or fails) NCS"
+	+ "will utilize the URL to indicate the status";
+      type string;
+    }
+    leaf evc-name {
+      type string;
+      mandatory true;
+    }
+  }
+   
+  grouping evc-common-error-format {
+    leaf error-code {
+      description "Error code";
+      type int32;
+    }
+    leaf error-message {
+      description "Error text describing the API error occurance";
+      type string;
+    }
+  }
+
+  /////////////////////////////////////////
+  // UNI-PORTS table contains all circuits
+  /////////////////////////////////////////
+  container uni-ports {
+    description
+      "UNI port container";
+    list uni-port {
+      key "uni-circuit-id";
+      leaf uni-circuit-id {
+	type string;
+	mandatory true;
+      }
+      leaf subscriber-name {
+	type string;
+	mandatory true;
+      }
+      leaf uni-order-number {
+	type string;
+	mandatory true;
+      }
+      leaf edge-device-clli {
+	description "Edge device (e.g. EMT) on which port " 
+	  + " reservation is needed";
+	type string;
+	mandatory true;
+      }
+      leaf uni-location-city {
+	type string;
+	mandatory true;
+      }
+      leaf uni-location-state {
+	type string;
+	mandatory true;
+      }
+      leaf media-type {
+	type media-type;
+	mandatory true;
+      }
+      leaf media-speed {
+	type media-speed-type;
+	mandatory true;
+      }
+      leaf uni-cir-value {
+	description "Integer value for the CIR";
+	type uni-cir-value-type;
+	mandatory true;
+      }
+      leaf uni-cir-units {
+	description "Units for the CIR";
+	type cir-rate-type;
+	mandatory true;
+      }
+      leaf cos-category {
+	description "CoS Type";
+	type cos-category-type;
+	mandatory true;   
+      }
+      leaf gos-profile {
+	description "GoS tpye";
+	type uni-gos-type;
+	mandatory true;
+      } 
+      leaf aditional-mac-allowed {
+	type uni-mac-limit-type;
+      }
+      leaf port-tagging {
+	type port-tagging-type;
+	mandatory true;
+      }
+      leaf port-status {
+	type port-status;
+      }
+      leaf name-value-pair {
+	type string;
+      }  
+    }
+  }
+
+  ///////////////////////////////////////////
+  // EVCS table contains all evc associations
+  ///////////////////////////////////////////
+  container evcs {
+    list evc {
+      key "evc-name";
+      leaf evc-name {
+	type string;
+	mandatory true;
+      }
+      leaf topology {
+	type enumeration {
+	  enum "MultiPoint"{
+	    value 0;
+	  }
+	  enum "PointToPoint"{
+	    value 1;
+	  }
+	}
+      }
+      list evc-leg {
+	key evc-access-name;
+	leaf evc-access-name {
+	  type string;    
+	}
+	leaf subscriber-name {
+	  type string;
+	}
+	leaf cvlan {
+	  type uint16 {
+	    range "2..4090";
+	  }
+	}
+	leaf connection-cir-value {
+	  type uni-cir-value-type;
+	}
+	leaf connection-cir-units-string {
+	  type cir-rate-type;
+	}
+	leaf connection-gos-profile {
+	  type evc-gos-type;
+	}
+	leaf connection-additional-mac-allowed {
+	  type uni-mac-limit-type;
+	}
+	leaf connection-emc-indicator {
+	  type enumeration {
+	    enum "Y"{
+	      value 0;
+	    }
+	    enum "N"{
+	      value 1;
+	    }
+	  } 
+	}
+	leaf connection-emc-speed-value {
+	  type uni-cir-value-type;
+	}
+	leaf connection-emc-speed-units-string {
+	  type cir-rate-type;
+	}
+      }
+      leaf name-value-pair {
+	type string;
+      } 
+    }   
+  }
+}
diff --git a/sli/common/src/main/yang/ase.yang b/sli/common/src/main/yang/ase.yang
new file mode 100755
index 00000000..0b36a561
--- /dev/null
+++ b/sli/common/src/main/yang/ase.yang
@@ -0,0 +1,558 @@
+module ase {
+
+  namespace "att:ase";
+  prefix ase;
+
+  import ase-type {prefix ase-type; revision-date "2014-06-09";}
+
+  organization "AT&T ASE";
+
+  description
+    "This submodule contains a collection of YANG definitions for
+     defining the ASE service model(s) for UNI and EVC";
+
+  revision 2014-03-27 {
+    description 
+      "Additional detail for UNI and EVC API";
+  }
+  revision 2014-03-18 {
+    description
+      "Initial version";
+  }
+
+
+  /////////////////////////////////////////////////////
+  // ASE Query Actions
+  /////////////////////////////////////////////////////
+  
+  ////
+  // Port Reserve Request
+  ////
+  rpc ase-port-reserve {
+    input {
+      uses ase-type:uni-common-request-hdr;
+
+      leaf uni-circuit-id {
+	type string; 
+	mandatory true;
+      }
+      leaf edge-device-clli {
+	description "Edge device (e.g. EMT) on which port " 
+	  + " reservation is needed";
+	type string;
+	mandatory true;
+      }
+      leaf uni-cir-value {
+	description "Integer value for the CIR";
+	type ase-type:uni-cir-value-type;
+	mandatory true;
+      }
+      leaf uni-cir-units {
+	description "Units for the CIR";
+	type ase-type:cir-rate-type;
+	mandatory true;
+      }
+    }
+    output {
+      uses ase-type:uni-common-request-hdr;
+
+      leaf uni-circuit-id {
+	type string; 
+      }
+      leaf uni-port-id {
+	description "Allocated UNI port id";
+	type string;
+      }
+
+      uses ase-type:uni-common-error-format;
+    }
+  }
+
+  ////
+  // Release Port Request
+  ////
+  rpc ase-release-port-request {
+    input {
+      uses ase-type:uni-common-request-hdr;
+
+      leaf uni-circuit-id {
+	type string; 
+	mandatory true;
+      }
+    }
+    output {
+      uses ase-type:uni-common-return-hdr;
+      uses ase-type:uni-common-error-format;
+    }
+  }
+
+  ////
+  // Port Provisioning Request
+  ////
+  rpc ase-port-prov-request {
+    input {
+      uses ase-type:uni-common-request-hdr;
+
+      leaf uni-circuit-id {
+	type string;
+	mandatory true;
+      }
+      leaf subscriber-name {
+	type string;
+	mandatory true;
+      }
+      leaf uni-order-number {
+	type string;
+	mandatory true;
+      }
+      leaf edge-device-clli {
+	description "Edge device (e.g. EMT) on which port " 
+	  + " reservation is needed";
+	type string;
+	mandatory true;
+      }
+      leaf uni-location-city {
+	type string;
+	mandatory true;
+      }
+      leaf uni-location-state {
+	type string;
+	mandatory true;
+      }
+      leaf media-type {
+	type ase-type:media-type;
+	mandatory true;
+      }
+      leaf media-speed {
+	type ase-type:media-speed-type;
+	mandatory true;
+      }
+      leaf uni-cir-value {
+	description "Integer value for the CIR";
+	type ase-type:uni-cir-value-type;
+	mandatory true;
+      }
+      leaf uni-cir-units {
+	description "Units for the CIR";
+	type ase-type:cir-rate-type;
+	mandatory true;
+      }
+      leaf cos-category {
+	description "CoS Type";
+	type ase-type:cos-category-type;
+	mandatory true;   
+      }
+      leaf gos-profile {
+	description "GoS tpye";
+	type ase-type:uni-gos-type;
+	mandatory true;
+      } 
+      leaf aditional-mac-allowed {
+	type ase-type:uni-mac-limit-type;
+      }
+      leaf port-tagging {
+	type ase-type:port-tagging-type;
+	mandatory true;
+      }
+      leaf name-value-pair {
+	type string;
+      }  
+    }
+    output {
+      uses ase-type:uni-common-return-hdr;  
+      uses ase-type:uni-common-error-format;
+    }
+  }
+
+  ////
+  // Deprovisioning Port Request
+  ////
+  rpc ase-deprov-port-request {
+    input {
+      uses ase-type:uni-common-request-hdr;
+
+      leaf uni-circuit-id {
+	type string;
+	mandatory true;
+      }
+    }
+    output {
+      uses ase-type:uni-common-error-format;
+    }
+  }
+
+  ////
+  // Change Port Provisioning Request
+  ////
+  rpc ase-change-port-prov-request {
+    input {
+      uses ase-type:uni-common-request-hdr;
+
+      leaf uni-circuit-id {
+	type string;
+	mandatory true;
+      }
+      leaf subscriber-name {
+	type string;
+      } 
+      leaf media-speed {
+	type ase-type:media-speed-type;
+      }
+      leaf uni-cir-value {
+	description "Integer value for the CIR";
+	type ase-type:uni-cir-value-type;
+      }
+      leaf uni-cir-units {
+	description "Units for the CIR";
+	type ase-type:cir-rate-type;
+      }
+      leaf cos-catagory {
+	type ase-type:cos-category-type;
+      } 
+      leaf gos-profile {
+	type ase-type:uni-gos-type;
+      }
+      leaf additional-mac-allowed {
+	type ase-type:uni-mac-limit-type;
+      }
+      leaf port-tagging {
+	type ase-type:port-tagging-type;
+	mandatory true;
+      }
+      leaf name-value-pair {
+	type string;
+      }  
+    }
+    output {
+      uses ase-type:uni-common-error-format;
+    }
+  }
+
+  ////
+  // Port Activate Request
+  ////
+  rpc ase-port-activate-request {
+    input {
+      uses ase-type:uni-common-request-hdr;
+
+      leaf uni-circuit-id {
+	type string;
+	mandatory true;
+      }
+    }
+    output {
+      uses ase-type:uni-common-error-format;
+    }
+  }
+    
+  ////
+  // Port Change Activation Request
+  ////
+  rpc ase-change-port-activation-request {
+    input {
+      uses ase-type:uni-common-request-hdr;
+
+      leaf uni-circuit-id {
+	type string;
+	mandatory true;
+      }          
+    }
+    output {
+      uses ase-type:uni-common-error-format;
+    }
+  }    
+    
+  ////
+  // Port Disconnect Request
+  ////
+  rpc ase-port-disconnect-request {
+    input {
+      uses ase-type:uni-common-request-hdr;
+
+      leaf uni-circuit-id {
+	type string;
+	mandatory true;
+      }    
+    }
+    output {
+      uses ase-type:uni-common-error-format;
+    }
+  }
+
+  /////////////////////////////////////////////////////
+  // EVC API
+  /////////////////////////////////////////////////////
+
+  ////
+  // EVC Provision Request
+  ////
+  rpc ase-evc-activation {
+    input {
+      uses ase-type:evc-common-request-hdr;
+      leaf topology {
+	type enumeration {
+	  enum "MultiPoint"{
+	    value 0;
+	  }
+	  enum "PointToPoint"{
+	    value 1;
+	  }
+	}
+      }
+      list evc-leg {
+	key evc-access-name;
+	leaf evc-access-name {
+	  type string;    
+	}
+	leaf subscriber-name {
+	  type string;
+	}
+	leaf cvlan {
+	  type uint16 {
+	    range "2..4090";
+	  }
+	}
+	leaf connection-cir-value {
+	  type ase-type:uni-cir-value-type;
+	}
+	leaf connection-cir-units-string {
+	  type ase-type:cir-rate-type;
+	}
+	leaf connection-gos-profile {
+	  type ase-type:evc-gos-type;
+	}
+	leaf connection-additional-mac-allowed {
+	  type ase-type:uni-mac-limit-type;
+	}
+	leaf connection-emc-indicator {
+	  type enumeration {
+	    enum "Y"{
+	      value 0;
+	    }
+	    enum "N"{
+	      value 1;
+	    }
+	  } 
+	}
+	leaf connection-emc-speed-value {
+	  type ase-type:uni-cir-value-type;
+	}
+	leaf connection-emc-speed-units-string {
+	  type ase-type:cir-rate-type;
+	}
+      }
+      leaf name-value-pair {
+	type string;
+      }
+    }
+    output {
+      uses ase-type:evc-common-error-format;
+    }
+  }
+    
+  ////
+  // EVC Change Activation Request
+  ////
+  rpc ase-evc-change-activation {
+    input {
+      uses ase-type:evc-common-request-hdr;
+      leaf topology {
+	type enumeration {
+	  enum "MultiPoint"{
+	    value 0;
+	  }
+	  enum "PointToPoint"{
+	    value 1;
+	  }
+	}
+      }
+      list evc-leg {
+	key evc-access-name;
+	leaf evc-access-name {
+	  type string;    
+	}
+	leaf connection-cir-value {
+	  type ase-type:uni-cir-value-type;
+	}
+	leaf connection-cir-units-string {
+	  type ase-type:cir-rate-type;
+	}
+	leaf connection-gos-profile {
+	  type ase-type:evc-gos-type;
+	}
+	leaf connection-additional-mac-allowed {
+	  type ase-type:uni-mac-limit-type;
+	}
+          
+      }
+      leaf name-value-pair {
+	type string;
+      }
+        
+    }
+    output {
+      uses ase-type:evc-common-error-format;
+    }
+  }
+    
+  ////
+  // EVC Disconnet Connection Request
+  ////
+  rpc ase-evc-disconnect-request {
+    input {
+      uses ase-type:evc-common-request-hdr;
+      leaf topology {
+	type enumeration {
+	  enum "MultiPoint"{
+	    value 0;
+	  }
+	  enum "PointToPoint"{
+	    value 1;
+	  }
+	}
+      }
+      list evc-leg {
+	key evc-access-name;
+	leaf evc-access-name {
+	  type string;    
+	}          
+      }
+      leaf name-value-pair {
+	type string;
+      }
+        
+    }
+    output {
+      uses ase-type:evc-common-error-format;
+    }
+  }
+
+  /////////////////////////////////////////////////////
+  // ASE Query Actions
+  /////////////////////////////////////////////////////
+
+  rpc find-available-ports {
+    description "Return a count of available ports";
+    input {
+      uses ase-type:query-common-hdr;
+      leaf edge-device-clli {
+	type string;
+	mandatory true;
+      }
+          
+      leaf port-role {
+	type enumeration {
+	  enum "NETWORK"{
+	    value 0;
+	  }
+	  enum "ACCESS"{
+	    value 1;
+	  }
+	  enum "SDN-ACCESS"{
+	    value 2;
+	  }
+	}
+	mandatory true;
+      }
+      leaf port-assigned {
+	type string;
+      }
+    }
+    output {
+      uses ase-type:query-common-hdr;
+      container statuss {
+	leaf edge-device-clli {
+	  type string;
+	}
+	container max-cir {
+	  leaf cir-value {
+	    type uint16;
+	  }
+	  leaf cir-type {
+	    type ase-type:cir-rate-type;
+	  } 
+	}
+	leaf if-count {
+	  type uint16;
+	}
+      }
+      uses ase-type:query-error-format;
+    }
+  }
+
+  rpc find-evcs-in-uni {
+    description "Return EVC instances for a specified UNI";
+    input {
+      uses ase-type:query-common-hdr;
+
+      leaf uni-circuit-id {
+	type string;  //leafref
+      }
+      leaf edge-device-clli {
+	description "Edge device (e.g. EMT) on which port " 
+	  + " reservation is needed";
+	type string;
+      }
+    }
+    output {
+      uses ase-type:query-common-hdr;
+
+      leaf uni-leg-name {
+	description "NGO-proivded named";
+	type string;
+      }
+      uses ase-type:query-error-format;
+    }
+  }
+
+  rpc find-service-details {
+    description "Return EVC instances for a specified UNI";
+    input {
+      uses ase-type:query-common-hdr;
+      leaf uni-circuit-id {
+	type string;  //leafref
+      }
+      leaf source {
+	type string;
+	mandatory true;
+      }
+      leaf service-name {
+	type string;
+	mandatory true;
+      }
+      leaf service-type {
+	type string;
+	mandatory true;
+      }
+    }
+    output {
+      uses ase-type:query-common-hdr;
+          
+      leaf service-name {
+	type string;
+	mandatory true;
+      }
+      leaf service-type {
+	type string;
+	mandatory true;
+      } 
+      leaf service-state {
+	type enumeration {
+	  enum "Active"{
+	    value 0;
+	  }
+	  enum "NotActive"{
+	    value 1;
+	  }
+	}
+      }
+      leaf has-pending-change {
+	type ase-type:ase-yes-no-type;
+      } 
+      leaf allowed-connection-count {
+	type int16;
+      }
+      uses ase-type:query-error-format;
+    }
+  }
+} //module
diff --git a/sli/common/src/test/java/org/openecomp/sdnc/sli/SvcLogicContextTest.java b/sli/common/src/test/java/org/openecomp/sdnc/sli/SvcLogicContextTest.java
new file mode 100644
index 00000000..6e6656e8
--- /dev/null
+++ b/sli/common/src/test/java/org/openecomp/sdnc/sli/SvcLogicContextTest.java
@@ -0,0 +1,69 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdnc.sli;
+
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.Enumeration;
+import java.util.Properties;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+
+import org.openecomp.sdnc.sli.SvcLogicContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+
+import junit.framework.TestCase;
+
+public class SvcLogicContextTest extends TestCase {
+	private static final Logger LOG = LoggerFactory
+			.getLogger(SvcLogicContext.class);
+	
+	public void testMerge() {
+		
+		try {
+			InputStream testStr = getClass().getResourceAsStream("/mergetest.xml");
+			DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+			DocumentBuilder db = dbf.newDocumentBuilder();
+
+			Document theDocument = db.parse(testStr);
+			SvcLogicContext ctx = new SvcLogicContext();
+			ctx.mergeDocument("test-merge", theDocument);
+			Properties props = ctx.toProperties();
+			LOG.info("SvcLogicContext contains the following : ");
+			for (Enumeration e = props.propertyNames(); e.hasMoreElements() ; ) {
+				String propName = (String) e.nextElement();
+				LOG.info(propName+" = "+props.getProperty(propName));
+				
+			}
+		} catch (Exception e) {
+			LOG.error("Caught exception trying to merge", e);
+			fail("Caught exception trying to merge");
+		}
+		
+	}
+
+}
diff --git a/sli/common/src/test/java/org/openecomp/sdnc/sli/SvcLogicExpressionParserTest.java b/sli/common/src/test/java/org/openecomp/sdnc/sli/SvcLogicExpressionParserTest.java
new file mode 100644
index 00000000..d6503b60
--- /dev/null
+++ b/sli/common/src/test/java/org/openecomp/sdnc/sli/SvcLogicExpressionParserTest.java
@@ -0,0 +1,69 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdnc.sli;
+
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+
+import org.openecomp.sdnc.sli.SvcLogicExprListener;
+import org.openecomp.sdnc.sli.SvcLogicExpression;
+import org.openecomp.sdnc.sli.SvcLogicExpressionFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import junit.framework.TestCase;
+
+public class SvcLogicExpressionParserTest extends TestCase {
+
+	private static final Logger LOG = LoggerFactory
+			.getLogger(SvcLogicExprListener.class);
+	
+	public void testParse() {
+		try
+		{
+			InputStream testStr = getClass().getResourceAsStream("/expression.tests");
+			BufferedReader testsReader = new BufferedReader(new InputStreamReader(testStr));
+			
+			String testExpr = null;
+			while ((testExpr = testsReader.readLine()) != null) {
+				
+				SvcLogicExpression parsedExpr = SvcLogicExpressionFactory.parse(testExpr);
+				if (parsedExpr == null)
+				{
+					fail("parse("+testExpr+") returned null");
+				}
+				else
+				{
+					LOG.info("test expression = ["+testExpr+"] ; parsed expression = ["+parsedExpr.asParsedExpr()+"]");
+					
+				}
+			}
+		}
+		catch (Exception e)
+		{
+			e.printStackTrace();
+			fail("Caught exception processing test cases");
+		}
+	}
+
+}
diff --git a/sli/common/src/test/java/org/openecomp/sdnc/sli/SvcLogicParserTest.java b/sli/common/src/test/java/org/openecomp/sdnc/sli/SvcLogicParserTest.java
new file mode 100644
index 00000000..e8ff2fee
--- /dev/null
+++ b/sli/common/src/test/java/org/openecomp/sdnc/sli/SvcLogicParserTest.java
@@ -0,0 +1,163 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+/**
+ * 
+ */
+package org.openecomp.sdnc.sli;
+
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.util.LinkedList;
+
+import org.openecomp.sdnc.sli.SvcLogicParser;
+import org.openecomp.sdnc.sli.SvcLogicParserException;
+import org.openecomp.sdnc.sli.SvcLogicStore;
+import org.openecomp.sdnc.sli.SvcLogicStoreFactory;
+
+import junit.framework.TestCase;
+
+/**
+ * @author dt5972
+ *
+ */
+public class SvcLogicParserTest extends TestCase {
+
+	/**
+	 * Test method for {@link org.openecomp.sdnc.sli.SvcLogicParser#parse(java.lang.String)}.
+	 */
+	
+	
+	public void testParse() {
+
+		
+		try
+		{
+
+			URL propUrl = getClass().getResource("/svclogic.properties");
+			
+			InputStream propStr = getClass().getResourceAsStream("/svclogic.properties");
+			
+			SvcLogicStore store = SvcLogicStoreFactory.getSvcLogicStore(propStr);
+			
+			assertNotNull(store);
+			
+			store.registerNodeType("switch");
+			store.registerNodeType("block");
+			store.registerNodeType("get-resource");
+			store.registerNodeType("reserve");
+			store.registerNodeType("is-available");
+			store.registerNodeType("exists");
+			store.registerNodeType("configure");
+			store.registerNodeType("return");
+			store.registerNodeType("record");
+			store.registerNodeType("allocate");
+			store.registerNodeType("release");
+			store.registerNodeType("for");
+			store.registerNodeType("set");
+			
+			
+			InputStream testStr = getClass().getResourceAsStream("/parser-good.tests");
+			BufferedReader testsReader = new BufferedReader(new InputStreamReader(testStr));
+			String testCaseFile = null;
+			while ((testCaseFile = testsReader.readLine()) != null) {
+				
+				testCaseFile = testCaseFile.trim();
+				
+				if (testCaseFile.length() > 0)
+				{
+					if (!testCaseFile.startsWith("/"))
+					{
+						testCaseFile = "/"+testCaseFile;
+					}
+					URL testCaseUrl = getClass().getResource(testCaseFile);
+					if (testCaseUrl == null)
+					{
+						fail("Could not resolve test case file "+testCaseFile);
+					}
+
+					try {
+						SvcLogicParser.validate(testCaseUrl.getPath(), store);
+					} catch (Exception e) {
+						fail("Validation failure ["+e.getMessage()+"]");
+						
+					}
+
+					
+					
+					
+
+				}
+			}
+			
+			testStr = getClass().getResourceAsStream("/parser-bad.tests");
+			testsReader = new BufferedReader(new InputStreamReader(testStr));
+			testCaseFile = null;
+			while ((testCaseFile = testsReader.readLine()) != null) {
+				
+				testCaseFile = testCaseFile.trim();
+				
+				if (testCaseFile.length() > 0)
+				{
+					if (!testCaseFile.startsWith("/"))
+					{
+						testCaseFile = "/"+testCaseFile;
+					}
+					URL testCaseUrl = getClass().getResource(testCaseFile);
+					if (testCaseUrl == null)
+					{
+						fail("Could not resolve test case file "+testCaseFile);
+					}
+
+					boolean valid = true;
+					try {
+						SvcLogicParser.load(testCaseUrl.getPath(), store);
+					} catch (Exception e) {
+						System.out.println(e.getMessage());
+						valid = false;
+					}
+
+					if (valid) {
+						fail("Expected compiler error on "+testCaseFile+", but got success");
+					}
+					
+
+				}
+			}
+		}
+		catch (SvcLogicParserException e)
+		{
+			fail("Parser error : "+e.getMessage());
+		}
+		catch (Exception e)
+		{
+			e.printStackTrace();
+			fail("Caught exception processing test cases");
+		}
+		
+		
+	}
+	
+	
+
+}
diff --git a/sli/common/src/test/resources/EvcActivateSvcLogic_v100.xml b/sli/common/src/test/resources/EvcActivateSvcLogic_v100.xml
new file mode 100644
index 00000000..097078a8
--- /dev/null
+++ b/sli/common/src/test/resources/EvcActivateSvcLogic_v100.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ============LICENSE_START=======================================================
+  openECOMP : SDN-C
+  ================================================================================
+  Copyright (C) 2017 AT&T Intellectual Property. All rights
+  						reserved.
+  ================================================================================
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  ============LICENSE_END=========================================================
+  -->
+
+
+<service-logic xmlns="http://www.openecomp.org/sdnc/svclogic"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd"
+    module="ase" version="1.0.0">
+
+
+    <method rpc="ase-evc-activation" mode="sync">
+        <configure adaptor="org.openecomp.sdnc.sli.adaptor.emt.EmtAdaptor"
+            key="$evc-name" activate="true">
+            <parameter name="circuit.name" value="$evc-name" />
+            <parameter name="topology" value="$topology" />
+            <parameter name="leg1.uniCircuitId" value="$evc-leg[0].evc-access-name" />
+            <parameter name="leg2.uniCircuitId" value="$evc-leg[1].evc-access-name" />
+            <outcome value="success">
+                <return status="success" />
+            </outcome>
+            <outcome value="already-active">
+                <return status="failure">
+                    <parameter name="error-code" value="1590" />
+                    <parameter name="error-message" value="`Circuit already active`" />
+                </return>
+            </outcome>
+            <outcome value="Other">
+                <return status="failure">
+                    <parameter name="error-code" value="1542" />
+                    <parameter name="error-message" value="Activation failure" />
+                </return>
+            </outcome>
+        </configure>
+    </method>
+
+    <method rpc="ase-evc-disconnect-request" mode="sync">
+        <configure adaptor="org.openecomp.sdnc.sli.adaptor.emt.EmtAdaptor"
+            key="$evc-name" activate="false">
+            <outcome value="success">
+                <return status="success" />
+            </outcome>
+
+            <outcome value="Other">
+                <return status="failure">
+                    <parameter name="error-code" value="1542" />
+                    <parameter name="error-message" value="De-activation failure" />
+                </return>
+            </outcome>
+        </configure>
+    </method>
+
+
+</service-logic>
diff --git a/sli/common/src/test/resources/EvcPortSvcLogic_v100.xml b/sli/common/src/test/resources/EvcPortSvcLogic_v100.xml
new file mode 100644
index 00000000..08084420
--- /dev/null
+++ b/sli/common/src/test/resources/EvcPortSvcLogic_v100.xml
@@ -0,0 +1,263 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ============LICENSE_START=======================================================
+  openECOMP : SDN-C
+  ================================================================================
+  Copyright (C) 2017 AT&T Intellectual Property. All rights
+  						reserved.
+  ================================================================================
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  ============LICENSE_END=========================================================
+  -->
+
+
+<service-logic xmlns="http://www.openecomp.org/sdnc/svclogic"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd"
+    module="ase" version="1.0.0">
+
+    <!-- Reserve a port. Returns uni-circuit-id of reserved ase-port -->
+    <method rpc="ase-port-reserve" mode="sync">
+        <switch test="$uni-cir-units">
+            <outcome value="Mbps">
+                <reserve plugin="org.openecomp.sdnc.sli.resource.sample.SampleResource"
+                    resource="ase-port"
+                    key="resource-emt-clli == $edge-device-clli and speed >= $uni-cir-value"
+                    pfx="asePort">
+
+
+                    <outcome value="success">
+                        <block>
+                            <record plugin="org.openecomp.sdnc.sli.recording.FileRecorder">
+                                <parameter name="file" value="/tmp/sample_r1.log" />
+                                <parameter name="field1" value="__TIMESTAMP__"/>
+                                <parameter name="field2" value="RESERVED"/>
+                                <parameter name="field3" value="$asePort.uni_circuit_id"/>
+                            </record>
+                            <return status="success">
+                                <parameter name="uni-circuit-id" value="$asePort.uni_circuit_id" />
+                            </return>
+                        </block>
+
+                    </outcome>
+
+                    <outcome value="not-found">
+                        <return status="failure">
+                            <parameter name="error-code" value="1010" />
+                            <parameter name="error-message" value="No ports found that match criteria" />
+                        </return>
+                    </outcome>
+
+                    <outcome value="Other">
+                        <return status="failure">
+                            <parameter name="error-code" value="1010" />
+                            <parameter name="error-message"
+                                value="Error encountered trying to reserve port" />
+                        </return>
+                    </outcome>
+
+                </reserve>
+            </outcome>
+            <outcome value="Gbps">
+                <reserve plugin="org.openecomp.sdnc.sli.resource.sample.SampleResource"
+                    resource="ase-port"
+                    key="resource-emt-clli == $edge-device-clli and speed >= 1000 * $uni-cir-value"
+                    pfx="asePort">
+
+
+                    <outcome value="success">
+                        <block>
+                            <record plugin="org.openecomp.sdnc.sli.recording.FileRecorder">
+                                <parameter name="file" value="/tmp/sample_r1.log" />
+                                <parameter name="field1" value="__TIMESTAMP__"/>
+                                <parameter name="field2" value="RESERVED"/>
+                                <parameter name="field3" value="$asePort.uni_circuit_id"/>
+                            </record>
+                            <return status="success">
+                                <parameter name="uni-circuit-id" value="$asePort.uni_circuit_id" />
+                            </return>
+                        </block>
+                    </outcome>
+
+                    <outcome value="not-found">
+                        <return status="failure">
+                            <parameter name="error-code" value="1010" />
+                            <parameter name="error-message" value="No ports found that match criteria" />
+                        </return>
+                    </outcome>
+                    <outcome value="">
+                        <return status="failure">
+                            <parameter name="error-code" value="1012" />
+                            <parameter name="error-message"
+                                value="Error encountered trying to reserve port" />
+                        </return>
+                    </outcome>
+                    <outcome value="Other">
+                        <return status="failure">
+                            <parameter name="error-code" value="1010" />
+                            <parameter name="error-message"
+                                value="Error encountered trying to reserve port" />
+                        </return>
+                    </outcome>
+                </reserve>
+            </outcome>
+        </switch>
+    </method>
+
+    <!-- One step provisioning/activation command. Allocates a local resource,
+        then configures it on device -->
+    <method rpc="ase-port-activate-request" mode="sync">
+
+        <allocate plugin="org.openecomp.sdnc.sli.resource.sample.SampleResource"
+            resource="ase-port" key="uni-circuit-id == $uni-circuit-id" pfx="asePort">
+
+            <outcome value="success">
+                <configure adaptor="org.openecomp.sdnc.sli.adaptor.emt.EmtAdaptor"
+                    key="$uni-circuit-id" activate="true">
+                    <parameter name="circuit.id" value="$uni-circuit-id" />
+                    <parameter name="subscriber.name" value="$subscriber-name" />
+                    <parameter name="emt.clli" value="$edge-device-clli" />
+                    <parameter name="port.tagging" value="$port-tagging" />
+                    <parameter name="port.mediaSpeed" value="$media-speed" />
+                    <parameter name="location.state" value="$uni-location-state" />
+                    <parameter name="location.city" value="$uni-location-city" />
+                    <parameter name="cosCategory" value="$cos-category" />
+                    <parameter name="gosProfile" value="$gos-profile" />
+                    <parameter name="lldp" value="$asePort.resource-lldp" />
+                    <parameter name="mtu" value="$asePort.resource-mtu" />
+                    <outcome value="success">
+                        <block>
+                            <record plugin="org.openecomp.sdnc.sli.recording.FileRecorder">
+                                <parameter name="file" value="/tmp/sample_r1.log" />
+                                <parameter name="field1" value="__TIMESTAMP__"/>
+                                <parameter name="field2" value="ACTIVE"/>
+                                <parameter name="field3" value="$uni-circuit-id"/>
+                            </record>
+                            <return status="success">
+                                <parameter name="edge-device-clli" value="$asePort.resource-emt-clli" />
+                            </return>
+                        </block>
+
+                    </outcome>
+                    <outcome value="already-active">
+                        <return status="failure">
+                            <parameter name="error-code" value="1590" />
+                            <parameter name="error-message" value="Port already active" />
+                        </return>
+                    </outcome>
+                    <outcome value="Other">
+                        <return status="failure">
+                            <parameter name="error-code" value="1542" />
+                            <parameter name="error-message" value="Activation failure" />
+                        </return>
+                    </outcome>
+                </configure>
+            </outcome>
+
+            <outcome value="not-found">
+
+                <return status="failure">
+                    <parameter name="error-code" value="1220" />
+                    <parameter name="error-message" value="Circuit not found" />
+                </return>
+
+            </outcome>
+
+            <outcome value="Other">
+                <return status="failure">
+                    <parameter name="error-code" value="1230" />
+                    <parameter name="error-message" value="Error occurred trying to find circuit" />
+                </return>
+            </outcome>
+        </allocate>
+    </method>
+
+
+
+    <!-- Change provisioning w/o activation -->
+    <method rpc="ase-change-port-prov-request" mode="sync">
+        <allocate plugin="org.openecomp.sdnc.sli.resource.sample.SampleResource"
+            resource="ase-port" key="uni-circuit-id == $uni-circuit-id" pfx="asePort">
+
+            <outcome value="success">
+                <return status="success">
+                    <parameter name="edge-device-clli" value="$asePort.resource-emt-clli" />
+                </return>
+            </outcome>
+
+            <outcome value="not-found">
+                <return status="failure">
+                    <parameter name="error-code" value="1220" />
+                    <parameter name="error-message" value="Circuit not found" />
+                </return>
+            </outcome>
+
+            <outcome value="Other">
+                <return status="failure">
+                    <parameter name="error-code" value="1230" />
+                    <parameter name="error-message" value="Error occurred trying to find circuit" />
+                </return>
+            </outcome>
+        </allocate>
+    </method>
+
+
+
+
+    <!-- Release port -->
+
+    <method rpc="ase-release-port-request" mode="sync">
+        <exists plugin="org.openecomp.sdnc.sli.resource.sample.SampleResource"
+            resource="ase-evc" key="uni-circuit-id  == $uni-circuit-id">
+
+            <outcome value="true">
+                <return status="failure">
+                    <parameter name="error-code" value="1130" />
+                    <parameter name="error-message"
+                        value="Cannot release port - used in existing EVC" />
+                </return>
+            </outcome>
+            <outcome value="false">
+                <release plugin="org.openecomp.sdnc.sli.resource.sample.SampleResource"
+                    resource="ase-port" key="uni-circuit-id == $uni-circuit-id">
+                    <outcome value="success">
+                        <block>
+                            <record plugin="org.openecomp.sdnc.sli.recording.FileRecorder">
+                                <parameter name="file" value="/tmp/sample_r1.log" />
+                                <parameter name="field1" value="__TIMESTAMP__"/>
+                                <parameter name="field2" value="RELEASED"/>
+                                <parameter name="field3" value="$uni-circuit-id"/>
+                            </record>
+                            <return status="success"/>
+                        </block>
+                    </outcome>
+
+                    <outcome value="not-found">
+                        <return status="failure">
+                            <parameter name="error-code" value="1110" />
+                            <parameter name="error-message" value="No port found for this uni-circuit-id" />
+                        </return>
+                    </outcome>
+
+                    <outcome value="Other">
+                        <return status="failure">
+                            <parameter name="error-code" value="1130" />
+                            <parameter name="error-message"
+                                value="Error encountered trying to release port" />
+                        </return>
+                    </outcome>
+                </release>
+            </outcome>
+        </exists>
+    </method>
+
+</service-logic>
+
diff --git a/sli/common/src/test/resources/ReleasePortSvcLogic_v101.xml b/sli/common/src/test/resources/ReleasePortSvcLogic_v101.xml
new file mode 100644
index 00000000..5a835b7b
--- /dev/null
+++ b/sli/common/src/test/resources/ReleasePortSvcLogic_v101.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ============LICENSE_START=======================================================
+  openECOMP : SDN-C
+  ================================================================================
+  Copyright (C) 2017 AT&T Intellectual Property. All rights
+  						reserved.
+  ================================================================================
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  ============LICENSE_END=========================================================
+  -->
+
+
+<service-logic xmlns="http://www.openecomp.org/sdnc/svclogic"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd"
+    module="ase" version="1.0.1">
+
+    <!-- Updated release port logic : deactivate the released port on the EMT -->
+    <method rpc="ase-release-port-request" mode="sync">
+        <exists plugin="org.openecomp.sdnc.sli.resource.sample.SampleResource"
+            resource="ase-evc" key="uni-circuit-id  == $uni-circuit-id">
+
+            <outcome value="true">
+                <return status="failure">
+                    <parameter name="error-code" value="1130" />
+                    <parameter name="error-message"
+                        value="Cannot release port - used in existing EVC" />
+                </return>
+            </outcome>
+            <outcome value="false">
+                <release plugin="org.openecomp.sdnc.sli.resource.sample.SampleResource"
+                    resource="ase-port" key="uni-circuit-id == $uni-circuit-id">
+                    <outcome value="success">
+                        <configure adaptor="org.openecomp.sdnc.sli.adaptor.emt.EmtAdaptor"
+                            key="$uni-circuit-id" activate="false">
+
+                            <outcome value="success">
+                                <block>
+                                    <record plugin="org.openecomp.sdnc.sli.recording.FileRecorder">
+                                        <parameter name="file" value="/tmp/sample_r1.log" />
+                                        <parameter name="field1" value="__TIMESTAMP__" />
+                                        <parameter name="field2" value="RELEASED" />
+                                        <parameter name="field3" value="$uni-circuit-id" />
+                                    </record>
+                                    <return status="success">
+                                        <parameter name="uni-circuit-id" value="$asePort.uni_circuit_id" />
+                                    </return>
+                                </block>
+                            </outcome>
+                            <outcome value="Other">
+                                <return status="failure">
+                                    <parameter name="error-code" value="1130" />
+                                    <parameter name="error-message"
+                                        value="Error encountered trying to de-activate port" />
+                                </return>
+                            </outcome>
+                        </configure>
+                    </outcome>
+
+                    <outcome value="not-found">
+                        <return status="failure">
+                            <parameter name="error-code" value="1110" />
+                            <parameter name="error-message" value="No port found for this uni-circuit-id" />
+                        </return>
+                    </outcome>
+
+                    <outcome value="Other">
+                        <return status="failure">
+                            <parameter name="error-code" value="1130" />
+                            <parameter name="error-message"
+                                value="Error encountered trying to release port" />
+                        </return>
+                    </outcome>
+                </release>
+            </outcome>
+        </exists>
+    </method>
+
+</service-logic>
+
diff --git a/sli/common/src/test/resources/bad_neutron_logic_v11.xml b/sli/common/src/test/resources/bad_neutron_logic_v11.xml
new file mode 100644
index 00000000..4e1e8d9b
--- /dev/null
+++ b/sli/common/src/test/resources/bad_neutron_logic_v11.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ============LICENSE_START=======================================================
+  openECOMP : SDN-C
+  ================================================================================
+  Copyright (C) 2017 AT&T Intellectual Property. All rights
+  						reserved.
+  ================================================================================
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  ============LICENSE_END=========================================================
+  -->
+
+
+<service-logic xmlns="http://www.openecomp.org/sdnc/svclogic"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd"
+    module="neutron" version="1.0.0">
+
+    <method rpc="canCreateNetwork" mode="sync">
+        <switch test="true">
+        <return status="success">
+            <parameter name="error-code" value="200" />
+        </return>
+        </switch>
+    </method>
+
+    <method rpc="networkCreated" mode="sync">
+        <switch test="`(length($network.segment[0].provider-physical-network) >= 5) and (substr($network.segment[0].provider-physical-network,0,5) == 'dvspg')`">
+            <outcome value="true">
+                <block>
+                <set>
+                  <parameter name="vlanlist" value="`$network.segment[0].provider-segmentation-id`"/>
+                </set>
+                <for index="i" start="1" end="`$network.num-segments`">
+                  <set>
+                    <parameter name="vlanlist" value="`$vlanlist+','+$network.segment[$i].provider-segmentation-id`"/>
+                  </set>
+                </for>
+
+                <switch test="true">
+                    <return status="success"/>
+                </switch>
+                </block>
+            </outcome>
+            <outcome value="Other">
+                <return status="success">
+                    <parameter name="error-code" value="200"/>
+                </return>
+            </outcome>
+        </switch>
+    </method>
+
+</service-logic>
diff --git a/sli/common/src/test/resources/expression.tests b/sli/common/src/test/resources/expression.tests
new file mode 100755
index 00000000..c352e9b0
--- /dev/null
+++ b/sli/common/src/test/resources/expression.tests
@@ -0,0 +1,19 @@
+$uni-circuit-id
+$asePort
+length($uni-circuit-id) > 0
+$asePort.uni-circuit-id
+$uni-cir-units * 1000 * 100 / 100
+$uni-cir-units / 1000
+$uni-cir-units - 100
+$uni-cir-units + 100
+(value * 3 - $arg1 > 0) and (length($uni-circuit-id) == 0)
+'pg-'+$network.name
+$network.segment[0].provider-physical-network
+length($network_segment[0].provider-physical-network) >= 5
+substr($network_segment[0].provider-physical-network,0,5) == 'dvspg'
+length($network_segment[0].provider-physical-network) >= 5 and substr($network_segment[0].provider-physical-network,0,5) == 'dvspg'
+(length($network_segment[0].provider-physical-network) >= 5) and (substr($network_segment[0].provider-physical-network,0,5) == 'dvspg')
+4-2-2
+1+1
+1
+1+2*3-4
diff --git a/sli/common/src/test/resources/mergetest.xml b/sli/common/src/test/resources/mergetest.xml
new file mode 100644
index 00000000..12e083c7
--- /dev/null
+++ b/sli/common/src/test/resources/mergetest.xml
@@ -0,0 +1,54 @@
+<!--
+  ============LICENSE_START=======================================================
+  openECOMP : SDN-C
+  ================================================================================
+  Copyright (C) 2017 AT&T Intellectual Property. All rights
+  						reserved.
+  ================================================================================
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  ============LICENSE_END=========================================================
+  -->
+
+<multicast-parameters xmlns="org.openecomp.sdnc:test">
+       <vpn-v4-multicast-enabled>Y</vpn-v4-multicast-enabled>
+       <v4-multicast>
+              <v4-pim-ssm-default-range>Y</v4-pim-ssm-default-range>
+              <v4-data-mdt>11.11.11.11</v4-data-mdt>
+              <v4-data-mdt-wildcard-mask>2.2.2.2</v4-data-mdt-wildcard-mask>
+              <max-routes-limit>100</max-routes-limit>
+              <v4-default-mdt>1.1.1.1</v4-default-mdt>
+              <v4-pim-sm-static-override>N</v4-pim-sm-static-override>
+              <v4-pim-ssm-groups>
+                     <v4-pim-ssm-group-address>4.4.4.4</v4-pim-ssm-group-address>
+              </v4-pim-ssm-groups>
+              <v4-pim-ssm-groups>
+                     <v4-pim-ssm-group-address>3.3.3.3</v4-pim-ssm-group-address>
+              </v4-pim-ssm-groups>
+              <v4-static-rp-triplet>
+                     <rp-address>8.8.8.8</rp-address>
+                     <c-groups>
+                           <c-group-address-prefix>10.10.10.10</c-group-address-prefix>
+                     </c-groups>
+                     <c-groups>
+                           <c-group-address-prefix>9.9.9.9</c-group-address-prefix>
+                     </c-groups>
+              </v4-static-rp-triplet>
+              <v4-static-rp-triplet>
+                     <rp-address>7.7.7.7</rp-address>
+                     <c-groups>
+                           <c-group-address-prefix>6.6.6.6</c-group-address-prefix>
+                     </c-groups>
+                     <c-groups>
+                           <c-group-address-prefix>5.5.5.5</c-group-address-prefix>
+                     </c-groups>
+              </v4-static-rp-triplet>
+       </v4-multicast>
+</multicast-parameters>
diff --git a/sli/common/src/test/resources/neutron_logic_v10.xml b/sli/common/src/test/resources/neutron_logic_v10.xml
new file mode 100644
index 00000000..9cd33127
--- /dev/null
+++ b/sli/common/src/test/resources/neutron_logic_v10.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ============LICENSE_START=======================================================
+  openECOMP : SDN-C
+  ================================================================================
+  Copyright (C) 2017 AT&T Intellectual Property. All rights
+  						reserved.
+  ================================================================================
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  ============LICENSE_END=========================================================
+  -->
+
+
+<service-logic xmlns="http://www.openecomp.org/sdnc/svclogic"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd"
+    module="neutron" version="1.0.0">
+
+    <method rpc="canCreateNetwork" mode="sync">
+        <return status="success">
+            <parameter name="error-code" value="200" />
+        </return>
+    </method>
+
+    <method rpc="networkCreated" mode="sync">
+        <switch test="`(length($network.segment[0].provider-physical-network) >= 5) and (substr($network.segment[0].provider-physical-network,0,5) == 'dvspg')`">
+            <outcome value="true">
+                <block>
+                <set>
+                  <parameter name="vlanlist" value="`$network.segment[0].provider-segmentation-id`"/>
+                </set>
+                <for index="i" start="1" end="`$network.num-segments`">
+                  <set>
+                    <parameter name="vlanlist" value="`$vlanlist+','+$network.segment[$i].provider-segmentation-id`"/>
+                  </set>
+                </for>
+
+                </block>
+            </outcome>
+            <outcome value="Other">
+                <return status="success">
+                    <parameter name="error-code" value="200"/>
+                </return>
+            </outcome>
+        </switch>
+    </method>
+
+</service-logic>
diff --git a/sli/common/src/test/resources/nonsense.xml b/sli/common/src/test/resources/nonsense.xml
new file mode 100644
index 00000000..61220825
--- /dev/null
+++ b/sli/common/src/test/resources/nonsense.xml
@@ -0,0 +1,24 @@
+<!--
+  ============LICENSE_START=======================================================
+  openECOMP : SDN-C
+  ================================================================================
+  Copyright (C) 2017 AT&T Intellectual Property. All rights
+  						reserved.
+  ================================================================================
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+  
+       http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  ============LICENSE_END=========================================================
+  -->
+
+<non>
+<sense>Hello world</sense>
+</non>
diff --git a/sli/common/src/test/resources/parser-bad.tests b/sli/common/src/test/resources/parser-bad.tests
new file mode 100755
index 00000000..82913afc
--- /dev/null
+++ b/sli/common/src/test/resources/parser-bad.tests
@@ -0,0 +1,3 @@
+bad_neutron_logic_v11.xml
+EvcActivateSvcLogic_v100.xml
+nonsense.xml
\ No newline at end of file
diff --git a/sli/common/src/test/resources/parser-good.tests b/sli/common/src/test/resources/parser-good.tests
new file mode 100755
index 00000000..06543126
--- /dev/null
+++ b/sli/common/src/test/resources/parser-good.tests
@@ -0,0 +1,2 @@
+ReleasePortSvcLogic_v101.xml
+neutron_logic_v10.xml
diff --git a/sli/common/src/test/resources/simplelogger.properties b/sli/common/src/test/resources/simplelogger.properties
new file mode 100644
index 00000000..6f70984c
--- /dev/null
+++ b/sli/common/src/test/resources/simplelogger.properties
@@ -0,0 +1,24 @@
+###
+# ============LICENSE_START=======================================================
+# openECOMP : SDN-C
+# ================================================================================
+# Copyright (C) 2017 AT&T Intellectual Property. All rights
+# 						reserved.
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#      http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ============LICENSE_END=========================================================
+###
+
+org.slf4j.simpleLogger.defaultLogLevel=info
+org.slf4j.simplelogger.log.org.openecomp.sdnc.sli.SvcLogicContext=debug
+org.slf4j.simplelogger.log.SvcLogicContext=debug
diff --git a/sli/common/src/test/resources/svclogic.properties b/sli/common/src/test/resources/svclogic.properties
new file mode 100644
index 00000000..fa33146e
--- /dev/null
+++ b/sli/common/src/test/resources/svclogic.properties
@@ -0,0 +1,26 @@
+###
+# ============LICENSE_START=======================================================
+# openECOMP : SDN-C
+# ================================================================================
+# Copyright (C) 2017 AT&T Intellectual Property. All rights
+# 						reserved.
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#      http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ============LICENSE_END=========================================================
+###
+
+org.openecomp.sdnc.sli.dbtype = jdbc
+org.openecomp.sdnc.sli.jdbc.url = jdbc:mysql://localhost:3306/sdnctl
+org.openecomp.sdnc.sli.jdbc.database = sdnctl
+org.openecomp.sdnc.sli.jdbc.user = sdnctl
+org.openecomp.sdnc.sli.jdbc.password = gamma
diff --git a/sli/common/src/test/resources/svclogic.sh b/sli/common/src/test/resources/svclogic.sh
new file mode 100644
index 00000000..09f0637d
--- /dev/null
+++ b/sli/common/src/test/resources/svclogic.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+###
+# ============LICENSE_START=======================================================
+# openECOMP : SDN-C
+# ================================================================================
+# Copyright (C) 2017 AT&T Intellectual Property. All rights
+# 						reserved.
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#      http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ============LICENSE_END=========================================================
+###
+
+MYSQL_JDBC_DRIVER=${MYSQL_JDBC_DRIVER:-/home/ubuntu/mysql-connector-java-5.1.38.1.jar}
+SLI_COMMON_TARGETDIR=${SLI_COMMON_TARGETDIR:-/home/ubuntu/opendaylight/plugins}
+#SLI_COMMON_TARGETDIR=${SLI_COMMON_TARGETDIR:-/home/ubuntu/git/sdnctl/sli/common/target}
+SLI_VERSION=${SLI_VERSION:-1.1.0-SNAPSHOT}
+SLI_COMMON_JAR=${SLI_COMMON_JAR:=${SLI_COMMON_TARGETDIR}/sli-common-${SLI_VERSION}.jar}
+
+echo SLI_COMMON_JAR is $SLI_COMMON_JAR
+
+java -cp ${CLASSPATH}:${MYSQL_JDBC_DRIVER}:${SLI_COMMON_JAR} org.openecomp.sdnc.sli.SvcLogicParser $*
diff --git a/sli/common/src/test/resources/svclogic.xsd b/sli/common/src/test/resources/svclogic.xsd
new file mode 100755
index 00000000..07430891
--- /dev/null
+++ b/sli/common/src/test/resources/svclogic.xsd
@@ -0,0 +1,323 @@
+<?xml version = "1.0" encoding = "UTF-8"?>

+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.openecomp.org/sdnc/svclogic" xmlns="http://www.openecomp.org/sdnc/svclogic">

+

+	<xsd:simpleType name="modeType">

+		<xsd:restriction base="xsd:string">

+			<xsd:enumeration value="sync" />

+			<xsd:enumeration value="async" />

+		</xsd:restriction>

+	</xsd:simpleType>

+

+	<xsd:group name="node">

+		<xsd:choice>

+			<xsd:element ref="block" />

+			<xsd:element ref="is-available" />

+			<xsd:element ref="exists" />

+			<xsd:element ref="reserve" />

+			<xsd:element ref="release" />

+			<xsd:element ref="allocate" />

+			<xsd:element ref="get-resource" />

+			<xsd:element ref="configure" />

+			<xsd:element ref="return" />

+			<xsd:element ref="switch" />

+			<xsd:element ref="record" />

+			<xsd:element ref="save" />

+			<xsd:element ref="for" />

+			<xsd:element ref="set" />

+			<xsd:element ref="execute" />

+			<xsd:element ref="delete" />

+			<xsd:element ref="update" />

+			<xsd:element ref="call" />

+			<xsd:element ref="notify" />

+			<xsd:element ref="break" />

+		</xsd:choice>

+	</xsd:group>

+

+	<xsd:element name="service-logic">

+		<xsd:complexType>

+			<xsd:sequence>

+				<xsd:element ref="method" minOccurs="0" maxOccurs="unbounded" />

+			</xsd:sequence>

+			<xsd:attribute name="module" use="required" type="xsd:string" />

+			<xsd:attribute name="version" use="required" type="xsd:string" />

+		</xsd:complexType>

+	</xsd:element>

+

+	<xsd:element name="method">

+		<xsd:complexType>

+			<xsd:sequence>

+				<xsd:group ref="node" minOccurs="0" maxOccurs="unbounded" />

+			</xsd:sequence>

+			<xsd:attribute name="rpc" use="required" type="xsd:string" />

+			<xsd:attribute name="mode" use="optional" type="modeType" />

+		</xsd:complexType>

+	</xsd:element>

+

+	<xsd:element name="block">

+		<xsd:complexType>

+			<xsd:sequence>

+				<xsd:group ref="node" minOccurs="0" maxOccurs="unbounded" />

+			</xsd:sequence>

+			<xsd:attribute name="atomic" use="optional" type="xsd:boolean" />

+		</xsd:complexType>

+	</xsd:element>

+

+	<xsd:element name="is-available">

+		<xsd:complexType>

+			<xsd:sequence>

+				<xsd:element ref="outcome" minOccurs="0" maxOccurs="unbounded" />

+			</xsd:sequence>

+			<xsd:attribute name="pfx" use="optional" type="xsd:string" />

+			<xsd:attribute name="plugin" use="required" type="xsd:string" />

+			<xsd:attribute name="resource" use="required" type="xsd:string" />

+			<xsd:attribute name="key" use="optional" type="xsd:string" />

+		</xsd:complexType>

+	</xsd:element>

+

+	<xsd:element name="exists">

+		<xsd:complexType>

+			<xsd:sequence>

+				<xsd:element ref="outcome" minOccurs="0" maxOccurs="unbounded" />

+			</xsd:sequence>

+			<xsd:attribute name="pfx" use="optional" type="xsd:string" />

+			<xsd:attribute name="plugin" use="required" type="xsd:string" />

+			<xsd:attribute name="resource" use="required" type="xsd:string" />

+			<xsd:attribute name="key" use="required" type="xsd:string" />

+		</xsd:complexType>

+	</xsd:element>

+

+	<xsd:element name="outcome">

+		<xsd:complexType>

+			<xsd:sequence>

+				<xsd:group ref="node" minOccurs="0" maxOccurs="unbounded" />

+			</xsd:sequence>

+			<xsd:attribute name="ref" use="optional" type="xsd:string" />

+			<xsd:attribute name="value" use="required" type="xsd:string" />

+		</xsd:complexType>

+	</xsd:element>

+

+	<xsd:element name="reserve">

+		<xsd:complexType>

+			<xsd:sequence>

+				<!-- This node does not actually read from parameters -->

+				<xsd:element ref="parameter" minOccurs="0" maxOccurs="unbounded" />

+				<xsd:element ref="outcome" minOccurs="0" maxOccurs="unbounded" />

+			</xsd:sequence>

+			<xsd:attribute name="plugin" use="required" type="xsd:string" />

+			<xsd:attribute name="resource" use="required" type="xsd:string" />

+			<xsd:attribute name="key" use="optional" type="xsd:string" />

+			<xsd:attribute name="select" use="optional" type="xsd:string" />

+			<xsd:attribute name="pfx" use="optional" type="xsd:string" />

+		</xsd:complexType>

+	</xsd:element>

+

+	<xsd:element name="release">

+		<xsd:complexType>

+			<xsd:sequence>

+				<xsd:element ref="outcome" minOccurs="0" maxOccurs="unbounded" />

+			</xsd:sequence>

+			<xsd:attribute name="plugin" use="required" type="xsd:string" />

+			<xsd:attribute name="resource" use="required" type="xsd:string" />

+			<xsd:attribute name="key" use="optional" type="xsd:string" />

+			<xsd:attribute name="pfx" use="optional" type="xsd:string" />

+		</xsd:complexType>

+	</xsd:element>

+

+	<xsd:element name="record">

+		<xsd:complexType>

+			<xsd:sequence>

+				<xsd:element ref="parameter" minOccurs="0" maxOccurs="unbounded" />

+				<xsd:element ref="outcome" minOccurs="0" maxOccurs="unbounded" />

+			</xsd:sequence>

+			<xsd:attribute name="plugin" use="required" type="xsd:string" />

+		</xsd:complexType>

+	</xsd:element>

+

+	<xsd:element name="allocate">

+		<xsd:complexType>

+			<xsd:sequence>

+				<!-- This node does not actually read from parameters -->

+				<xsd:element ref="parameter" minOccurs="0" maxOccurs="unbounded" />

+				<xsd:element ref="outcome" minOccurs="0" maxOccurs="unbounded" />

+			</xsd:sequence>

+			<xsd:attribute name="plugin" use="required" type="xsd:string" />

+			<xsd:attribute name="resource" use="required" type="xsd:string" />

+			<xsd:attribute name="key" use="required" type="xsd:string" />

+			<xsd:attribute name="pfx" use="required" type="xsd:string" />

+		</xsd:complexType>

+	</xsd:element>

+

+	<xsd:element name="get-resource">

+		<xsd:complexType>

+			<xsd:sequence>

+				<!-- This node does not actually read from parameters -->

+				<xsd:element ref="parameter" minOccurs="0" maxOccurs="unbounded" />

+				<xsd:element ref="outcome" minOccurs="0" maxOccurs="unbounded" />

+			</xsd:sequence>

+			<xsd:attribute name="plugin" use="required" type="xsd:string" />

+			<xsd:attribute name="resource" use="required" type="xsd:string" />

+			<xsd:attribute name="key" use="optional" type="xsd:string" />

+			<xsd:attribute name="local-only" use="optional" type="xsd:boolean" />

+			<xsd:attribute name="order-by" use="optional" type="xsd:string" />

+			<xsd:attribute name="pfx" use="optional" type="xsd:string" />

+			<!-- force is retired and does not do anything -->

+			<xsd:attribute name="force" use="optional" type="xsd:string" />

+		</xsd:complexType>

+	</xsd:element>

+

+	<xsd:element name="configure">

+		<xsd:complexType>

+			<xsd:sequence>

+				<xsd:element ref="parameter" minOccurs="0" maxOccurs="unbounded" />

+				<xsd:element ref="outcome" minOccurs="0" maxOccurs="unbounded" />

+			</xsd:sequence>

+			<xsd:attribute name="adaptor" use="required" type="xsd:string" />

+			<xsd:attribute name="key" use="required" type="xsd:string" />

+			<xsd:attribute name="activate" use="optional" type="xsd:boolean" />

+		</xsd:complexType>

+	</xsd:element>

+

+

+	<xsd:element name="parameter">

+		<xsd:complexType>

+			<xsd:attribute name="name" use="required" type="xsd:string" />

+			<xsd:attribute name="value" use="required" type="xsd:string" />

+		</xsd:complexType>

+	</xsd:element>

+

+

+	<xsd:element name="return">

+		<xsd:complexType>

+			<xsd:sequence>

+				<xsd:element ref="parameter" minOccurs="0" maxOccurs="unbounded" />

+			</xsd:sequence>

+			<xsd:attribute name="status" use="optional" type="xsd:string" />

+		</xsd:complexType>

+	</xsd:element>

+

+	<xsd:element name="switch">

+		<xsd:complexType>

+			<xsd:sequence>

+				<xsd:element ref="outcome" minOccurs="0" maxOccurs="unbounded" />

+			</xsd:sequence>

+			<xsd:attribute name="test" use="required" type="xsd:string" />

+		</xsd:complexType>

+	</xsd:element>

+

+	<xsd:element name="save">

+		<xsd:complexType>

+			<xsd:sequence>

+				<xsd:element ref="parameter" minOccurs="0" maxOccurs="unbounded" />

+				<xsd:element ref="outcome" minOccurs="0" maxOccurs="unbounded" />

+			</xsd:sequence>

+			<xsd:attribute name="plugin" use="required" type="xsd:string" />

+			<xsd:attribute name="resource" use="required" type="xsd:string" />

+			<xsd:attribute name="key" use="optional" type="xsd:string" />

+			<xsd:attribute name="force" use="optional" type="xsd:boolean" />

+			<xsd:attribute name="local-only" use="optional" type="xsd:boolean" />

+			<xsd:attribute name="pfx" use="optional" type="xsd:string" />

+		</xsd:complexType>

+	</xsd:element>

+

+	<xsd:element name="delete">

+		<xsd:complexType>

+			<xsd:sequence>

+				<!-- This node does not actually read from parameters -->

+				<xsd:element ref="parameter" minOccurs="0" maxOccurs="unbounded" />

+				<xsd:element ref="outcome" minOccurs="0" maxOccurs="unbounded" />

+			</xsd:sequence>

+			<xsd:attribute name="plugin" use="required" type="xsd:string" />

+			<xsd:attribute name="resource" use="required" type="xsd:string" />

+			<xsd:attribute name="key" use="optional" type="xsd:string" />

+			<!-- force is retired and does not do anything -->

+			<xsd:attribute name="force" use="optional" type="xsd:string" />

+			<!-- local-only is retired and does not do anything -->

+			<xsd:attribute name="local-only" use="optional" type="xsd:string" />

+			<!-- pfx is retired and does not do anything -->

+			<xsd:attribute name="pfx" use="optional" type="xsd:string" />

+		</xsd:complexType>

+	</xsd:element>

+

+	<xsd:element name="for">

+		<xsd:complexType>

+			<xsd:sequence>

+				<xsd:group ref="node" minOccurs="0" maxOccurs="unbounded" />

+			</xsd:sequence>

+			<xsd:attribute name="atomic" use="optional" type="xsd:boolean" />

+			<xsd:attribute name="index" use="required" type="xsd:string" />

+			<xsd:attribute name="start" use="required" type="xsd:string" />

+			<xsd:attribute name="end" use="required" type="xsd:string" />

+			<xsd:attribute name="silentFailure" use="optional" type="xsd:boolean" default="false" />

+		</xsd:complexType>

+	</xsd:element>

+

+	<xsd:element name="set">

+		<xsd:complexType>

+			<xsd:sequence>

+				<xsd:element ref="parameter" minOccurs="0" maxOccurs="unbounded" />

+			</xsd:sequence>

+			<xsd:attribute name="only-if-unset" use="optional"

+				type="xsd:boolean" />

+		</xsd:complexType>

+	</xsd:element>

+

+	<xsd:element name="execute">

+		<xsd:complexType>

+			<xsd:sequence>

+				<xsd:element ref="parameter" minOccurs="0" maxOccurs="unbounded" />

+				<xsd:element ref="outcome" minOccurs="0" maxOccurs="unbounded" />

+			</xsd:sequence>

+			<xsd:attribute name="plugin" use="required" type="xsd:string" />

+			<xsd:attribute name="method" use="required" type="xsd:string" />

+			<xsd:attribute name="emitsOutcome" use="optional" type="xsd:boolean" />

+		</xsd:complexType>

+	</xsd:element>

+

+	<xsd:element name="update">

+		<xsd:complexType>

+			<xsd:sequence>

+				<xsd:element ref="parameter" minOccurs="0" maxOccurs="unbounded" />

+				<xsd:element ref="outcome" minOccurs="0" maxOccurs="unbounded" />

+			</xsd:sequence>

+			<xsd:attribute name="plugin" use="required" type="xsd:string" />

+			<xsd:attribute name="resource" use="required" type="xsd:string" />

+			<xsd:attribute name="key" use="optional" type="xsd:string" />

+			<xsd:attribute name="force" use="optional" type="xsd:boolean" />

+			<xsd:attribute name="local-only" use="optional" type="xsd:boolean" />

+			<xsd:attribute name="pfx" use="optional" type="xsd:string" />

+		</xsd:complexType>

+	</xsd:element>

+

+	<xsd:element name="call">

+		<xsd:complexType>

+			<xsd:sequence>

+				<!-- This node does not actually read from parameters -->

+				<xsd:element ref="parameter" minOccurs="0" maxOccurs="unbounded" />

+				<xsd:element ref="outcome" minOccurs="0" maxOccurs="unbounded" />

+			</xsd:sequence>

+			<xsd:attribute name="module" use="optional" type="xsd:string" />

+			<xsd:attribute name="rpc" use="required" type="xsd:string" />

+			<xsd:attribute name="version" use="optional" type="xsd:string" />

+			<xsd:attribute name="mode" use="required" type="xsd:string" />

+		</xsd:complexType>

+	</xsd:element>

+

+	<xsd:element name="notify">

+		<xsd:complexType>

+			<xsd:sequence>

+				<xsd:element ref="outcome" minOccurs="0" maxOccurs="unbounded" />

+			</xsd:sequence>

+			<xsd:attribute name="plugin" use="optional" type="xsd:string" />

+			<xsd:attribute name="resource" use="optional" type="xsd:string" />

+			<xsd:attribute name="action" use="required" type="xsd:string" />

+			<xsd:attribute name="key" use="optional" type="xsd:string" />

+			<!-- force is retired and does not do anything -->

+			<xsd:attribute name="force" use="optional" type="xsd:string" />

+		</xsd:complexType>

+	</xsd:element>

+

+	<xsd:element name="break">

+		<xsd:complexType />

+	</xsd:element>

+

+</xsd:schema>

diff --git a/sli/features/pom.xml b/sli/features/pom.xml
new file mode 100755
index 00000000..2556a579
--- /dev/null
+++ b/sli/features/pom.xml
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>sli</artifactId>
+		<groupId>org.openecomp.sdnc.core</groupId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>sli-features</artifactId>
+	<name>SLI - Features</name>
+
+	<packaging>jar</packaging>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.openecomp.sdnc.core</groupId>
+			<artifactId>sli-common</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+
+		<dependency>
+			<groupId>org.openecomp.sdnc.core</groupId>
+			<artifactId>sli-recording</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-lang</groupId>
+			<artifactId>commons-lang</artifactId>
+			<version>2.6</version>
+			<scope>compile</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.opendaylight.mdsal</groupId>
+			<artifactId>features-mdsal</artifactId>
+			<version>${odl.mdsal.features.version}</version>
+			<classifier>features</classifier>
+			<type>xml</type>
+
+			<scope>runtime</scope>
+		</dependency>
+
+
+		<!-- dependency for opendaylight-karaf-empty for use by testing
+		<dependency>
+			<groupId>org.opendaylight.odlparent</groupId>
+			<artifactId>opendaylight-karaf-empty</artifactId>
+			<version>${odl.karaf.empty.version}</version>
+			<type>zip</type>
+		</dependency>
+		-->
+
+
+		<dependency>
+			<!-- Required for launching the feature tests -->
+			<groupId>org.opendaylight.odlparent</groupId>
+			<artifactId>features-test</artifactId>
+			<version>${odl.commons.opendaylight.version}</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.opendaylight.yangtools</groupId>
+			<artifactId>features-yangtools</artifactId>
+			<version>${odl.yangtools.version}</version>
+			<classifier>features</classifier>
+			<type>xml</type>
+			<scope>runtime</scope>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<resources>
+			<resource>
+				<filtering>true</filtering>
+				<directory>src/main/resources</directory>
+			</resource>
+		</resources>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-resources-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>filter</id>
+						<goals>
+							<goal>resources</goal>
+						</goals>
+						<phase>generate-resources</phase>
+					</execution>
+				</executions>
+			</plugin>
+
+                        <!-- Comment out feature test, since it fails in Jenkins due to env issues
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>2.16</version>
+				<configuration>
+					<systemPropertyVariables>
+						<karaf.distro.groupId>org.opendaylight.odlparent</karaf.distro.groupId>
+						<karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId>
+						<karaf.distro.version>${odl.karaf.empty.distro.version}</karaf.distro.version>
+					</systemPropertyVariables>
+					<dependenciesToScan>
+						<dependency>org.opendaylight.yangtools:features-test</dependency>
+					</dependenciesToScan>
+				</configuration>
+			</plugin>
+                        -->
+
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>build-helper-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>attach-artifacts</id>
+						<goals>
+							<goal>attach-artifact</goal>
+						</goals>
+						<phase>package</phase>
+						<configuration>
+							<artifacts>
+								<artifact>
+									<file>${project.build.directory}/classes/${features.file}</file>
+									<type>xml</type>
+									<classifier>features</classifier>
+								</artifact>
+							</artifacts>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>
diff --git a/sli/features/src/main/resources/features.xml b/sli/features/src/main/resources/features.xml
new file mode 100644
index 00000000..e1ce255a
--- /dev/null
+++ b/sli/features/src/main/resources/features.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ============LICENSE_START=======================================================
+  openECOMP : SDN-C
+  ================================================================================
+  Copyright (C) 2017 AT&T Intellectual Property. All rights
+  						reserved.
+  ================================================================================
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  ============LICENSE_END=========================================================
+  -->
+
+
+<features name="sdnc-sli-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
+
+    <repository>mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.features.version}/xml/features</repository>
+
+
+    <feature name='sdnc-sli' description="sdnc-sli" version='${project.version}'>
+
+        <feature version="${odl.mdsal.version}">odl-mdsal-broker</feature>
+        <bundle>mvn:org.openecomp.sdnc.core/sli-common/${project.version}</bundle>
+        <bundle>mvn:org.openecomp.sdnc.core/sli-provider/${project.version}</bundle>
+        <bundle>mvn:org.openecomp.sdnc.core/sli-recording/${project.version}</bundle>
+        <feature>sdnc-dblib</feature>
+        <bundle>mvn:mysql/mysql-connector-java/${mysql.connector.version}</bundle>
+    </feature>
+
+</features>
diff --git a/sli/installer/pom.xml b/sli/installer/pom.xml
new file mode 100755
index 00000000..d43769e2
--- /dev/null
+++ b/sli/installer/pom.xml
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>sli</artifactId>
+		<groupId>org.openecomp.sdnc.core</groupId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>sli-installer</artifactId>
+	<name>SLI - Karaf  Installer</name>
+	<packaging>pom</packaging>
+
+	<properties>
+		<application.name>sdnc-sli</application.name>
+		<features.boot>sdnc-sli</features.boot>
+		<features.repositories>mvn:org.openecomp.sdnc.core/sli-features/${project.version}/xml/features</features.repositories>
+		<include.transitive.dependencies>false</include.transitive.dependencies>
+	</properties>
+
+	<dependencies>
+
+		<dependency>
+			<groupId>org.openecomp.sdnc.core</groupId>
+			<artifactId>sli-features</artifactId>
+			<version>${project.version}</version>
+			<classifier>features</classifier>
+			<type>xml</type>
+			<exclusions>
+				<exclusion>
+					<groupId>*</groupId>
+					<artifactId>*</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
+		<dependency>
+			<groupId>org.openecomp.sdnc.core</groupId>
+			<artifactId>sli-common</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.openecomp.sdnc.core</groupId>
+			<artifactId>sli-provider</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.openecomp.sdnc.core</groupId>
+			<artifactId>sli-recording</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>maven-repo-zip</id>
+						<goals>
+							<goal>single</goal>
+						</goals>
+						<phase>package</phase>
+						<configuration>
+							<attach>false</attach>
+							<finalName>stage/${application.name}-${project.version}</finalName>
+							<descriptors>
+								<descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor>
+							</descriptors>
+							<appendAssemblyId>false</appendAssemblyId>
+						</configuration>
+					</execution>
+					<execution>
+						<id>installer-zip</id>
+						<goals>
+							<goal>single</goal>
+						</goals>
+						<phase>package</phase>
+						<configuration>
+							<attach>true</attach>
+							<finalName>${application.name}-${project.version}-installer</finalName>
+							<descriptors>
+								<descriptor>src/assembly/assemble_installer_zip.xml</descriptor>
+							</descriptors>
+							<appendAssemblyId>false</appendAssemblyId>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>copy-dependencies</id>
+						<goals>
+							<goal>copy-dependencies</goal>
+						</goals>
+						<phase>prepare-package</phase>
+						<configuration>
+							<transitive>false</transitive>
+							<outputDirectory>${project.build.directory}/assembly/system</outputDirectory>
+							<overWriteReleases>false</overWriteReleases>
+							<overWriteSnapshots>true</overWriteSnapshots>
+							<overWriteIfNewer>true</overWriteIfNewer>
+							<useRepositoryLayout>true</useRepositoryLayout>
+							<addParentPoms>false</addParentPoms>
+							<copyPom>false</copyPom>
+							<includeGroupIds>org.openecomp.sdnc</includeGroupIds>
+							<excludeArtifactIds>dblib-provider</excludeArtifactIds>
+							<scope>provided</scope>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<artifactId>maven-resources-plugin</artifactId>
+				<version>2.6</version>
+				<executions>
+					<execution>
+						<id>copy-version</id>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals><!-- here the phase you need -->
+						<phase>validate</phase>
+						<configuration>
+							<outputDirectory>${basedir}/target/stage</outputDirectory>
+							<resources>
+								<resource>
+									<directory>src/main/resources/scripts</directory>
+									<includes>
+										<include>install-feature.sh</include>
+									</includes>
+									<filtering>true</filtering>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>
+
+				</executions>
+			</plugin>
+
+		</plugins>
+	</build>
+
+</project>
diff --git a/sli/installer/src/assembly/assemble_installer_zip.xml b/sli/installer/src/assembly/assemble_installer_zip.xml
new file mode 100644
index 00000000..85e2e1e8
--- /dev/null
+++ b/sli/installer/src/assembly/assemble_installer_zip.xml
@@ -0,0 +1,59 @@
+<!--
+  ============LICENSE_START=======================================================
+  openECOMP : SDN-C
+  ================================================================================
+  Copyright (C) 2017 AT&T Intellectual Property. All rights
+  						reserved.
+  ================================================================================
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+  
+       http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  ============LICENSE_END=========================================================
+  -->
+
+<!-- Defines how we build the .zip file which is our distribution. -->
+
+<assembly
+	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+  <id>bin</id>
+	<formats>
+		<format>zip</format>
+	</formats>
+
+	<!--  we want "system" and related files right at the root level
+		  as this file is suppose to be unzip on top of a karaf
+		  distro. -->
+	<includeBaseDirectory>false</includeBaseDirectory>
+
+	<fileSets>
+		<fileSet>
+			<directory>target/stage/</directory>
+			<outputDirectory>${application.name}</outputDirectory>
+			<fileMode>755</fileMode>
+			<includes>
+				<include>*.sh</include>
+			</includes>
+		</fileSet>
+		<fileSet>
+			<directory>target/stage/</directory>
+			<outputDirectory>${application.name}</outputDirectory>
+			<fileMode>644</fileMode>
+			<excludes>
+				<exclude>*.sh</exclude>
+			</excludes>
+		</fileSet>
+	</fileSets>
+
+
+
+</assembly>
diff --git a/sli/installer/src/assembly/assemble_mvnrepo_zip.xml b/sli/installer/src/assembly/assemble_mvnrepo_zip.xml
new file mode 100644
index 00000000..38e6d47b
--- /dev/null
+++ b/sli/installer/src/assembly/assemble_mvnrepo_zip.xml
@@ -0,0 +1,49 @@
+<!--
+  ============LICENSE_START=======================================================
+  openECOMP : SDN-C
+  ================================================================================
+  Copyright (C) 2017 AT&T Intellectual Property. All rights
+  						reserved.
+  ================================================================================
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+  
+       http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  ============LICENSE_END=========================================================
+  -->
+
+<!-- Defines how we build the .zip file which is our distribution. -->
+
+<assembly
+	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+  <id>bin</id>
+        <formats>
+                <format>zip</format>
+	</formats>
+
+	<!--  we want "system" and related files right at the root level
+		  as this file is suppose to be unzip on top of a karaf
+		  distro. -->
+	<includeBaseDirectory>false</includeBaseDirectory>
+
+	<fileSets>
+		<fileSet>
+			<directory>target/assembly/</directory>
+			<outputDirectory>.</outputDirectory>
+			<excludes>
+			</excludes>
+		</fileSet>
+	</fileSets>
+
+
+
+</assembly>
diff --git a/sli/installer/src/main/resources/scripts/install-feature.sh b/sli/installer/src/main/resources/scripts/install-feature.sh
new file mode 100644
index 00000000..93236c5b
--- /dev/null
+++ b/sli/installer/src/main/resources/scripts/install-feature.sh
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+###
+# ============LICENSE_START=======================================================
+# openECOMP : SDN-C
+# ================================================================================
+# Copyright (C) 2017 AT&T Intellectual Property. All rights
+# 						reserved.
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#      http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ============LICENSE_END=========================================================
+###
+
+ODL_HOME=${ODL_HOME:-/opt/opendaylight/current}
+ODL_KARAF_CLIENT=${ODL_KARAF_CLIENT:-${ODL_HOME}/bin/client}
+ODL_KARAF_CLIENT_OPTS=${ODL_KARAF_CLIENT_OPTS:-"-u karaf"}
+INSTALLERDIR=$(dirname $0)
+
+REPOZIP=${INSTALLERDIR}/${features.boot}-${project.version}.zip
+
+if [ -f ${REPOZIP} ]
+then
+	unzip -d ${ODL_HOME} ${REPOZIP}
+else
+	echo "ERROR : repo zip ($REPOZIP) not found"
+	exit 1
+fi
+
+${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories}
+${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:install ${features.boot}
diff --git a/sli/pom.xml b/sli/pom.xml
new file mode 100755
index 00000000..53a8b629
--- /dev/null
+++ b/sli/pom.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+
+	<parent>
+		<groupId>org.openecomp.sdnc.core</groupId>
+		<artifactId>sdnc-core</artifactId>
+        	<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<modelVersion>4.0.0</modelVersion>
+	<packaging>pom</packaging>
+	<groupId>org.openecomp.sdnc.core</groupId>
+	<artifactId>sli</artifactId>
+
+	<dependencyManagement>
+
+		<dependencies>
+			<dependency>
+				<groupId>org.openecomp.sdnc.core</groupId>
+				<artifactId>sli-features</artifactId>
+				<classifier>features</classifier>
+				<type>xml</type>
+				<version>${project.version}</version>
+			</dependency>
+
+			<dependency>
+				<groupId>org.openecomp.sdnc.core</groupId>
+				<artifactId>sli-common</artifactId>
+				<version>${project.version}</version>
+			</dependency>
+
+			<dependency>
+				<groupId>org.openecomp.sdnc.core</groupId>
+				<artifactId>sli-provider</artifactId>
+				<version>${project.version}</version>
+			</dependency>
+
+			<dependency>
+				<groupId>org.openecomp.sdnc.core</groupId>
+				<artifactId>sli-recording</artifactId>
+				<version>${project.version}</version>
+			</dependency>
+
+		</dependencies>
+
+	</dependencyManagement>
+
+
+	<name>Service Logic Interpreter</name>
+	<description>The Service Logic Interpreter (SLI) allows service planners to design the flow of logic within the SDN controller in an XML format, without a need for custom Java code. </description>
+
+	<modules>
+		<module>common</module>
+		<module>provider</module>
+		<module>recording</module>
+		<module>features</module>
+		<module>installer</module>
+	</modules>
+	<organization>
+		<name>openECOMP</name>
+	</organization>
+	<version>0.0.1-SNAPSHOT</version>
+
+
+</project>
diff --git a/sli/provider/pom.xml b/sli/provider/pom.xml
new file mode 100755
index 00000000..f73d0071
--- /dev/null
+++ b/sli/provider/pom.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.openecomp.sdnc.core</groupId>
+		<artifactId>sli</artifactId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>sli-provider</artifactId>
+	<packaging>bundle</packaging>
+	<name>SLI - Provider</name>
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
+	<dependencies>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>3.8.1</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.openecomp.sdnc.core</groupId>
+			<artifactId>sli-common</artifactId>
+			<version>${project.version}</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>equinoxSDK381</groupId>
+			<artifactId>org.eclipse.osgi</artifactId>
+			<version>${equinox.osgi.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>${slf4j.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>jcl-over-slf4j</artifactId>
+			<version>${slf4j.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-lang</groupId>
+			<artifactId>commons-lang</artifactId>
+			<version>${commons.lang.version}</version>
+			<scope>compile</scope>
+		</dependency>
+
+
+		<!--
+		<dependency>
+			<groupId>org.antlr</groupId>
+			<artifactId>antlr4</artifactId>
+			<version>${antlr.version}</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		-->
+
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<version>${bundle.plugin.version}</version>
+				<extensions>true</extensions>
+				<configuration>
+					<instructions>
+						<Bundle-Activator>org.openecomp.sdnc.sli.provider.SvcLogicActivator</Bundle-Activator>
+						<Export-Package>org.openecomp.sdnc.sli.provider;version=${project.version}</Export-Package>
+
+						<DynamicImport-Package>*</DynamicImport-Package>
+					    <!--
+						<Import-Package>org.openecomp.sdnc.sli.*,org.osgi.framework.*,org.slf4j.*,com.vmware.vim25.*,org.apache.xerces.*,com.mysql.jdbc.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.bind.*</Import-Package>
+                        -->
+
+                        <Import-Package>org.openecomp.sdnc.sli;version="${project.version}",*</Import-Package>
+                        <!--
+						<Embed-Dependency>*;scope=compile|runtime;artifactId=!sli-common|org.eclipse.osgi|jcl-over-slf4j|xml-apis|mysql-connector-java</Embed-Dependency>
+						-->
+						<Embed-Dependency>*;scope=compile;artifactId=commons-lang|commons-lang3</Embed-Dependency>
+
+						<Embed-Transitive>true</Embed-Transitive>
+					</instructions>
+
+
+				</configuration>
+
+			</plugin>
+		</plugins>
+	</build>
+	<description>SLI Provider is the OSGi bundle that exposes the service logic interpreter as a service.</description>
+</project>
diff --git a/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/BlockNodeExecutor.java b/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/BlockNodeExecutor.java
new file mode 100644
index 00000000..f83154d9
--- /dev/null
+++ b/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/BlockNodeExecutor.java
@@ -0,0 +1,75 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdnc.sli.provider;
+
+import org.openecomp.sdnc.sli.SvcLogicContext;
+import org.openecomp.sdnc.sli.SvcLogicException;
+import org.openecomp.sdnc.sli.SvcLogicExpression;
+import org.openecomp.sdnc.sli.SvcLogicNode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class BlockNodeExecutor extends SvcLogicNodeExecutor {
+
+	private static final Logger LOG = LoggerFactory
+			.getLogger(BlockNodeExecutor.class);
+	
+	@Override
+	public SvcLogicNode execute(SvcLogicServiceImpl svc, SvcLogicNode node, SvcLogicContext ctx)
+			throws SvcLogicException {
+
+		SvcLogicExpression atomicExpr = node.getAttribute("atomic");
+		String atomicStr = SvcLogicExpressionResolver.evaluate(atomicExpr, node, ctx);
+		boolean isAtomic = "true".equalsIgnoreCase(atomicStr);
+		
+		// Initialize status to success so that at least one outcome will execute
+		ctx.setStatus("success");
+		
+		int numOutcomes = node.getNumOutcomes();
+
+		for (int i = 0; i < numOutcomes; i++) {
+			if ("failure".equals(ctx.getStatus()) && isAtomic) {
+				LOG.info("Block - stopped executing nodes due to failure status");
+				return(null);
+			}
+			
+			SvcLogicNode nextNode = node.getOutcomeValue("" + (i + 1));
+			if (nextNode != null) {
+				if (LOG.isDebugEnabled()) {
+					LOG.debug("Block - executing outcome " + (i + 1));
+				}
+				while (nextNode != null)
+				{
+				       nextNode = svc.executeNode(nextNode, ctx);
+				}
+			} else {
+				if (LOG.isDebugEnabled()) {
+					LOG.debug("Block - done: no outcome " + (i + 1));
+				}
+			}
+		}
+
+		return (null);
+	}
+
+
+}
diff --git a/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/BreakNodeExecutor.java b/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/BreakNodeExecutor.java
new file mode 100644
index 00000000..0f8719c8
--- /dev/null
+++ b/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/BreakNodeExecutor.java
@@ -0,0 +1,42 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdnc.sli.provider;
+
+import org.openecomp.sdnc.sli.BreakNodeException;
+import org.openecomp.sdnc.sli.SvcLogicContext;
+import org.openecomp.sdnc.sli.SvcLogicException;
+import org.openecomp.sdnc.sli.SvcLogicNode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class BreakNodeExecutor extends SvcLogicNodeExecutor {
+
+    private static final Logger LOG = LoggerFactory.getLogger(BreakNodeExecutor.class);
+
+    @Override
+    public SvcLogicNode execute(SvcLogicServiceImpl svc, SvcLogicNode node, SvcLogicContext ctx) throws SvcLogicException {
+        String message = "BreakNodeExecutor encountered break with nodeId " + node.getNodeId();
+        LOG.debug(message);
+        throw new BreakNodeException(message);
+    }
+
+}
diff --git a/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/CallNodeExecutor.java b/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/CallNodeExecutor.java
new file mode 100644
index 00000000..7b79c19f
--- /dev/null
+++ b/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/CallNodeExecutor.java
@@ -0,0 +1,165 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdnc.sli.provider;
+
+import org.openecomp.sdnc.sli.SvcLogicContext;
+import org.openecomp.sdnc.sli.SvcLogicException;
+import org.openecomp.sdnc.sli.SvcLogicExpression;
+import org.openecomp.sdnc.sli.SvcLogicGraph;
+import org.openecomp.sdnc.sli.SvcLogicNode;
+import org.openecomp.sdnc.sli.SvcLogicStore;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class CallNodeExecutor extends SvcLogicNodeExecutor {
+
+	private static final Logger LOG = LoggerFactory
+			.getLogger(CallNodeExecutor.class);
+	
+	@Override
+	public SvcLogicNode execute(SvcLogicServiceImpl svc, SvcLogicNode node, SvcLogicContext ctx)
+			throws SvcLogicException {
+
+		String outValue = "not-found";
+		
+		SvcLogicGraph myGraph = node.getGraph();
+		
+		if (myGraph == null)
+		{
+			LOG.debug("execute: getGraph returned null");
+		}
+		else
+		{
+			LOG.debug("execute: got SvcLogicGraph");
+		}
+		
+		SvcLogicExpression moduleExpr = null;
+		
+		String module = null;
+		
+		moduleExpr = node.getAttribute("module");
+		if (moduleExpr != null)
+		{
+			module  = SvcLogicExpressionResolver.evaluate(moduleExpr, node, ctx);
+		}
+		
+		if ((module == null) || (module.length() == 0))
+		{
+			if (myGraph != null)
+			{
+				module = myGraph.getModule();
+				LOG.debug("myGraph.getModule() returned "+module);
+			}
+		}
+		
+		SvcLogicExpression rpcExpr = null;
+		String rpc = null;
+		rpcExpr = node.getAttribute("rpc");
+		if (rpcExpr != null)
+		{
+			rpc  = SvcLogicExpressionResolver.evaluate(rpcExpr, node, ctx);
+		}
+		
+		if ((rpc == null) || (rpc.length() == 0))
+		{
+			if (myGraph != null)
+			{
+				rpc = myGraph.getRpc();
+				LOG.debug("myGraph.getRpc() returned "+rpc);
+			}
+		}
+		
+		String mode = null;
+		
+		moduleExpr = node.getAttribute("mode");
+		if (moduleExpr != null)
+		{
+			mode  = SvcLogicExpressionResolver.evaluate(moduleExpr, node, ctx);
+		}
+
+		if ((mode == null) || (mode.length() == 0))
+		{
+			if (myGraph != null)
+			{
+				mode = myGraph.getMode();
+
+				LOG.debug("myGraph.getMode() returned "+mode);
+			}
+		}
+		
+		String version = null;
+		
+		moduleExpr = node.getAttribute("version");
+		if (moduleExpr != null)
+		{
+			version  = SvcLogicExpressionResolver.evaluate(moduleExpr, node, ctx);
+		}
+
+		String parentGraph = ctx.getAttribute("currentGraph");
+        ctx.setAttribute("parentGraph", parentGraph);
+		
+		SvcLogicStore store = getStore();
+		
+        if (store != null) {
+			SvcLogicGraph calledGraph = store.fetch(module, rpc, version, mode);
+            LOG.debug("Parent " + parentGraph + " is calling child " + calledGraph.toString());
+            ctx.setAttribute("currentGraph", calledGraph.toString());
+            if (calledGraph != null) {
+				svc.execute(calledGraph, ctx);
+				
+				outValue = ctx.getStatus();
+            } else {
+                LOG.error("Could not find service logic for [" + module + "," + rpc + "," + version + "," + mode + "]");
+			}
+		}
+		else
+		{
+			LOG.debug("Could not get SvcLogicStore reference");
+		}
+		
+		SvcLogicNode nextNode = node.getOutcomeValue(outValue);
+		if (nextNode != null) {
+			if (LOG.isDebugEnabled()) {
+				LOG.debug("about to execute " + outValue + " branch");
+			}
+            ctx.setAttribute("currentGraph", parentGraph);
+			return (nextNode);
+		}
+
+		nextNode = node.getOutcomeValue("Other");
+		if (nextNode != null) {
+			if (LOG.isDebugEnabled()) {
+				LOG.debug("about to execute Other branch");
+			}
+		} else {
+			if (LOG.isDebugEnabled()) {
+				LOG.debug("no " + outValue + " or Other branch found");
+			}
+		}
+        ctx.setAttribute("currentGraph", parentGraph);
+        ctx.setAttribute("parentGraph", null);
+
+		return (nextNode);
+
+	}
+
+}
diff --git a/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/ConfigureNodeExecutor.java b/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/ConfigureNodeExecutor.java
new file mode 100644
index 00000000..a3f2874f
--- /dev/null
+++ b/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/ConfigureNodeExecutor.java
@@ -0,0 +1,248 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdnc.sli.provider;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+
+import org.openecomp.sdnc.sli.SvcLogicAdaptor;
+import org.openecomp.sdnc.sli.SvcLogicContext;
+import org.openecomp.sdnc.sli.SvcLogicException;
+import org.openecomp.sdnc.sli.SvcLogicExpression;
+import org.openecomp.sdnc.sli.SvcLogicNode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ConfigureNodeExecutor extends SvcLogicNodeExecutor {
+	private static final Logger LOG = LoggerFactory
+			.getLogger(ConfigureNodeExecutor.class);
+
+	public SvcLogicNode execute(SvcLogicServiceImpl svc, SvcLogicNode node,
+			SvcLogicContext ctx) throws SvcLogicException {
+
+		String adaptorName = SvcLogicExpressionResolver.evaluate(
+				node.getAttribute("adaptor"), node, ctx);
+		String outValue = "failure";
+
+		if (LOG.isDebugEnabled()) {
+			LOG.debug("configure node encountered - looking for adaptor "
+					+ adaptorName);
+		}
+
+		SvcLogicAdaptor adaptor = getAdaptor(adaptorName);
+
+		if (adaptor != null) {
+			String activate = SvcLogicExpressionResolver.evaluate(
+					node.getAttribute("activate"), node, ctx);
+			String key = SvcLogicExpressionResolver.evaluate(
+					node.getAttribute("key"), node, ctx);
+
+			Map<String, String> parmMap = new HashMap<String, String>();
+
+			Set<Map.Entry<String, SvcLogicExpression>> parmSet = node
+					.getParameterSet();
+			boolean hasParms = false;
+
+			for (Iterator<Map.Entry<String, SvcLogicExpression>> iter = parmSet
+					.iterator(); iter.hasNext();) {
+				hasParms = true;
+				Map.Entry<String, SvcLogicExpression> curEnt = iter.next();
+				String curName = curEnt.getKey();
+				SvcLogicExpression curExpr = curEnt.getValue();
+				String curExprValue = SvcLogicExpressionResolver.evaluate(curExpr, node, ctx);
+				
+				LOG.debug("Parameter "+curName+" = "+curExpr.asParsedExpr()+" resolves to "+curExprValue);
+
+				parmMap.put(curName,curExprValue);
+			}
+
+			if (hasParms) {
+				SvcLogicAdaptor.ConfigStatus confStatus = SvcLogicAdaptor.ConfigStatus.FAILURE;
+				
+				try {
+					confStatus = adaptor.configure(key, parmMap, ctx);
+				} catch (Exception e) {
+					LOG.warn("Caught exception from "+adaptorName+".configure", e);
+					confStatus = SvcLogicAdaptor.ConfigStatus.FAILURE;
+				}
+				
+				switch (confStatus) {
+				case SUCCESS:
+					outValue = "success";
+					if ((activate != null) && (activate.length() > 0)) {
+						if ("true".equalsIgnoreCase(activate)) {
+							SvcLogicAdaptor.ConfigStatus activateStatus = SvcLogicAdaptor.ConfigStatus.FAILURE;
+							
+							try {
+								activateStatus = adaptor.activate(key, ctx);
+							} catch (Exception e) {
+
+								LOG.warn("Caught exception from "+adaptorName+".activate", e);
+								activateStatus = SvcLogicAdaptor.ConfigStatus.FAILURE;
+							}
+							switch (activateStatus) {
+							case SUCCESS:
+								break;
+							case ALREADY_ACTIVE:
+								outValue = "already-active";
+								break;
+							case NOT_FOUND:
+								outValue = "not-found";
+								break;
+							case NOT_READY:
+								outValue = "not-ready";
+								break;
+							case FAILURE:
+							default:
+								outValue = "failure";
+							}
+						} else if ("false".equalsIgnoreCase(activate)) {
+							SvcLogicAdaptor.ConfigStatus deactivateStatus = SvcLogicAdaptor.ConfigStatus.FAILURE;
+							
+							try {
+								deactivateStatus = adaptor.deactivate(key, ctx);
+							} catch (Exception e) {
+
+								LOG.warn("Caught exception from "+adaptorName+".deactivate", e);
+								deactivateStatus = SvcLogicAdaptor.ConfigStatus.FAILURE;
+							}
+							switch (deactivateStatus) {
+							case SUCCESS:
+								break;
+							case ALREADY_ACTIVE:
+								outValue = "already-active";
+								break;
+							case NOT_FOUND:
+								outValue = "not-found";
+								break;
+							case NOT_READY:
+								outValue = "not-ready";
+								break;
+							case FAILURE:
+							default:
+								outValue = "failure";
+							}
+						}
+					}
+					break;
+				case ALREADY_ACTIVE:
+					outValue = "already-active";
+					break;
+				case NOT_FOUND:
+					outValue = "not-found";
+					break;
+				case NOT_READY:
+					outValue = "not-ready";
+					break;
+				case FAILURE:
+				default:
+					outValue = "failure";
+				}
+			} else {
+				if ((activate != null) && (activate.length() > 0)) {
+					if ("true".equalsIgnoreCase(activate)) {
+						SvcLogicAdaptor.ConfigStatus activateStatus = SvcLogicAdaptor.ConfigStatus.FAILURE;
+						try {
+							activateStatus = adaptor.activate(key, ctx);
+						} catch (Exception e) {
+							LOG.warn("Caught exception from "+adaptorName+".activate", e);
+							activateStatus = SvcLogicAdaptor.ConfigStatus.FAILURE;
+						}
+						switch (activateStatus) {
+						case SUCCESS:
+							outValue = "success";
+							break;
+						case ALREADY_ACTIVE:
+							outValue = "already-active";
+							break;
+						case NOT_FOUND:
+							outValue = "not-found";
+							break;
+						case NOT_READY:
+							outValue = "not-ready";
+							break;
+						case FAILURE:
+						default:
+							outValue = "failure";
+						}
+					} else if ("false".equalsIgnoreCase(activate)) {
+						SvcLogicAdaptor.ConfigStatus deactivateStatus = SvcLogicAdaptor.ConfigStatus.FAILURE;
+						
+						try {
+							deactivateStatus = adaptor.deactivate(key, ctx);
+						} catch (Exception e) {
+							LOG.warn("Caught exception from "+adaptorName+".deactivate", e);
+							deactivateStatus = SvcLogicAdaptor.ConfigStatus.FAILURE;
+						}
+						switch (deactivateStatus) {
+						case SUCCESS:
+							outValue = "success";
+							break;
+						case ALREADY_ACTIVE:
+							outValue = "already-active";
+							break;
+						case NOT_FOUND:
+							outValue = "not-found";
+							break;
+						case NOT_READY:
+							outValue = "not-ready";
+							break;
+						case FAILURE:
+						default:
+							outValue = "failure";
+						}
+					}
+				} else {
+					LOG.warn("Nothing to configure - no parameters passed, and activate attribute is not set");
+					outValue = "success";
+				}
+			}
+		} else {
+			if (LOG.isWarnEnabled()) {
+				LOG.warn("Adaptor for " + adaptorName + " not found");
+			}
+		}
+
+		SvcLogicNode nextNode = node.getOutcomeValue(outValue);
+		if (nextNode != null) {
+			if (LOG.isDebugEnabled()) {
+				LOG.debug("about to execute " + outValue + " branch");
+			}
+			return (nextNode);
+		}
+
+		nextNode = node.getOutcomeValue("Other");
+		if (nextNode != null) {
+			if (LOG.isDebugEnabled()) {
+				LOG.debug("about to execute Other branch");
+			}
+		} else {
+			if (LOG.isDebugEnabled()) {
+				LOG.debug("no " + outValue + " or Other branch found");
+			}
+		}
+		return (nextNode);
+	}
+
+}
diff --git a/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/DeleteNodeExecutor.java b/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/DeleteNodeExecutor.java
new file mode 100644
index 00000000..081cbcfa
--- /dev/null
+++ b/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/DeleteNodeExecutor.java
@@ -0,0 +1,101 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdnc.sli.provider;
+
+import org.openecomp.sdnc.sli.SvcLogicContext;
+import org.openecomp.sdnc.sli.SvcLogicException;
+import org.openecomp.sdnc.sli.SvcLogicNode;
+import org.openecomp.sdnc.sli.SvcLogicResource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class DeleteNodeExecutor extends SvcLogicNodeExecutor {
+
+	private static final Logger LOG = LoggerFactory
+			.getLogger(DeleteNodeExecutor.class);
+	@Override
+	public SvcLogicNode execute(SvcLogicServiceImpl svc, SvcLogicNode node,
+			SvcLogicContext ctx) throws SvcLogicException {
+
+		String plugin = SvcLogicExpressionResolver.evaluate(
+				node.getAttribute("plugin"), node, ctx);
+		String resourceType = SvcLogicExpressionResolver.evaluate(
+				node.getAttribute("resource"), node, ctx);
+		String key = SvcLogicExpressionResolver.evaluateAsKey(
+				node.getAttribute("key"), node, ctx);
+
+		String outValue = "failure";
+
+		if (LOG.isDebugEnabled()) {
+			LOG.debug("delete node encountered - looking for resource class "
+					+ plugin);
+		}
+
+
+		SvcLogicResource resourcePlugin = getSvcLogicResource(plugin);
+			if (resourcePlugin != null) {
+
+				try {
+
+					switch (resourcePlugin.delete(resourceType, key, ctx)) {
+					case SUCCESS:
+						outValue = "success";
+						break;
+					case NOT_FOUND:
+						outValue = "not-found";
+						break;
+					case FAILURE:
+					default:
+						outValue = "failure";
+					}
+				} catch (SvcLogicException e) {
+					LOG.error("Caught exception from resource plugin", e);
+					outValue = "failure";
+				}
+			} else {
+				LOG.warn("Could not find SvcLogicResource object for plugin "
+						+ plugin);
+			}
+
+
+		SvcLogicNode nextNode = node.getOutcomeValue(outValue);
+		if (nextNode != null) {
+			if (LOG.isDebugEnabled()) {
+				LOG.debug("about to execute " + outValue + " branch");
+			}
+			return (nextNode);
+		}
+
+		nextNode = node.getOutcomeValue("Other");
+		if (nextNode != null) {
+			if (LOG.isDebugEnabled()) {
+				LOG.debug("about to execute Other branch");
+			}
+		} else {
+			if (LOG.isDebugEnabled()) {
+				LOG.debug("no "+outValue+" or Other branch found");
+			}
+		}
+		return (nextNode);
+	}
+
+}
diff --git a/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/ExecuteNodeExecutor.java b/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/ExecuteNodeExecutor.java
new file mode 100644
index 00000000..7ae4d0db
--- /dev/null
+++ b/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/ExecuteNodeExecutor.java
@@ -0,0 +1,161 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdnc.sli.provider;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+
+import org.openecomp.sdnc.sli.SvcLogicContext;
+import org.openecomp.sdnc.sli.SvcLogicException;
+import org.openecomp.sdnc.sli.SvcLogicExpression;
+import org.openecomp.sdnc.sli.SvcLogicJavaPlugin;
+import org.openecomp.sdnc.sli.SvcLogicNode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ExecuteNodeExecutor extends SvcLogicNodeExecutor {
+	private static final Logger LOG = LoggerFactory
+			.getLogger(ExecuteNodeExecutor.class);
+
+	private static final String pluginErrorMessage = "Could not execute plugin. SvcLogic status will be set to failure.";
+	public SvcLogicNode execute(SvcLogicServiceImpl svc, SvcLogicNode node,
+			SvcLogicContext ctx) throws SvcLogicException {
+
+		String pluginName = SvcLogicExpressionResolver.evaluate(
+				node.getAttribute("plugin"), node, ctx);
+		String outValue = "failure";
+
+		if (LOG.isDebugEnabled()) {
+			LOG.debug("execute node encountered - looking for plugin "
+					+ pluginName);
+		}
+
+        SvcLogicJavaPlugin plugin  = getSvcLogicJavaPlugin(pluginName);
+
+		if (plugin == null) {
+			outValue = "not-found";
+		} else {
+
+			String methodName = evaluate(node.getAttribute("method"),  node, ctx);
+
+			Class pluginClass = plugin.getClass();
+
+			Method pluginMethod = null;
+
+			try {
+				pluginMethod = pluginClass.getMethod(methodName, Map.class, SvcLogicContext.class);
+			} catch (NoSuchMethodException e) {
+				LOG.error(pluginErrorMessage, e);
+			}
+
+			if (pluginMethod == null) {
+				outValue = "unsupported-method";
+			} else {
+				try {
+
+					Map<String, String> parmMap = new HashMap<String, String>();
+
+					Set<Map.Entry<String, SvcLogicExpression>> parmSet = node
+							.getParameterSet();
+
+					for (Iterator<Map.Entry<String, SvcLogicExpression>> iter = parmSet
+							.iterator(); iter.hasNext();) {
+						Map.Entry<String, SvcLogicExpression> curEnt = iter.next();
+						String curName = curEnt.getKey();
+						SvcLogicExpression curExpr = curEnt.getValue();
+						String curExprValue = SvcLogicExpressionResolver.evaluate(curExpr, node, ctx);
+
+						LOG.debug("Parameter "+curName+" = "+curExpr.asParsedExpr()+" resolves to "+curExprValue);
+
+						parmMap.put(curName,curExprValue);
+					}
+
+					Object o = pluginMethod.invoke(plugin, parmMap, ctx);
+			        String emitsOutcome = SvcLogicExpressionResolver.evaluate(node.getAttribute("emitsOutcome"),  node, ctx);
+
+					outValue = mapOutcome(o, emitsOutcome);
+
+				} catch (InvocationTargetException e) {
+				    if(e.getCause() != null){
+	                    LOG.error(pluginErrorMessage, e.getCause());
+				    }else{
+					LOG.error(pluginErrorMessage, e);
+				    }
+					outValue = "failure";
+					ctx.setStatus("failure");
+				} catch (IllegalAccessException e) {
+                    LOG.error(pluginErrorMessage, e);
+                    outValue = "failure";
+                    ctx.setStatus("failure");
+                } catch (IllegalArgumentException e) {
+                    LOG.error(pluginErrorMessage, e);
+                    outValue = "failure";
+                    ctx.setStatus("failure");
+                }
+			}
+
+		}
+
+		SvcLogicNode nextNode = node.getOutcomeValue(outValue);
+		if (nextNode != null) {
+			if (LOG.isDebugEnabled()) {
+				LOG.debug("about to execute " + outValue + " branch");
+			}
+			return (nextNode);
+		}
+
+		nextNode = node.getOutcomeValue("Other");
+		if (nextNode != null) {
+			if (LOG.isDebugEnabled()) {
+				LOG.debug("about to execute Other branch");
+			}
+		} else {
+			if (LOG.isDebugEnabled()) {
+				LOG.debug("no " + outValue + " or Other branch found");
+			}
+		}
+		return (nextNode);
+	}
+
+	protected String evaluate(SvcLogicExpression expr, SvcLogicNode node, SvcLogicContext ctx) throws SvcLogicException {
+        return SvcLogicExpressionResolver.evaluate(node.getAttribute("method"), node, ctx);
+    }
+
+    public String mapOutcome(Object o, String emitsOutcome) {
+        if (emitsOutcome != null) {
+            Boolean nodeEmitsOutcome = Boolean.valueOf(emitsOutcome);
+            if (nodeEmitsOutcome) {
+                return (String) o;
+            } else {
+                return "success";
+            }
+
+        } else {
+            return "success";
+        }
+    }
+
+}
diff --git a/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/ExistsNodeExecutor.java b/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/ExistsNodeExecutor.java
new file mode 100644
index 00000000..688a86e5
--- /dev/null
+++ b/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/ExistsNodeExecutor.java
@@ -0,0 +1,105 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdnc.sli.provider;
+
+import org.openecomp.sdnc.sli.SvcLogicContext;
+import org.openecomp.sdnc.sli.SvcLogicException;
+import org.openecomp.sdnc.sli.SvcLogicNode;
+import org.openecomp.sdnc.sli.SvcLogicResource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ExistsNodeExecutor extends SvcLogicNodeExecutor {
+
+	private static final Logger LOG = LoggerFactory
+			.getLogger(ExistsNodeExecutor.class);
+	@Override
+	public SvcLogicNode execute(SvcLogicServiceImpl svc, SvcLogicNode node,
+			SvcLogicContext ctx) throws SvcLogicException {
+
+		String plugin = SvcLogicExpressionResolver.evaluate(
+				node.getAttribute("plugin"), node, ctx);
+		String resourceType = SvcLogicExpressionResolver.evaluate(
+				node.getAttribute("resource"), node, ctx);
+		String key = SvcLogicExpressionResolver.evaluateAsKey(
+				node.getAttribute("key"), node, ctx);
+		String pfx = SvcLogicExpressionResolver.evaluate(
+				node.getAttribute("pfx"), node, ctx);
+
+		String outValue = "failure";
+
+		if (LOG.isDebugEnabled()) {
+			LOG.debug("exists node encountered - looking for resource class "
+					+ plugin);
+		}
+
+
+
+			SvcLogicResource resourcePlugin = getSvcLogicResource(plugin);
+
+			if (resourcePlugin != null) {
+
+				try {
+
+					switch (resourcePlugin.exists(resourceType, key, pfx, ctx)) {
+					case SUCCESS:
+						outValue = "true";
+						break;
+					case NOT_FOUND:
+						outValue = "false";
+						break;
+					case FAILURE:
+					default:
+						outValue = "false";
+					}
+				} catch (SvcLogicException e) {
+					LOG.error("Caught exception from resource plugin", e);
+					outValue = "failure";
+				}
+			} else {
+				LOG.warn("Could not find SvcLogicResource object for plugin "
+						+ plugin);
+			}
+
+		SvcLogicNode nextNode = node.getOutcomeValue(outValue);
+		if (nextNode != null) {
+			if (LOG.isDebugEnabled()) {
+				LOG.debug("about to execute " + outValue + " branch");
+			}
+			return (nextNode);
+		}
+
+		nextNode = node.getOutcomeValue("Other");
+		if (nextNode != null) {
+			if (LOG.isDebugEnabled()) {
+				LOG.debug("about to execute Other branch");
+			}
+		} else {
+			if (LOG.isDebugEnabled()) {
+
+				LOG.debug("no "+outValue+" or Other branch found");
+			}
+		}
+		return (nextNode);
+	}
+
+}
diff --git a/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/ForNodeExecutor.java b/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/ForNodeExecutor.java
new file mode 100644
index 00000000..e9fdc55e
--- /dev/null
+++ b/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/ForNodeExecutor.java
@@ -0,0 +1,109 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdnc.sli.provider;
+
+import org.openecomp.sdnc.sli.BreakNodeException;
+import org.openecomp.sdnc.sli.SvcLogicContext;
+import org.openecomp.sdnc.sli.SvcLogicException;
+import org.openecomp.sdnc.sli.SvcLogicExpression;
+import org.openecomp.sdnc.sli.SvcLogicNode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ForNodeExecutor extends SvcLogicNodeExecutor {
+
+	private static final Logger LOG = LoggerFactory
+			.getLogger(ForNodeExecutor.class);
+
+	@Override
+	public SvcLogicNode execute(SvcLogicServiceImpl svc, SvcLogicNode node,
+			SvcLogicContext ctx) throws SvcLogicException {
+
+		SvcLogicExpression atomicExpr = node.getAttribute("atomic");
+		String atomicStr = SvcLogicExpressionResolver.evaluate(atomicExpr, node, ctx);
+		boolean isAtomic = !("false".equalsIgnoreCase(atomicStr));
+
+		int numOutcomes = node.getNumOutcomes();
+		String idxVar = SvcLogicExpressionResolver.evaluate(
+				node.getAttribute("index"), node, ctx);
+		String startVal = SvcLogicExpressionResolver.evaluate(
+				node.getAttribute("start"), node, ctx);
+		String endVal = SvcLogicExpressionResolver.evaluate(
+				node.getAttribute("end"), node, ctx);
+
+		LOG.debug("Executing "+ (isAtomic ? "atomic" : "non-atomic") + " for loop - for (int " + idxVar + " = " + startVal
+				+ "; " + idxVar + " < " + endVal + "; " + idxVar + "++)");
+
+		int startIdx = 0;
+		int endIdx = 0;
+
+		try {
+			startIdx = Integer.parseInt(startVal);
+			endIdx = Integer.parseInt(endVal);
+		} catch (NumberFormatException e) {
+			SvcLogicExpression silentFailureExpr = node.getAttribute("silentFailure");
+			String silentFailure = SvcLogicExpressionResolver.evaluate(silentFailureExpr, node, ctx);
+			boolean isSilentFailure = Boolean.parseBoolean(silentFailure);
+			String message = "Invalid index values [" + startVal + "," + endVal + "]";
+			if(!isSilentFailure){
+			throw new SvcLogicException(message);
+			}else{
+			    LOG.debug(message + ". Not exiting because silentFailure was set to true.");
+			    return(null);
+			}
+		}
+
+        try {
+		for (int ctr = startIdx; ctr < endIdx; ctr++) {
+
+			ctx.setAttribute(idxVar, "" + ctr);
+
+			for (int i = 0; i < numOutcomes; i++) {
+
+				if ("failure".equals(ctx.getStatus()) && isAtomic) {
+					LOG.info("For - stopped executing nodes due to failure status");
+					return(null);
+				}
+
+				SvcLogicNode nextNode = node.getOutcomeValue("" + (i + 1));
+				if (nextNode != null) {
+					if (LOG.isDebugEnabled()) {
+						LOG.debug("For  - executing outcome " + (i + 1));
+					}
+					SvcLogicNode innerNextNode = nextNode;
+					while (innerNextNode != null) {
+						innerNextNode = svc.executeNode(innerNextNode, ctx);
+					}
+				} else {
+					if (LOG.isDebugEnabled()) {
+						LOG.debug("For - done: no outcome " + (i + 1));
+					}
+				}
+			}
+		}
+        } catch (BreakNodeException br) {
+            LOG.debug("ForNodeExecutor caught break");
+        }
+		return (null);
+	}
+
+}
diff --git a/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/GetResourceNodeExecutor.java b/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/GetResourceNodeExecutor.java
new file mode 100644
index 00000000..d431a18a
--- /dev/null
+++ b/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/GetResourceNodeExecutor.java
@@ -0,0 +1,134 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdnc.sli.provider;
+
+import org.openecomp.sdnc.sli.SvcLogicContext;
+import org.openecomp.sdnc.sli.SvcLogicException;
+import org.openecomp.sdnc.sli.SvcLogicExpression;
+import org.openecomp.sdnc.sli.SvcLogicNode;
+import org.openecomp.sdnc.sli.SvcLogicResource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class GetResourceNodeExecutor extends SvcLogicNodeExecutor {
+
+	private static final Logger LOG = LoggerFactory
+			.getLogger(GetResourceNodeExecutor.class);
+	
+	public SvcLogicNode execute(SvcLogicServiceImpl svc, SvcLogicNode node,
+			SvcLogicContext ctx) throws SvcLogicException {
+
+		String plugin = SvcLogicExpressionResolver.evaluate(
+				node.getAttribute("plugin"), node, ctx);
+		String resourceType = SvcLogicExpressionResolver.evaluate(
+				node.getAttribute("resource"), node, ctx);
+		String key = SvcLogicExpressionResolver.evaluateAsKey(
+				node.getAttribute("key"), node, ctx);
+		String pfx = SvcLogicExpressionResolver.evaluate(
+				node.getAttribute("pfx"), node, ctx);
+
+		String localOnlyStr = SvcLogicExpressionResolver.evaluate(
+				node.getAttribute("local-only"), node, ctx);
+
+		// Note: for get-resource, only refresh from A&AI if the DG explicitly set
+		// local-only to false.  Otherwise, just read from local database.
+		boolean localOnly = true;
+		
+		if ("false".equalsIgnoreCase(localOnlyStr)) {
+			localOnly = false;
+		} 
+
+		SvcLogicExpression selectExpr = node.getAttribute("select");
+		String select = null;
+
+		if (selectExpr != null) {
+			select = SvcLogicExpressionResolver.evaluateAsKey(selectExpr, node,
+					ctx);
+		}
+		
+		SvcLogicExpression orderByExpr = node.getAttribute("order-by");
+		String orderBy = null;
+
+		if (orderByExpr != null) {
+			orderBy = SvcLogicExpressionResolver.evaluateAsKey(orderByExpr, node,
+					ctx);
+		}
+
+		String outValue = "failure";
+
+		if (LOG.isDebugEnabled()) {
+			LOG.debug(node.getNodeType()
+					+ " node encountered - looking for resource class "
+					+ plugin);
+		}
+
+
+			SvcLogicResource resourcePlugin = getSvcLogicResource(plugin);
+
+			if (resourcePlugin != null) {
+
+				try {
+					switch (resourcePlugin.query(resourceType, localOnly, select, key,
+							pfx, orderBy, ctx)) {
+					case SUCCESS:
+						outValue = "success";
+						break;
+					case NOT_FOUND:
+						outValue = "not-found";
+						break;
+					case FAILURE:
+					default:
+						outValue = "failure";
+					}
+				} catch (SvcLogicException e) {
+					LOG.error("Caught exception from resource plugin", e);
+					outValue = "failure";
+				}
+			} else {
+				LOG.warn("Could not find SvcLogicResource object for plugin "
+						+ plugin);
+			}
+
+
+		SvcLogicNode nextNode = node.getOutcomeValue(outValue);
+		if (nextNode != null) {
+			if (LOG.isDebugEnabled()) {
+				LOG.debug("about to execute " + outValue + " branch");
+			}
+			return (nextNode);
+		}
+
+		nextNode = node.getOutcomeValue("Other");
+		if (nextNode != null) {
+			if (LOG.isDebugEnabled()) {
+				LOG.debug("about to execute Other branch");
+			}
+		} else {
+			if (LOG.isDebugEnabled()) {
+
+				LOG.debug("no "+outValue+" or Other branch found");
+			}
+		}
+		return (nextNode);
+	}
+
+}
diff --git a/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/IsAvailableNodeExecutor.java b/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/IsAvailableNodeExecutor.java
new file mode 100644
index 00000000..0df73682
--- /dev/null
+++ b/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/IsAvailableNodeExecutor.java
@@ -0,0 +1,103 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdnc.sli.provider;
+
+import org.openecomp.sdnc.sli.SvcLogicContext;
+import org.openecomp.sdnc.sli.SvcLogicException;
+import org.openecomp.sdnc.sli.SvcLogicNode;
+import org.openecomp.sdnc.sli.SvcLogicResource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class IsAvailableNodeExecutor extends SvcLogicNodeExecutor {
+
+	private static final Logger LOG = LoggerFactory
+			.getLogger(IsAvailableNodeExecutor.class);
+	
+	@Override
+	public SvcLogicNode execute(SvcLogicServiceImpl svc, SvcLogicNode node,
+			SvcLogicContext ctx) throws SvcLogicException {
+
+		String plugin = SvcLogicExpressionResolver.evaluate(
+				node.getAttribute("plugin"), node, ctx);
+		String resourceType = SvcLogicExpressionResolver.evaluate(
+				node.getAttribute("resource"), node, ctx);
+		String key = SvcLogicExpressionResolver.evaluateAsKey(
+				node.getAttribute("key"), node, ctx);
+		String pfx = SvcLogicExpressionResolver.evaluate(
+				node.getAttribute("pfx"), node, ctx);
+
+		String outValue = "failure";
+
+		if (LOG.isDebugEnabled()) {
+			LOG.debug("is-available node encountered - looking for resource class "
+					+ plugin);
+		}
+
+            SvcLogicResource resourcePlugin = getSvcLogicResource(plugin);
+
+
+			if (resourcePlugin != null) {
+				try {
+					switch (resourcePlugin.isAvailable(resourceType, key, pfx, ctx)) {
+					case SUCCESS:
+						outValue = "true";
+						break;
+					case NOT_FOUND:
+						outValue = "false";
+						break;
+					case FAILURE:
+					default:
+						outValue = "false";
+					}
+				} catch (SvcLogicException e) {
+					LOG.error("Caught exception from resource plugin", e);
+					outValue = "failure";
+				}
+			} else {
+				LOG.warn("Could not find SvcLogicResource object for plugin "
+						+ plugin);
+			}
+
+		SvcLogicNode nextNode = node.getOutcomeValue(outValue);
+		if (nextNode != null) {
+			if (LOG.isDebugEnabled()) {
+				LOG.debug("about to execute " + outValue + " branch");
+			}
+			return (nextNode);
+		}
+
+		nextNode = node.getOutcomeValue("Other");
+		if (nextNode != null) {
+			if (LOG.isDebugEnabled()) {
+				LOG.debug("about to execute Other branch");
+			}
+		} else {
+			if (LOG.isDebugEnabled()) {
+
+				LOG.debug("no "+outValue+" or Other branch found");
+			}
+		}
+		return (nextNode);
+	}
+
+}
diff --git a/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/MdsalHelper.java b/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/MdsalHelper.java
new file mode 100644
index 00000000..4c5ee068
--- /dev/null
+++ b/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/MdsalHelper.java
@@ -0,0 +1,1186 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdnc.sli.provider;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PrintStream;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Properties;
+
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.IpAddress;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.IpAddressBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.IpPrefix;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.IpPrefixBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv4Address;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv6Address;
+import org.opendaylight.yangtools.yang.binding.Identifier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class MdsalHelper {
+
+    private static final Logger LOG = LoggerFactory.getLogger(MdsalHelper.class);
+    private static Properties yangMappingProperties = new Properties();
+
+    @Deprecated
+    public static void setProperties(Properties input) {
+        setYangMappingProperties(input);
+    }
+    
+    public static void setYangMappingProperties(Properties properties) {
+        for (Object propNameObj : properties.keySet()) {
+            String propName = (String) propNameObj;
+            MdsalHelper.yangMappingProperties.setProperty(propName, properties.getProperty(propName));
+        }
+    }
+
+    public static void loadProperties(String propertiesFile) {
+	File file = new File(propertiesFile);
+	Properties properties = new Properties();
+	InputStream input = null;
+	if (file.isFile() && file.canRead()) {
+	    try {
+		input = new FileInputStream(file);
+		properties.load(input);
+		MdsalHelper.setYangMappingProperties(properties);
+		LOG.info("Loaded properties from " + propertiesFile);
+	    } catch (Exception e) {
+		LOG.error("Failed to load properties " + propertiesFile + "\n", e);
+	    } finally {
+		if (input != null) {
+		    try {
+			input.close();
+		    } catch (IOException e) {
+			LOG.error("Failed to close properties file " + propertiesFile + "\n", e);
+		    }
+		}
+	    }
+	}else{
+	    LOG.error("Failed to load the properties file " + propertiesFile + "\n");
+	    LOG.error("Either isFile or canRead returned false for " + propertiesFile + "\n");
+	}
+    }
+
+    public static Properties toProperties(Properties props, Object fromObj) {
+	Class fromClass = null;
+
+	if (fromObj != null) {
+	    fromClass = fromObj.getClass();
+	}
+	return (toProperties(props, "", fromObj, fromClass));
+    }
+
+    public static Properties toProperties(Properties props, String pfx, Object fromObj) {
+	Class fromClass = null;
+
+	if (fromObj != null) {
+	    fromClass = fromObj.getClass();
+	}
+
+	return (toProperties(props, pfx, fromObj, fromClass));
+    }
+
+    public static Properties toProperties(Properties props, String pfx, Object fromObj, Class fromClass) {
+
+	if (fromObj == null) {
+	    return (props);
+	}
+
+	String simpleName = fromClass.getSimpleName();
+
+	LOG.trace("Extracting properties from " + fromClass.getName() + " class");
+	if (fromObj instanceof List) {
+
+	    // Class is a List. List should contain yang-generated classes.
+	    LOG.trace(fromClass.getName() + " is a List");
+
+	    List fromList = (List) fromObj;
+
+	    for (int i = 0; i < fromList.size(); i++) {
+		toProperties(props, pfx + "[" + i + "]", fromList.get(i), fromClass);
+	    }
+	    props.setProperty(pfx + "_length", "" + fromList.size());
+
+	} else if (isYangGenerated(fromClass)) {
+	    // Class is yang generated.
+	    LOG.trace(fromClass.getName() + " is a Yang-generated class");
+
+	    String propNamePfx = null;
+
+	    // If called from a list (so prefix ends in ']'), don't
+	    // add class name again
+	    if (pfx.endsWith("]")) {
+		propNamePfx = pfx;
+	    } else {
+		if ((pfx != null) && (pfx.length() > 0)) {
+		    propNamePfx = pfx;
+		} else {
+		    propNamePfx = toLowerHyphen(fromClass.getSimpleName());
+		}
+
+		if (propNamePfx.endsWith("-builder")) {
+		    propNamePfx = propNamePfx.substring(0, propNamePfx.length() - "-builder".length());
+		}
+
+		if (propNamePfx.endsWith("-impl")) {
+		    propNamePfx = propNamePfx.substring(0, propNamePfx.length() - "-impl".length());
+		}
+	    }
+
+	    // Iterate through getter methods to figure out values we need to
+	    // save from
+
+	    int numGetters = 0;
+	    String lastGetterName = null;
+	    String propVal = null;
+
+	    for (Method m : fromClass.getMethods()) {
+		if (isGetter(m)) {
+
+		    numGetters++;
+		    lastGetterName = m.getName();
+
+		    Class returnType = m.getReturnType();
+		    String fieldName;
+		    if (m.getName().startsWith("get")) {
+			fieldName = toLowerHyphen(m.getName().substring(3));
+		    } else {
+
+			fieldName = toLowerHyphen(m.getName().substring(2));
+		    }
+
+		    fieldName = fieldName.substring(0, 1).toLowerCase() + fieldName.substring(1);
+
+		    // Is the return type a yang generated class?
+		    if (isYangGenerated(returnType)) {
+			// Is it an enum?
+			if (returnType.isEnum()) {
+			    // Return type is a typedef. Save its value.
+			    try {
+				boolean isAccessible = m.isAccessible();
+				if (!isAccessible) {
+				    m.setAccessible(true);
+				}
+
+				Object retValue = m.invoke(fromObj);
+
+				if (!isAccessible) {
+				    m.setAccessible(isAccessible);
+				}
+				if (retValue != null) {
+				    String propName = propNamePfx + "." + fieldName;
+				    propVal = retValue.toString();
+				    props.setProperty(propName, mapEnumeratedValue(fieldName, propVal));
+				}
+			    } catch (Exception e) {
+				LOG.error("Caught exception trying to convert Yang-generated enum returned by " + fromClass.getName() + "." + m.getName() + "() to Properties entry", e);
+			    }
+			} else if (isIpv4Address(returnType)) {
+			    // Save its value
+			    try {
+				String propName = propNamePfx + "." + fieldName;
+				boolean isAccessible = m.isAccessible();
+				if (!isAccessible) {
+				    m.setAccessible(true);
+				}
+				Ipv4Address retValue = (Ipv4Address) m.invoke(fromObj);
+				if (!isAccessible) {
+				    m.setAccessible(isAccessible);
+				}
+
+				if (retValue != null) {
+				    propVal = retValue.getValue().toString();
+				    LOG.debug("Setting property " + propName + " to " + propVal);
+				    props.setProperty(propName, propVal);
+
+				}
+			    } catch (Exception e) {
+				LOG.error("Caught exception trying to convert value returned by " + fromClass.getName() + "." + m.getName() + "() to Properties entry", e);
+			    }
+			} else if (isIpv6Address(returnType)) {
+			    // Save its value
+			    try {
+				String propName = propNamePfx + "." + fieldName;
+				boolean isAccessible = m.isAccessible();
+				if (!isAccessible) {
+				    m.setAccessible(true);
+				}
+				Ipv6Address retValue = (Ipv6Address) m.invoke(fromObj);
+				if (!isAccessible) {
+				    m.setAccessible(isAccessible);
+				}
+
+				if (retValue != null) {
+				    propVal = retValue.getValue().toString();
+				    LOG.debug("Setting property " + propName + " to " + propVal);
+				    props.setProperty(propName, propVal);
+
+				}
+			    } catch (Exception e) {
+				LOG.error("Caught exception trying to convert value returned by " + fromClass.getName() + "." + m.getName() + "() to Properties entry", e);
+			    }
+			} else if (isIpAddress(returnType)) {
+			    // Save its value
+			    try {
+				String propName = propNamePfx + "." + fieldName;
+				boolean isAccessible = m.isAccessible();
+				if (!isAccessible) {
+				    m.setAccessible(true);
+				}
+				IpAddress retValue = (IpAddress) m.invoke(fromObj);
+				if (!isAccessible) {
+				    m.setAccessible(isAccessible);
+				}
+
+				if (retValue != null) {
+				    propVal = new String(retValue.getValue());
+				    LOG.debug("Setting property " + propName + " to " + propVal);
+				    props.setProperty(propName, propVal);
+
+				}
+			    } catch (Exception e) {
+				LOG.error("Caught exception trying to convert value returned by " + fromClass.getName() + "." + m.getName() + "() to Properties entry", e);
+			    }
+			} else if (isIpPrefix(returnType)) {
+			    // Save its value
+			    try {
+				String propName = propNamePfx + "." + fieldName;
+				boolean isAccessible = m.isAccessible();
+				if (!isAccessible) {
+				    m.setAccessible(true);
+				}
+				IpPrefix retValue = (IpPrefix) m.invoke(fromObj);
+				if (!isAccessible) {
+				    m.setAccessible(isAccessible);
+				}
+
+				if (retValue != null) {
+				    propVal = new String(retValue.getValue());
+				    LOG.debug("Setting property " + propName + " to " + propVal);
+				    props.setProperty(propName, propVal);
+
+				}
+			    } catch (Exception e) {
+				LOG.error("Caught exception trying to convert value returned by " + fromClass.getName() + "." + m.getName() + "() to Properties entry", e);
+			    }
+			} else {
+			    try {
+				boolean isAccessible = m.isAccessible();
+				if (!isAccessible) {
+				    m.setAccessible(true);
+				}
+				Object retValue = m.invoke(fromObj);
+
+				if (retValue instanceof byte[]) {
+				    LOG.trace(m.getName() + " returns a byte[]");
+				    retValue = new String((byte[]) retValue, "UTF-8");
+				    LOG.trace("Converted byte array " + propNamePfx + "." + fieldName + "to string " + retValue);
+				}
+				if (!isAccessible) {
+				    m.setAccessible(isAccessible);
+				}
+				if (retValue != null) {
+				    toProperties(props, propNamePfx + "." + fieldName, retValue, returnType);
+				}
+			    } catch (Exception e) {
+
+				if (m.getName().equals("getKey")) {
+				    LOG.trace("Caught " + e.getClass().getName() + " exception trying to convert results from getKey() - ignoring");
+				} else {
+				    LOG.error("Caught exception trying to convert Yang-generated class returned by" + fromClass.getName() + "." + m.getName() + "() to Properties entry", e);
+				}
+			    }
+			}
+		    } else if (returnType.equals(Class.class)) {
+
+			LOG.trace(m.getName() + " returns a Class object - not interested");
+
+		    } else if (List.class.isAssignableFrom(returnType)) {
+
+			// This getter method returns a list.
+			try {
+			    boolean isAccessible = m.isAccessible();
+			    if (!isAccessible) {
+				m.setAccessible(true);
+			    }
+			    Object retList = m.invoke(fromObj);
+			    if (!isAccessible) {
+				m.setAccessible(isAccessible);
+			    }
+			    // Figure out what type of elements are stored in
+			    // this array.
+			    Type paramType = m.getGenericReturnType();
+			    Type elementType = ((ParameterizedType) paramType).getActualTypeArguments()[0];
+			    toProperties(props, propNamePfx + "." + fieldName, retList, (Class) elementType);
+			} catch (Exception e) {
+			    LOG.error("Caught exception trying to convert List returned by " + fromClass.getName() + "." + m.getName() + "() to Properties entry", e);
+			}
+
+		    } else {
+
+			// Method returns something that is not a List and not
+			// yang-generated.
+			// Save its value
+			try {
+			    String propName = propNamePfx + "." + fieldName;
+			    boolean isAccessible = m.isAccessible();
+			    if (!isAccessible) {
+				m.setAccessible(true);
+			    }
+			    Object propValObj = m.invoke(fromObj);
+			    if (!isAccessible) {
+				m.setAccessible(isAccessible);
+			    }
+
+			    if (propValObj != null) {
+				if (propValObj instanceof byte[]) {
+				    LOG.trace(m.getName() + " returns a byte[]");
+				    propVal = new String((byte[]) propValObj, "UTF-8");
+				    LOG.trace("Converted byte array " + propNamePfx + "." + fieldName + "to string " + propVal);
+
+				} else {
+				    propVal = propValObj.toString();
+				}
+				LOG.debug("Setting property " + propName + " to " + propVal);
+				props.setProperty(propName, propVal);
+
+			    }
+			} catch (Exception e) {
+			    if (m.getName().equals("getKey")) {
+				LOG.trace("Caught " + e.getClass().getName() + " exception trying to convert results from getKey() - ignoring");
+			    } else {
+				LOG.error("Caught exception trying to convert value returned by" + fromClass.getName() + "." + m.getName() + "() to Properties entry", e);
+			    }
+			}
+		    }
+
+		}
+	    }
+
+	    // End of method loop. If there was only one getter, named
+	    // "getValue", then
+	    // set value identified by "prefix" to that one value.
+	    if ((numGetters == 1) && ("getValue".equals(lastGetterName))) {
+		LOG.trace("getValueFIX : " + propNamePfx + " only has getValue() getter - setting " + propNamePfx + " = " + propVal);
+		props.setProperty(propNamePfx, propVal);
+	    } else {
+		LOG.trace("getValueFIX : " + propNamePfx + " has " + numGetters + " getter(s), last one found was " + lastGetterName);
+
+	    }
+
+	} else {
+	    // Class is not yang generated and not a list
+	    // It must be an element of a leaf list - set "prefix" to value
+	    String fromVal = null;
+	    if (fromObj instanceof byte[]) {
+		try {
+		    fromVal = new String((byte[]) fromObj, "UTF-8");
+		    LOG.trace("Converted byte array " + pfx + "to string " + fromVal);
+		} catch (Exception e) {
+		    LOG.warn("Caught exception trying to convert " + pfx + " from byte[] to String", e);
+		    fromVal = fromObj.toString();
+		}
+
+	    } else {
+		fromVal = fromObj.toString();
+	    }
+	    LOG.debug("Setting property " + pfx + " to " + fromVal);
+	    props.setProperty(pfx, fromVal);
+	}
+
+	return (props);
+    }
+
+    public static Object toBuilder(Properties props, Object toObj) {
+
+	return (toBuilder(props, "", toObj));
+    }
+
+    public static List toList(Properties props, String pfx, List toObj, Class elemType) {
+
+	int maxIdx = -1;
+	boolean foundValue = false;
+
+	LOG.trace("Saving properties to List<" + elemType.getName() + ">  from " + pfx);
+
+	if (props.contains(pfx + "_length")) {
+	    try {
+		int listLength = Integer.parseInt(props.getProperty(pfx + "_length"));
+
+		if (listLength > 0) {
+		    maxIdx = listLength - 1;
+		}
+	    } catch (Exception e) {
+		// Ignore exception
+	    }
+	}
+
+	if (maxIdx == -1) {
+	    // Figure out array size
+	    for (Object pNameObj : props.keySet()) {
+		String key = (String) pNameObj;
+
+		if (key.startsWith(pfx + "[")) {
+		    String idxStr = key.substring(pfx.length() + 1);
+		    int endloc = idxStr.indexOf("]");
+		    if (endloc != -1) {
+			idxStr = idxStr.substring(0, endloc);
+		    }
+
+		    try {
+			int curIdx = Integer.parseInt(idxStr);
+			if (curIdx > maxIdx) {
+			    maxIdx = curIdx;
+			}
+		    } catch (Exception e) {
+			LOG.error("Illegal subscript in property " + key);
+		    }
+
+		}
+	    }
+	}
+
+	LOG.trace(pfx + " has max index of " + maxIdx);
+	for (int i = 0; i <= maxIdx; i++) {
+
+	    String curBase = pfx + "[" + i + "]";
+
+	    if (isYangGenerated(elemType)) {
+		String builderName = elemType.getName() + "Builder";
+		try {
+		    Class builderClass = Class.forName(builderName);
+		    Object builderObj = builderClass.newInstance();
+		    Method buildMethod = builderClass.getMethod("build");
+		    builderObj = toBuilder(props, curBase, builderObj, true);
+		    if (builderObj != null) {
+			LOG.trace("Calling " + builderObj.getClass().getName() + "." + buildMethod.getName() + "()");
+			Object builtObj = buildMethod.invoke(builderObj);
+			toObj.add(builtObj);
+			foundValue = true;
+		    }
+
+		} catch (ClassNotFoundException e) {
+		    LOG.warn("Could not find builder class " + builderName, e);
+		} catch (Exception e) {
+		    LOG.error("Caught exception trying to populate list from " + pfx);
+		}
+	    } else {
+		// Must be a leaf list
+		String curValue = props.getProperty(curBase, "");
+
+		toObj.add(curValue);
+
+		if ((curValue != null) && (curValue.length() > 0)) {
+		    foundValue = true;
+		}
+	    }
+
+	}
+
+	if (foundValue) {
+	    return (toObj);
+	} else {
+	    return (null);
+	}
+
+    }
+
+    public static Object toBuilder(Properties props, String pfx, Object toObj) {
+	return (toBuilder(props, pfx, toObj, false));
+    }
+
+    public static Object toBuilder(Properties props, String pfx, Object toObj, boolean preservePfx) {
+	Class toClass = toObj.getClass();
+	boolean foundValue = false;
+
+	LOG.trace("Saving properties to " + toClass.getName() + " class from " + pfx);
+
+	Ipv4Address addr;
+
+	if (isYangGenerated(toClass)) {
+	    // Class is yang generated.
+	    LOG.trace(toClass.getName() + " is a Yang-generated class");
+
+	    String propNamePfx = null;
+	    if (preservePfx) {
+		propNamePfx = pfx;
+	    } else {
+
+		if ((pfx != null) && (pfx.length() > 0)) {
+		    propNamePfx = pfx + "." + toLowerHyphen(toClass.getSimpleName());
+		} else {
+		    propNamePfx = toLowerHyphen(toClass.getSimpleName());
+		}
+
+		if (propNamePfx.endsWith("-builder")) {
+		    propNamePfx = propNamePfx.substring(0, propNamePfx.length() - "-builder".length());
+		}
+
+		if (propNamePfx.endsWith("-impl")) {
+		    propNamePfx = propNamePfx.substring(0, propNamePfx.length() - "-impl".length());
+		}
+	    }
+
+	    if (toObj instanceof Identifier) {
+		LOG.trace(toClass.getName() + " is a Key - skipping");
+		return (toObj);
+	    }
+
+	    // Iterate through getter methods to figure out values we need to
+	    // set
+
+	    for (Method m : toClass.getMethods()) {
+		if (isSetter(m)) {
+		    Class paramTypes[] = m.getParameterTypes();
+		    Class paramClass = paramTypes[0];
+
+		    String fieldName = toLowerHyphen(m.getName().substring(3));
+		    fieldName = fieldName.substring(0, 1).toLowerCase() + fieldName.substring(1);
+
+		    String propName = propNamePfx + "." + fieldName;
+
+		    String paramValue = props.getProperty(propName);
+		    if (paramValue == null) {
+			LOG.trace(propName + " is unset");
+		    } else {
+			LOG.trace(propName + " = " + paramValue);
+		    }
+
+		    // Is the return type a yang generated class?
+		    if (isYangGenerated(paramClass)) {
+			// Is it an enum?
+			if (paramClass.isEnum()) {
+
+			    LOG.trace(m.getName() + " expects an Enum");
+			    // Param type is a typedef.
+			    if ((paramValue != null) && (paramValue.length() > 0)) {
+				Object paramObj = null;
+
+				try {
+				    paramObj = Enum.valueOf(paramClass, toJavaEnum(paramValue));
+				} catch (Exception e) {
+				    LOG.error("Caught exception trying to convert field " + propName + " to enum " + paramClass.getName(), e);
+				}
+
+				try {
+				    boolean isAccessible = m.isAccessible();
+				    if (!isAccessible) {
+					m.setAccessible(true);
+				    }
+
+				    LOG.trace("Calling " + toObj.getClass().getName() + "." + m.getName() + "(" + paramValue + ")");
+				    m.invoke(toObj, paramObj);
+
+				    if (!isAccessible) {
+					m.setAccessible(isAccessible);
+				    }
+				    foundValue = true;
+
+				} catch (Exception e) {
+				    LOG.error("Caught exception trying to create Yang-generated enum expected by" + toClass.getName() + "." + m.getName() + "() from Properties entry", e);
+				}
+			    }
+			} else {
+
+			    String simpleName = paramClass.getSimpleName();
+
+			    if ("Ipv4Address".equals(simpleName) || "Ipv6Address".equals(simpleName) || "IpAddress".equals(simpleName)) {
+
+				if ((paramValue != null) && (paramValue.length() > 0)) {
+				    try {
+					IpAddress ipAddr = IpAddressBuilder.getDefaultInstance(paramValue);
+
+					if ("Ipv4Address".equals(simpleName)) {
+					    m.invoke(toObj, ipAddr.getIpv4Address());
+					} else if ("Ipv6Address".equals(simpleName)) {
+					    m.invoke(toObj, ipAddr.getIpv6Address());
+
+					} else {
+					    m.invoke(toObj, ipAddr);
+					}
+					foundValue = true;
+				    } catch (Exception e) {
+					LOG.error("Caught exception calling " + toClass.getName() + "." + m.getName() + "(" + paramValue + ")", e);
+
+				    }
+				} else {
+				    try {
+					boolean isAccessible = m.isAccessible();
+					if (!isAccessible) {
+					    m.setAccessible(true);
+					}
+					LOG.trace("Calling " + toObj.getClass().getName() + "." + m.getName() + "(" + paramValue + ")");
+					m.invoke(toObj, paramValue);
+					if (!isAccessible) {
+					    m.setAccessible(isAccessible);
+					}
+					foundValue = true;
+
+				    } catch (Exception e) {
+					LOG.error("Caught exception trying to call " + toClass.getName() + "." + m.getName() + "() with Properties entry", e);
+				    }
+				}
+			    } else if ("IpPrefix".equals(simpleName)) {
+				if ((paramValue != null) && (paramValue.length() > 0)) {
+				    try {
+					IpPrefix ipPrefix = IpPrefixBuilder.getDefaultInstance(paramValue);
+					m.invoke(toObj, ipPrefix);
+					foundValue = true;
+				    } catch (Exception e) {
+					LOG.error("Caught exception calling " + toClass.getName() + "." + m.getName() + "(" + paramValue + ")", e);
+				    }
+				}
+			    } else {
+				// setter expects a yang-generated class. Need
+				// to
+				// create a builder to set it.
+
+				String builderName = paramClass.getName() + "Builder";
+				Class builderClass = null;
+				Object builderObj = null;
+				Object paramObj = null;
+
+				Object constObj = null;
+
+				LOG.trace(m.getName() + " expects a yang-generated class - looking for builder " + builderName);
+				try {
+				    builderClass = Class.forName(builderName);
+				    builderObj = builderClass.newInstance();
+				    paramObj = toBuilder(props, propNamePfx, builderObj);
+				} catch (ClassNotFoundException e) {
+
+				    if (paramValue == null) {
+					try {
+					    boolean isAccessible = m.isAccessible();
+					    if (!isAccessible) {
+						m.setAccessible(true);
+					    }
+					    LOG.trace("Calling " + toObj.getClass().getName() + "." + m.getName() + "(null)");
+					    m.invoke(toObj, new Object[] { null });
+					    if (!isAccessible) {
+						m.setAccessible(isAccessible);
+					    }
+					    foundValue = true;
+
+					} catch (Exception e1) {
+					    LOG.error("Caught exception trying to cally" + toClass.getName() + "." + m.getName() + "() with Properties entry", e1);
+					}
+				    } else {
+					try {
+					    // See if I can find a constructor I
+					    // can
+					    // use
+					    Constructor[] constructors = paramClass.getConstructors();
+					    // Is there a String constructor?
+					    for (Constructor c : constructors) {
+						Class[] cParms = c.getParameterTypes();
+						if ((cParms != null) && (cParms.length == 1)) {
+						    if (String.class.isAssignableFrom(cParms[0])) {
+							constObj = c.newInstance(paramValue);
+						    }
+						}
+					    }
+
+					    if (constObj == null) {
+						// Is there a Long constructor?
+						for (Constructor c : constructors) {
+						    Class[] cParms = c.getParameterTypes();
+						    if ((cParms != null) && (cParms.length == 1)) {
+							if (Long.class.isAssignableFrom(cParms[0])) {
+							    constObj = c.newInstance(Long.parseLong(paramValue));
+							}
+						    }
+						}
+
+					    }
+
+					    if (constObj == null) {
+
+						// Last chance - see if
+						// parameter class has a static
+						// method
+						// getDefaultInstance(String)
+						try {
+						    Method gm = paramClass.getMethod("getDefaultInstance", String.class);
+
+						    int gmodifier = gm.getModifiers();
+						    if (Modifier.isStatic(gmodifier)) {
+							// Invoke static
+							// getDefaultInstance(String)
+							paramObj = gm.invoke(null, paramValue);
+						    }
+
+						} catch (Exception gme) {
+						    // Ignore exceptions
+						}
+					    }
+
+					} catch (Exception e1) {
+					    LOG.warn("Could not find a suitable constructor for " + paramClass.getName(), e1);
+					}
+
+					if (constObj == null) {
+					    LOG.warn("Could not find builder class " + builderName + " and could not find a String or Long constructor or static getDefaultInstance(String) - trying just to set passing paramValue");
+
+					}
+				    }
+				} catch (Exception e) {
+				    LOG.error("Caught exception trying to create builder " + builderName, e);
+				}
+
+				if (paramObj != null) {
+
+				    try {
+
+					Method buildMethod = builderClass.getMethod("build");
+					LOG.trace("Calling " + paramObj.getClass().getName() + "." + buildMethod.getName() + "()");
+					Object builtObj = buildMethod.invoke(paramObj);
+
+					boolean isAccessible = m.isAccessible();
+					if (!isAccessible) {
+					    m.setAccessible(true);
+					}
+
+					LOG.trace("Calling " + toObj.getClass().getName() + "." + m.getName() + "()");
+					m.invoke(toObj, builtObj);
+					if (!isAccessible) {
+					    m.setAccessible(isAccessible);
+					}
+					foundValue = true;
+
+				    } catch (Exception e) {
+					LOG.error("Caught exception trying to set Yang-generated class expected by" + toClass.getName() + "." + m.getName() + "() from Properties entry", e);
+				    }
+				} else {
+				    try {
+					boolean isAccessible = m.isAccessible();
+					if (!isAccessible) {
+					    m.setAccessible(true);
+					}
+
+					if (constObj != null) {
+
+					    LOG.trace("Calling " + toObj.getClass().getName() + "." + m.getName() + "(" + constObj.toString() + ")");
+					    m.invoke(toObj, constObj);
+					} else {
+					    LOG.trace("Calling " + toObj.getClass().getName() + "." + m.getName() + "(" + paramValue + ")");
+					    m.invoke(toObj, paramValue);
+
+					}
+					if (!isAccessible) {
+					    m.setAccessible(isAccessible);
+					}
+					foundValue = true;
+
+				    } catch (Exception e) {
+					LOG.error("Caught exception trying to convert value returned by" + toClass.getName() + "." + m.getName() + "() to Properties entry", e);
+				    }
+				}
+			    }
+			}
+		    } else {
+
+			// Setter's argument is not a yang-generated class. See
+			// if it is a List.
+
+			if (List.class.isAssignableFrom(paramClass)) {
+
+			    LOG.trace("Parameter class " + paramClass.getName() + " is a List");
+
+			    // Figure out what type of args are in List and pass
+			    // that to toList().
+
+			    Type paramType = m.getGenericParameterTypes()[0];
+			    Type elementType = ((ParameterizedType) paramType).getActualTypeArguments()[0];
+			    Object paramObj = new LinkedList();
+			    try {
+				paramObj = toList(props, propName, (List) paramObj, (Class) elementType);
+			    } catch (Exception e) {
+				LOG.error("Caught exception trying to create list expected as argument to " + toClass.getName() + "." + m.getName());
+			    }
+
+			    if (paramObj != null) {
+				try {
+				    boolean isAccessible = m.isAccessible();
+				    if (!isAccessible) {
+					m.setAccessible(true);
+				    }
+				    LOG.trace("Calling " + toObj.getClass().getName() + "." + m.getName() + "(" + paramValue + ")");
+				    m.invoke(toObj, paramObj);
+				    if (!isAccessible) {
+					m.setAccessible(isAccessible);
+				    }
+				    foundValue = true;
+
+				} catch (Exception e) {
+				    LOG.error("Caught exception trying to convert List returned by" + toClass.getName() + "." + m.getName() + "() to Properties entry", e);
+				}
+			    }
+			} else {
+
+			    // Setter expects something that is not a List and
+			    // not yang-generated. Just pass the parameter value
+
+			    LOG.trace("Parameter class " + paramClass.getName() + " is not a yang-generated class or a List");
+
+			    if ((paramValue != null) && (paramValue.length() > 0)) {
+
+				Object constObj = null;
+
+				try {
+				    // See if I can find a constructor I can use
+				    Constructor[] constructors = paramClass.getConstructors();
+				    // Is there a String constructor?
+				    for (Constructor c : constructors) {
+					Class[] cParms = c.getParameterTypes();
+					if ((cParms != null) && (cParms.length == 1)) {
+					    if (String.class.isAssignableFrom(cParms[0])) {
+						constObj = c.newInstance(paramValue);
+					    }
+					}
+				    }
+
+				    if (constObj == null) {
+					// Is there a Long constructor?
+					for (Constructor c : constructors) {
+					    Class[] cParms = c.getParameterTypes();
+					    if ((cParms != null) && (cParms.length == 1)) {
+						if (Long.class.isAssignableFrom(cParms[0])) {
+						    constObj = c.newInstance(Long.parseLong(paramValue));
+						}
+					    }
+					}
+
+				    }
+
+				    if (constObj != null) {
+					try {
+					    LOG.trace("Calling " + toObj.getClass().getName() + "." + m.getName() + "(" + constObj + ")");
+					    m.invoke(toObj, constObj);
+					    foundValue = true;
+					} catch (Exception e2) {
+					    LOG.error("Caught exception trying to call " + m.getName(), e2);
+					}
+				    } else {
+					try {
+					    boolean isAccessible = m.isAccessible();
+					    if (!isAccessible) {
+						m.setAccessible(true);
+					    }
+					    LOG.trace("Calling " + toObj.getClass().getName() + "." + m.getName() + "(" + paramValue + ")");
+					    m.invoke(toObj, paramValue);
+					    if (!isAccessible) {
+						m.setAccessible(isAccessible);
+					    }
+					    foundValue = true;
+
+					} catch (Exception e) {
+					    LOG.error("Caught exception trying to convert value returned by" + toClass.getName() + "." + m.getName() + "() to Properties entry", e);
+					}
+				    }
+				} catch (Exception e1) {
+				    LOG.warn("Could not find a suitable constructor for " + paramClass.getName(), e1);
+				}
+
+			    }
+			}
+		    }
+		} // End of section handling "setter" method
+	    } // End of loop through Methods
+	} // End of section handling yang-generated class
+
+	if (foundValue) {
+	    return (toObj);
+	} else {
+	    return (null);
+	}
+    }
+
+    public static void printPropertyList(PrintStream pstr, String pfx, Class toClass) {
+	boolean foundValue = false;
+
+	LOG.trace("Analyzing " + toClass.getName() + " class : pfx " + pfx);
+
+	if (isYangGenerated(toClass) && (!Identifier.class.isAssignableFrom(toClass))) {
+	    // Class is yang generated.
+	    LOG.trace(toClass.getName() + " is a Yang-generated class");
+
+	    if (toClass.getName().endsWith("Key")) {
+		if (Identifier.class.isAssignableFrom(toClass)) {
+		    LOG.trace(Identifier.class.getName() + " is assignable from " + toClass.getName());
+		} else {
+
+		    LOG.trace(Identifier.class.getName() + " is NOT assignable from " + toClass.getName());
+		}
+	    }
+
+	    String propNamePfx = null;
+	    if (pfx.endsWith("]")) {
+		propNamePfx = pfx;
+	    } else {
+
+		if ((pfx != null) && (pfx.length() > 0)) {
+		    propNamePfx = pfx + "." + toLowerHyphen(toClass.getSimpleName());
+		} else {
+		    propNamePfx = toLowerHyphen(toClass.getSimpleName());
+		}
+
+		if (propNamePfx.endsWith("-builder")) {
+		    propNamePfx = propNamePfx.substring(0, propNamePfx.length() - "-builder".length());
+		}
+
+		if (propNamePfx.endsWith("-impl")) {
+		    propNamePfx = propNamePfx.substring(0, propNamePfx.length() - "-impl".length());
+		}
+	    }
+
+	    // Iterate through getter methods to figure out values we need to
+	    // set
+
+	    for (Method m : toClass.getMethods()) {
+		LOG.trace("Is " + m.getName() + " method a getter?");
+		if (isGetter(m)) {
+		    LOG.trace(m.getName() + " is a getter");
+		    Class returnClass = m.getReturnType();
+
+		    String fieldName = toLowerHyphen(m.getName().substring(3));
+		    fieldName = fieldName.substring(0, 1).toLowerCase() + fieldName.substring(1);
+
+		    String propName = propNamePfx + "." + fieldName;
+
+		    // Is the return type a yang generated class?
+		    if (isYangGenerated(returnClass)) {
+			// Is it an enum?
+			if (returnClass.isEnum()) {
+
+			    LOG.trace(m.getName() + " is an Enum");
+			    pstr.print("\n\n     * " + propName);
+
+			} else {
+
+			    String simpleName = returnClass.getSimpleName();
+
+			    if ("Ipv4Address".equals(simpleName) || "Ipv6Address".equals(simpleName) || "IpAddress".equals(simpleName) || "IpPrefix".equals(simpleName)) {
+				LOG.trace(m.getName() + " is an " + simpleName);
+				pstr.print("\n\n     * " + propName);
+			    } else {
+				printPropertyList(pstr, propNamePfx, returnClass);
+			    }
+
+			}
+		    } else {
+
+			// Setter's argument is not a yang-generated class. See
+			// if it is a List.
+
+			if (List.class.isAssignableFrom(returnClass)) {
+
+			    LOG.trace("Parameter class " + returnClass.getName() + " is a List");
+
+			    // Figure out what type of args are in List and pass
+			    // that to toList().
+
+			    Type returnType = m.getGenericReturnType();
+			    Type elementType = ((ParameterizedType) returnType).getActualTypeArguments()[0];
+			    Class elementClass = (Class) elementType;
+			    LOG.trace("Calling printPropertyList on list type (" + elementClass.getName() + "), pfx is (" + pfx + "), toClass is (" + toClass.getName() + ")");
+			    printPropertyList(pstr, propNamePfx + "." + toLowerHyphen(elementClass.getSimpleName()) + "[]", elementClass);
+
+			} else if (!returnClass.equals(Class.class)) {
+
+			    // Setter expects something that is not a List and
+			    // not yang-generated. Just pass the parameter value
+
+			    LOG.trace("Parameter class " + returnClass.getName() + " is not a yang-generated class or a List");
+
+			    pstr.print("\n\n     * " + propName);
+
+			}
+		    }
+		} // End of section handling "setter" method
+	    } // End of loop through Methods
+	} // End of section handling yang-generated class
+
+    }
+
+    public static boolean isYangGenerated(Class c) {
+	if (c == null) {
+	    return (false);
+	} else {
+	    return (c.getName().startsWith("org.opendaylight.yang.gen."));
+	}
+    }
+
+    public static boolean isIpPrefix(Class c) {
+
+	if (c == null) {
+	    return (false);
+	}
+	String simpleName = c.getSimpleName();
+	return ("IpPrefix".equals(simpleName));
+    }
+
+    public static boolean isIpv4Address(Class c) {
+
+	if (c == null) {
+	    return (false);
+	}
+	String simpleName = c.getSimpleName();
+	return ("Ipv4Address".equals(simpleName));
+    }
+
+    public static boolean isIpv6Address(Class c) {
+
+	if (c == null) {
+	    return (false);
+	}
+	String simpleName = c.getSimpleName();
+	return ("Ipv6Address".equals(simpleName));
+    }
+
+    public static boolean isIpAddress(Class c) {
+
+	if (c == null) {
+	    return (false);
+	}
+	String simpleName = c.getSimpleName();
+	return ("IpAddress".equals(simpleName));
+    }
+
+    public static String toLowerHyphen(String inStr) {
+	if (inStr == null) {
+	    return (null);
+	}
+
+	String str = inStr.substring(0, 1).toLowerCase();
+	if (inStr.length() > 1) {
+	    str = str + inStr.substring(1);
+	}
+
+	String regex = "(([a-z0-9])([A-Z]))";
+	String replacement = "$2-$3";
+
+	String retval = str.replaceAll(regex, replacement).toLowerCase();
+
+	LOG.trace("Converting " + inStr + " => " + str + " => " + retval);
+	return (retval);
+    }
+
+    //This is called when mapping the yang value back to a valid java enumeration
+    public static String toJavaEnum(String inStr) {
+	if (inStr == null) {
+	    return (null);
+	} else if (inStr.length() == 0) {
+	    return (inStr);
+	}
+
+	//This will strip out all periods, which cannot be in a java enum
+    inStr = inStr.replaceAll("\\.", "");
+
+	String[] terms = inStr.split("-");
+	StringBuffer sbuff = new StringBuffer();
+
+	//appends an _ if the string starts with a digit to make it a valid java enum
+	if (Character.isDigit(inStr.charAt(0))) {
+	    sbuff.append('_');
+	}
+	//If the string contains hyphens it will convert the string to upperCamelCase without hyphens
+	for (String term : terms) {
+	    sbuff.append(term.substring(0, 1).toUpperCase());
+	    if (term.length() > 1) {
+		sbuff.append(term.substring(1));
+	    }
+	}
+	return (sbuff.toString());
+
+    }
+
+    public static boolean isGetter(Method m) {
+	if (m == null) {
+	    return (false);
+	}
+
+	if (Modifier.isPublic(m.getModifiers()) && (m.getParameterTypes().length == 0)) {
+	    if (m.getName().matches("^get[A-Z].*") && !m.getReturnType().equals(void.class)) {
+		if (!"getClass".equals(m.getName())) {
+		    return (true);
+		}
+	    }
+
+	    if (m.getName().matches("^get[A-Z].*") && m.getReturnType().equals(boolean.class)) {
+		return (true);
+	    }
+
+	    if (m.getName().matches("^is[A-Z].*") && m.getReturnType().equals(Boolean.class)) {
+		return (true);
+	    }
+	}
+
+	return (false);
+    }
+
+    public static boolean isSetter(Method m) {
+	if (m == null) {
+	    return (false);
+	}
+
+	if (Modifier.isPublic(m.getModifiers()) && (m.getParameterTypes().length == 1)) {
+	    if (m.getName().matches("^set[A-Z].*")) {
+		Class[] paramTypes = m.getParameterTypes();
+		if (paramTypes[0].isAssignableFrom(Identifier.class) || Identifier.class.isAssignableFrom(paramTypes[0])) {
+		    return (false);
+		} else {
+		    return (true);
+		}
+	    }
+
+	}
+
+	return (false);
+    }
+
+    public static String getFullPropertiesPath(String propertiesFileName) {
+	return "/opt/bvc/controller/configuration/" + propertiesFileName;
+    }
+    
+    //This is called when mapping a valid java enumeration back to the yang model value
+    public static String mapEnumeratedValue(String propertyName, String propertyValue) {
+        LOG.info("mapEnumeratedValue called with propertyName=" + propertyName + " and value=" + propertyValue);
+        String mappingKey = "yang." + propertyName + "." + propertyValue;
+        if (yangMappingProperties.containsKey(mappingKey)) {
+            return (yangMappingProperties.getProperty(mappingKey));
+        } else {
+            LOG.info("yangMappingProperties did not contain the key " + mappingKey + " returning the original value.");
+            return propertyValue;
+        }
+    }
+
+}
diff --git a/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/NotifyNodeExecutor.java b/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/NotifyNodeExecutor.java
new file mode 100644
index 00000000..706014a3
--- /dev/null
+++ b/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/NotifyNodeExecutor.java
@@ -0,0 +1,102 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdnc.sli.provider;
+
+import org.openecomp.sdnc.sli.SvcLogicContext;
+import org.openecomp.sdnc.sli.SvcLogicException;
+import org.openecomp.sdnc.sli.SvcLogicNode;
+import org.openecomp.sdnc.sli.SvcLogicResource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class NotifyNodeExecutor extends SvcLogicNodeExecutor {
+
+	private static final Logger LOG = LoggerFactory
+			.getLogger(NotifyNodeExecutor.class);
+	
+	@Override
+	public SvcLogicNode execute(SvcLogicServiceImpl svc, SvcLogicNode node,
+			SvcLogicContext ctx) throws SvcLogicException {
+
+		String plugin = SvcLogicExpressionResolver.evaluate(
+				node.getAttribute("plugin"), node, ctx);
+		String resourceType = SvcLogicExpressionResolver.evaluate(
+				node.getAttribute("resource"), node, ctx);
+		String action = SvcLogicExpressionResolver.evaluateAsKey(
+				node.getAttribute("action"), node, ctx);
+		String key = SvcLogicExpressionResolver.evaluateAsKey(
+				node.getAttribute("key"), node, ctx);
+
+		String outValue = "failure";
+
+		if (LOG.isDebugEnabled()) {
+			LOG.debug("release node encountered - looking for resource class "
+					+ plugin);
+		}
+
+        SvcLogicResource resourcePlugin = getSvcLogicResource(plugin);
+			if (resourcePlugin != null) {
+
+				try {
+
+					switch (resourcePlugin.notify(resourceType, action, key, ctx)) {
+					case SUCCESS:
+						outValue = "success";
+						break;
+					case NOT_FOUND:
+						outValue = "not-found";
+						break;
+					case FAILURE:
+					default:
+						outValue = "failure";
+					}
+				} catch (SvcLogicException e) {
+					LOG.error("Caught exception from resource plugin", e);
+					outValue = "failure";
+				}
+			} else {
+				LOG.warn("Could not find SvcLogicResource object for plugin "
+						+ plugin);
+			}
+
+		SvcLogicNode nextNode = node.getOutcomeValue(outValue);
+		if (nextNode != null) {
+			if (LOG.isDebugEnabled()) {
+				LOG.debug("about to execute " + outValue + " branch");
+			}
+			return (nextNode);
+		}
+
+		nextNode = node.getOutcomeValue("Other");
+		if (nextNode != null) {
+			if (LOG.isDebugEnabled()) {
+				LOG.debug("about to execute Other branch");
+			}
+		} else {
+			if (LOG.isDebugEnabled()) {
+				LOG.debug("no "+outValue+" or Other branch found");
+			}
+		}
+		return (nextNode);
+	}
+
+}
diff --git a/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/RecordNodeExecutor.java b/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/RecordNodeExecutor.java
new file mode 100644
index 00000000..8ba14d27
--- /dev/null
+++ b/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/RecordNodeExecutor.java
@@ -0,0 +1,119 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdnc.sli.provider;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+
+import org.openecomp.sdnc.sli.SvcLogicContext;
+import org.openecomp.sdnc.sli.SvcLogicException;
+import org.openecomp.sdnc.sli.SvcLogicExpression;
+import org.openecomp.sdnc.sli.SvcLogicNode;
+import org.openecomp.sdnc.sli.SvcLogicRecorder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class RecordNodeExecutor extends SvcLogicNodeExecutor {
+
+	private static final Logger LOG = LoggerFactory
+			.getLogger(RecordNodeExecutor.class);
+	
+	@Override
+	public SvcLogicNode execute(SvcLogicServiceImpl svc, SvcLogicNode node,
+			SvcLogicContext ctx) throws SvcLogicException {
+
+		String plugin = SvcLogicExpressionResolver.evaluate(
+				node.getAttribute("plugin"), node, ctx);
+		String outValue = "failure";
+
+		if (LOG.isTraceEnabled()) {
+			LOG.trace(node.getNodeType()
+					+ " node encountered - looking for recorder class "
+					+ plugin);
+		}
+
+		Map<String, String> parmMap = new HashMap<String, String>();
+
+		Set<Map.Entry<String, SvcLogicExpression>> parmSet = node
+				.getParameterSet();
+		boolean hasParms = false;
+
+		for (Iterator<Map.Entry<String, SvcLogicExpression>> iter = parmSet
+				.iterator(); iter.hasNext();) {
+			hasParms = true;
+			Map.Entry<String, SvcLogicExpression> curEnt = iter.next();
+			String curName = curEnt.getKey();
+			SvcLogicExpression curExpr = curEnt.getValue();
+			String curExprValue = SvcLogicExpressionResolver.evaluate(curExpr,
+					node, ctx);
+
+			if (LOG.isTraceEnabled()) {
+				LOG.trace("executeRecordNode : parameter " + curName + " = "
+						+ curExpr + " => " + curExprValue);
+			}
+			parmMap.put(curName, curExprValue);
+		}
+
+
+			SvcLogicRecorder recorder = getSvcLogicRecorder(plugin);
+
+			if (recorder != null) {
+
+				try {
+					recorder.record(parmMap);
+				} catch (SvcLogicException e) {
+					LOG.error("Caught exception from recorder plugin", e);
+					outValue = "failure";
+				}
+			} else {
+				LOG.warn("Could not find SvcLogicRecorder object for plugin "
+						+ plugin);
+			}
+
+		SvcLogicNode nextNode = node.getOutcomeValue(outValue);
+		if (nextNode != null) {
+			if (LOG.isDebugEnabled()) {
+				LOG.debug("about to execute " + outValue + " branch");
+			}
+			return (nextNode);
+		}
+
+		nextNode = node.getOutcomeValue("Other");
+		if (nextNode != null) {
+			if (LOG.isDebugEnabled()) {
+				LOG.debug("about to execute Other branch");
+			}
+		} else {
+			if (LOG.isTraceEnabled()) {
+				LOG.trace("no failure or Other branch found");
+			}
+		}
+		return (nextNode);
+	}
+
+
+
+
+
+}
diff --git a/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/ReleaseNodeExecutor.java b/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/ReleaseNodeExecutor.java
new file mode 100644
index 00000000..0d8416cd
--- /dev/null
+++ b/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/ReleaseNodeExecutor.java
@@ -0,0 +1,100 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdnc.sli.provider;
+
+import org.openecomp.sdnc.sli.SvcLogicContext;
+import org.openecomp.sdnc.sli.SvcLogicException;
+import org.openecomp.sdnc.sli.SvcLogicNode;
+import org.openecomp.sdnc.sli.SvcLogicResource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ReleaseNodeExecutor extends SvcLogicNodeExecutor {
+
+	private static final Logger LOG = LoggerFactory
+			.getLogger(ReleaseNodeExecutor.class);
+	@Override
+	public SvcLogicNode execute(SvcLogicServiceImpl svc, SvcLogicNode node,
+			SvcLogicContext ctx) throws SvcLogicException {
+
+		String plugin = SvcLogicExpressionResolver.evaluate(
+				node.getAttribute("plugin"), node, ctx);
+		String resourceType = SvcLogicExpressionResolver.evaluate(
+				node.getAttribute("resource"), node, ctx);
+		String key = SvcLogicExpressionResolver.evaluateAsKey(
+				node.getAttribute("key"), node, ctx);
+
+		String outValue = "failure";
+
+		if (LOG.isDebugEnabled()) {
+			LOG.debug("release node encountered - looking for resource class "
+					+ plugin);
+		}
+
+        SvcLogicResource resourcePlugin = getSvcLogicResource(plugin);
+			if (resourcePlugin != null) {
+
+				try {
+
+					switch (resourcePlugin.release(resourceType, key, ctx)) {
+					case SUCCESS:
+						outValue = "success";
+						break;
+					case NOT_FOUND:
+						outValue = "not-found";
+						break;
+					case FAILURE:
+					default:
+						outValue = "failure";
+					}
+				} catch (SvcLogicException e) {
+					LOG.error("Caught exception from resource plugin", e);
+					outValue = "failure";
+				}
+			} else {
+				LOG.warn("Could not find SvcLogicResource object for plugin "
+						+ plugin);
+			}
+
+		SvcLogicNode nextNode = node.getOutcomeValue(outValue);
+		if (nextNode != null) {
+			if (LOG.isDebugEnabled()) {
+				LOG.debug("about to execute " + outValue + " branch");
+			}
+			return (nextNode);
+		}
+
+		nextNode = node.getOutcomeValue("Other");
+		if (nextNode != null) {
+			if (LOG.isDebugEnabled()) {
+				LOG.debug("about to execute Other branch");
+			}
+		} else {
+			if (LOG.isDebugEnabled()) {
+
+				LOG.debug("no "+outValue+" or Other branch found");
+			}
+		}
+		return (nextNode);
+	}
+
+}
diff --git a/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/ReserveNodeExecutor.java b/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/ReserveNodeExecutor.java
new file mode 100644
index 00000000..f0bbda88
--- /dev/null
+++ b/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/ReserveNodeExecutor.java
@@ -0,0 +1,114 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdnc.sli.provider;
+
+import org.openecomp.sdnc.sli.SvcLogicContext;
+import org.openecomp.sdnc.sli.SvcLogicException;
+import org.openecomp.sdnc.sli.SvcLogicExpression;
+import org.openecomp.sdnc.sli.SvcLogicNode;
+import org.openecomp.sdnc.sli.SvcLogicResource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ReserveNodeExecutor extends SvcLogicNodeExecutor {
+
+	private static final Logger LOG = LoggerFactory
+			.getLogger(ReserveNodeExecutor.class);
+	
+	@Override
+	public SvcLogicNode execute(SvcLogicServiceImpl svc, SvcLogicNode node,
+			SvcLogicContext ctx) throws SvcLogicException {
+
+		String plugin = SvcLogicExpressionResolver.evaluate(
+				node.getAttribute("plugin"), node, ctx);
+		String resourceType = SvcLogicExpressionResolver.evaluate(
+				node.getAttribute("resource"), node, ctx);
+		String key = SvcLogicExpressionResolver.evaluateAsKey(
+				node.getAttribute("key"), node, ctx);
+		String pfx = SvcLogicExpressionResolver.evaluate(node.getAttribute("pfx"),node,ctx);
+
+		
+        SvcLogicExpression selectExpr = node.getAttribute("select");
+        String select = null;
+
+        if (selectExpr != null)
+        {
+                select = SvcLogicExpressionResolver.evaluateAsKey(selectExpr, node, ctx);
+        }
+
+		String outValue = "failure";
+
+		if (LOG.isDebugEnabled()) {
+			LOG.debug("reserve node encountered - looking for resource class "
+					+ plugin);
+		}
+
+
+
+        SvcLogicResource resourcePlugin = getSvcLogicResource(plugin);
+
+			if (resourcePlugin != null) {
+
+				try {
+					switch (resourcePlugin.reserve(resourceType, select, key, pfx, ctx)) {
+					case SUCCESS:
+						outValue = "success";
+						break;
+					case NOT_FOUND:
+						outValue = "not-found";
+						break;
+					case FAILURE:
+					default:
+						outValue = "failure";
+					}
+				} catch (SvcLogicException e) {
+					LOG.error("Caught exception from resource plugin", e);
+					outValue = "failure";
+				}
+			} else {
+				LOG.warn("Could not find SvcLogicResource object for plugin "
+						+ plugin);
+			}
+
+		SvcLogicNode nextNode = node.getOutcomeValue(outValue);
+		if (nextNode != null) {
+			if (LOG.isDebugEnabled()) {
+				LOG.debug("about to execute " + outValue + " branch");
+			}
+			return (nextNode);
+		}
+
+		nextNode = node.getOutcomeValue("Other");
+		if (nextNode != null) {
+			if (LOG.isDebugEnabled()) {
+				LOG.debug("about to execute Other branch");
+			}
+		} else {
+			if (LOG.isDebugEnabled()) {
+
+				LOG.debug("no "+outValue+" or Other branch found");
+			}
+		}
+		return (nextNode);
+	}
+
+}
diff --git a/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/ReturnNodeExecutor.java b/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/ReturnNodeExecutor.java
new file mode 100644
index 00000000..5cca4712
--- /dev/null
+++ b/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/ReturnNodeExecutor.java
@@ -0,0 +1,78 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdnc.sli.provider;
+
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+
+import org.openecomp.sdnc.sli.SvcLogicContext;
+import org.openecomp.sdnc.sli.SvcLogicException;
+import org.openecomp.sdnc.sli.SvcLogicExpression;
+import org.openecomp.sdnc.sli.SvcLogicNode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ReturnNodeExecutor extends SvcLogicNodeExecutor {
+
+	private static final Logger LOG = LoggerFactory
+			.getLogger(ReturnNodeExecutor.class);
+	
+	@Override
+	public SvcLogicNode execute(SvcLogicServiceImpl svc, SvcLogicNode node,
+			SvcLogicContext ctx) throws SvcLogicException {
+
+		String status = SvcLogicExpressionResolver.evaluate(
+				node.getAttribute("status"), node, ctx);
+
+		if (status != null) {
+			if (LOG.isDebugEnabled()) {
+				LOG.debug("Returning status " + status);
+			}
+			ctx.setStatus(status);
+		} else {
+			if (LOG.isWarnEnabled()) {
+				LOG.warn("Return node has no status attribute set");
+			}
+		}
+
+		Set<Map.Entry<String, SvcLogicExpression>> parameterSet = node
+				.getParameterSet();
+
+		for (Iterator<Map.Entry<String, SvcLogicExpression>> iter = parameterSet
+				.iterator(); iter.hasNext();) {
+			Map.Entry<String, SvcLogicExpression> curEnt = iter.next();
+			String curName = curEnt.getKey();
+			String curValue = SvcLogicExpressionResolver.evaluate(
+					curEnt.getValue(), node, ctx);
+
+			if (LOG.isDebugEnabled()) {
+				LOG.debug("Setting context attribute " + curName + " to "
+						+ curValue);
+			}
+			ctx.setAttribute(curName, curValue);
+		}
+		return null;
+	}
+
+
+}
diff --git a/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/SaveNodeExecutor.java b/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/SaveNodeExecutor.java
new file mode 100644
index 00000000..57eac7f7
--- /dev/null
+++ b/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/SaveNodeExecutor.java
@@ -0,0 +1,142 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdnc.sli.provider;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+
+import org.openecomp.sdnc.sli.SvcLogicContext;
+import org.openecomp.sdnc.sli.SvcLogicException;
+import org.openecomp.sdnc.sli.SvcLogicExpression;
+import org.openecomp.sdnc.sli.SvcLogicNode;
+import org.openecomp.sdnc.sli.SvcLogicResource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class SaveNodeExecutor extends SvcLogicNodeExecutor {
+
+	private static final Logger LOG = LoggerFactory
+			.getLogger(SaveNodeExecutor.class);
+
+	@Override
+	public SvcLogicNode execute(SvcLogicServiceImpl svc, SvcLogicNode node,
+			SvcLogicContext ctx) throws SvcLogicException {
+
+		String plugin = SvcLogicExpressionResolver.evaluate(
+				node.getAttribute("plugin"), node, ctx);
+		String resourceType = SvcLogicExpressionResolver.evaluate(
+				node.getAttribute("resource"), node, ctx);
+		String key = SvcLogicExpressionResolver.evaluateAsKey(
+				node.getAttribute("key"), node, ctx);
+		String forceStr = SvcLogicExpressionResolver.evaluate(
+				node.getAttribute("force"), node, ctx);
+		String localOnlyStr = SvcLogicExpressionResolver.evaluate(
+				node.getAttribute("local-only"), node, ctx);
+		String pfx = SvcLogicExpressionResolver.evaluate(
+				node.getAttribute("pfx"), node, ctx);
+
+		boolean force = "true".equalsIgnoreCase(forceStr);
+		boolean localOnly = "true".equalsIgnoreCase(localOnlyStr);
+
+		Map<String, String> parmMap = new HashMap<String, String>();
+
+		Set<Map.Entry<String, SvcLogicExpression>> parmSet = node
+				.getParameterSet();
+		boolean hasParms = false;
+
+		for (Iterator<Map.Entry<String, SvcLogicExpression>> iter = parmSet
+				.iterator(); iter.hasNext();) {
+			hasParms = true;
+			Map.Entry<String, SvcLogicExpression> curEnt = iter.next();
+			String curName = curEnt.getKey();
+			SvcLogicExpression curExpr = curEnt.getValue();
+			if (curExpr != null) {
+				String curExprValue = SvcLogicExpressionResolver.evaluate(
+						curExpr, node, ctx);
+
+				LOG.debug("Parameter " + curName + " = "
+						+ curExpr.asParsedExpr() + " resolves to "
+						+ curExprValue);
+
+				parmMap.put(curName, curExprValue);
+			}
+		}
+
+		String outValue = "failure";
+
+		if (LOG.isDebugEnabled()) {
+			LOG.debug("save node encountered - looking for resource class "
+					+ plugin);
+		}
+
+
+
+        SvcLogicResource resourcePlugin = getSvcLogicResource(plugin);
+
+			if (resourcePlugin != null) {
+
+				try {
+					switch (resourcePlugin.save(resourceType, force, localOnly, key,
+							parmMap, pfx, ctx)) {
+					case SUCCESS:
+						outValue = "success";
+						break;
+					case NOT_FOUND:
+						outValue = "not-found";
+						break;
+					case FAILURE:
+					default:
+						outValue = "failure";
+					}
+				} catch (SvcLogicException e) {
+					LOG.error("Caught exception from resource plugin", e);
+					outValue = "failure";
+				}
+			} else {
+				LOG.warn("Could not find SvcLogicResource object for plugin "
+						+ plugin);
+			}
+
+		SvcLogicNode nextNode = node.getOutcomeValue(outValue);
+		if (nextNode != null) {
+			if (LOG.isDebugEnabled()) {
+				LOG.debug("about to execute " + outValue + " branch");
+			}
+			return (nextNode);
+		}
+
+		nextNode = node.getOutcomeValue("Other");
+		if (nextNode != null) {
+			if (LOG.isDebugEnabled()) {
+				LOG.debug("about to execute Other branch");
+			}
+		} else {
+			if (LOG.isDebugEnabled()) {
+				LOG.debug("no "+outValue+" or Other branch found");
+			}
+		}
+		return (nextNode);
+	}
+
+}
diff --git a/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/SetNodeExecutor.java b/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/SetNodeExecutor.java
new file mode 100644
index 00000000..013997ed
--- /dev/null
+++ b/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/SetNodeExecutor.java
@@ -0,0 +1,189 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdnc.sli.provider;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.Map;
+import java.util.Set;
+
+import org.openecomp.sdnc.sli.SvcLogicContext;
+import org.openecomp.sdnc.sli.SvcLogicException;
+import org.openecomp.sdnc.sli.SvcLogicExpression;
+import org.openecomp.sdnc.sli.SvcLogicExpressionFactory;
+import org.openecomp.sdnc.sli.SvcLogicNode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class SetNodeExecutor extends SvcLogicNodeExecutor {
+
+	private static final Logger LOG = LoggerFactory
+			.getLogger(SetNodeExecutor.class);
+
+	@Override
+	public SvcLogicNode execute(SvcLogicServiceImpl svc, SvcLogicNode node,
+			SvcLogicContext ctx) throws SvcLogicException {
+
+		String ifunsetStr = SvcLogicExpressionResolver.evaluate(
+				node.getAttribute("only-if-unset"), node, ctx);
+
+		boolean ifunset = "true".equalsIgnoreCase(ifunsetStr);
+
+		Set<Map.Entry<String, SvcLogicExpression>> parameterSet = node
+				.getParameterSet();
+
+		for (Iterator<Map.Entry<String, SvcLogicExpression>> iter = parameterSet
+				.iterator(); iter.hasNext();) {
+			Map.Entry<String, SvcLogicExpression> curEnt = iter.next();
+			String curName = curEnt.getKey();
+			String lhsVarName = curName;
+			
+			// Resolve LHS of assignment (could contain index variables)
+			try {
+				SvcLogicExpression lhsExpr = SvcLogicExpressionFactory.parse(curName);
+				lhsVarName = SvcLogicExpressionResolver.resolveVariableName(lhsExpr, node, ctx);
+			} catch (Exception e) {
+				LOG.warn("Caught exception trying to resolve variable name ("+curName+")", e);
+			}
+			
+
+			boolean setValue = true;
+
+			if (curName.endsWith(".")) {
+
+				// Copy subtree - value should be a variable name
+				SvcLogicExpression curValue = curEnt.getValue();
+
+				if (curValue != null) {
+					String rhsRoot = curValue.toString();
+				
+					if ((rhsRoot != null) && (rhsRoot.length() > 0)) {
+						if (rhsRoot.endsWith(".")) {
+							rhsRoot = rhsRoot
+									.substring(0, rhsRoot.length() - 1);
+						}
+
+
+						// SDNGC-2321 : rhsRoot is variable name, possibly with subscript(s) to be resolved
+						try {
+							SvcLogicExpression rhsExpr = SvcLogicExpressionFactory.parse(rhsRoot);
+							rhsRoot = SvcLogicExpressionResolver.resolveVariableName(rhsExpr, node, ctx);
+						} catch (Exception e) {
+							LOG.warn("Caught exception trying to resolve variable name ("+rhsRoot+")", e);
+						}
+						
+						// See if the parameters are reversed (copying service-data to input) .. this
+						// was done as a workaround to earlier issue
+						if (curName.endsWith("-input.") && rhsRoot.startsWith("service-data")) {
+							LOG.warn("Arguments appear to be reversed .. will copy input to service-data instead");
+							lhsVarName = rhsRoot + ".";
+							rhsRoot = curName.substring(0, curName.length()-1);
+						}
+						
+						rhsRoot = rhsRoot + ".";
+						String lhsPrefix = lhsVarName;
+						
+						if (lhsPrefix.endsWith(".")) {
+							lhsPrefix = lhsPrefix.substring(0,
+								lhsPrefix.length()-1);
+						}
+						int lhsPfxLength = lhsPrefix.length();
+						HashMap<String, String> parmsToAdd = new HashMap<String,String>();
+
+						for (String sourceVarName : ctx.getAttributeKeySet()) {
+
+							if (sourceVarName.startsWith(rhsRoot)) {
+
+								String targetVar = lhsPrefix
+										+ "."
+										+ sourceVarName
+												.substring(rhsRoot.length());
+
+								LOG.debug("Copying " + sourceVarName
+										+ " value to " + targetVar);
+
+								parmsToAdd.put(targetVar,
+										ctx.getAttribute(sourceVarName));
+							}
+						}
+						
+						for (String newParmName : parmsToAdd.keySet()) {
+							ctx.setAttribute(newParmName, parmsToAdd.get(newParmName));
+						}
+
+					} else {
+						// If RHS is empty, unset attributes in LHS
+						String lhsPrefix = lhsVarName.substring(0,
+								lhsVarName.length() - 1);
+						int lhsPfxLength = lhsPrefix.length();
+						
+						LinkedList<String> parmsToRemove = new LinkedList<String> ();
+
+						for (String curCtxVarname : ctx.getAttributeKeySet()) {
+
+							if (curCtxVarname.startsWith(lhsPrefix)) {
+								LOG.debug("Unsetting " + curCtxVarname);
+								parmsToRemove.add(curCtxVarname);
+							}
+						}
+						
+						for (String parmName : parmsToRemove) {
+							ctx.setAttribute(parmName, null);
+						}
+
+					}
+				}
+
+			} else {
+
+				if (ifunset) {
+					String ctxValue = ctx.getAttribute(lhsVarName);
+
+					if ((ctxValue != null) && (ctxValue.length() > 0)) {
+						setValue = false;
+						LOG.debug("Attribute "
+								+ lhsVarName
+								+ " already set and only-if-unset is true, so not overriding");
+					}
+				}
+
+				if (setValue) {
+					String curValue = SvcLogicExpressionResolver.evaluate(
+							curEnt.getValue(), node, ctx);
+
+					if (LOG.isDebugEnabled()) {
+						LOG.trace("Parameter value "
+								+ curEnt.getValue().asParsedExpr()
+								+ " resolves to " + curValue);
+						LOG.debug("Setting context attribute " + lhsVarName
+								+ " to " + curValue);
+					}
+					ctx.setAttribute(lhsVarName, curValue);
+				}
+			}
+		}
+		
+		return null;
+	}
+
+}
diff --git a/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/SvcLogicActivator.java b/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/SvcLogicActivator.java
new file mode 100644
index 00000000..ae42e2c7
--- /dev/null
+++ b/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/SvcLogicActivator.java
@@ -0,0 +1,225 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdnc.sli.provider;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.LinkedList;
+import java.util.Map;
+import java.util.Properties;
+
+import org.openecomp.sdnc.sli.ConfigurationException;
+import org.openecomp.sdnc.sli.SvcLogicAdaptor;
+import org.openecomp.sdnc.sli.SvcLogicException;
+import org.openecomp.sdnc.sli.SvcLogicStore;
+import org.openecomp.sdnc.sli.SvcLogicStoreFactory;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+import org.osgi.framework.ServiceRegistration;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.mysql.jdbc.Driver;
+
+public class SvcLogicActivator implements BundleActivator {
+
+	private static final String SVCLOGIC_PROP_VAR = "SDNC_SLI_PROPERTIES";
+	private static final String SDNC_CONFIG_DIR = "SDNC_CONFIG_DIR";
+
+	private static final Map<String, SvcLogicNodeExecutor> BUILTIN_NODES = new HashMap<String, SvcLogicNodeExecutor>() {
+		{
+			put("block", new BlockNodeExecutor());
+			put("call", new CallNodeExecutor());
+			put("configure", new ConfigureNodeExecutor());
+			put("delete", new DeleteNodeExecutor());
+			put("execute", new ExecuteNodeExecutor());
+			put("exists", new ExistsNodeExecutor());
+			put("for", new ForNodeExecutor());
+			put("get-resource", new GetResourceNodeExecutor());
+			put("is-available", new IsAvailableNodeExecutor());
+			put("notify", new NotifyNodeExecutor());
+			put("record", new RecordNodeExecutor());
+			put("release", new ReleaseNodeExecutor());
+			put("reserve", new ReserveNodeExecutor());
+			put("return", new ReturnNodeExecutor());
+			put("save", new SaveNodeExecutor());
+			put("set", new SetNodeExecutor());
+			put("switch", new SwitchNodeExecutor());
+			put("update", new UpdateNodeExecutor());
+            put("break", new BreakNodeExecutor());
+
+		}
+	};
+
+	private static LinkedList<ServiceRegistration> registrations = new LinkedList<ServiceRegistration>();
+
+	private static HashMap<String, SvcLogicAdaptor> adaptorMap = null;
+	
+	private static final Logger LOG = LoggerFactory
+			.getLogger(SvcLogicActivator.class);
+	
+	private static Properties props = null;
+
+	private static BundleContext bundleCtx = null;
+	
+	private static SvcLogicService svcLogicServiceImpl = null;
+	
+	@Override
+	public void start(BundleContext ctx) throws Exception {
+
+		LOG.info("Activating SLI");
+		
+		bundleCtx = ctx;
+
+		// Read properties
+		props = new Properties();
+		String propPath = System.getenv(SVCLOGIC_PROP_VAR);
+		
+		if (propPath == null) {
+			String propDir = System.getenv(SDNC_CONFIG_DIR);
+			if (propDir == null) {
+				
+				propDir = "/opt/sdnc/data/properties";
+			}
+			propPath = propDir + "/svclogic.properties";
+			LOG.warn("Environment variable "+SVCLOGIC_PROP_VAR+" unset - defaulting to "+propPath);
+		}
+		
+		File propFile = new File(propPath);
+		
+		if (!propFile.exists()) {
+			
+			throw new ConfigurationException(
+					"Missing configuration properties file : "
+							+ propFile);
+		}
+		try {
+			
+			props.load(new FileInputStream(propFile));
+		} catch (Exception e) {
+			throw new ConfigurationException(
+					"Could not load properties file " + propPath, e);
+
+		}
+
+
+		if (registrations == null) {
+
+			registrations = new LinkedList<ServiceRegistration>();
+		}
+
+		// Advertise SvcLogicService
+		svcLogicServiceImpl = new SvcLogicServiceImpl();
+
+		LOG.info("SLI: Registering service " + SvcLogicService.NAME
+				+ " in bundle " + ctx.getBundle().getSymbolicName());
+		ServiceRegistration reg = ctx.registerService(SvcLogicService.NAME,
+				svcLogicServiceImpl, null);
+		registrations.add(reg);
+
+		// Initialize SvcLogicStore
+		try {
+			SvcLogicStore store = getStore();
+			registerNodeTypes(store);
+		} catch (ConfigurationException e) {
+			LOG.warn("Could not initialize SvcLogicScore", e);
+		}
+
+		LOG.info("SLI - done registering services");
+	}
+
+	@Override
+	public void stop(BundleContext ctx) throws Exception {
+
+		if (registrations != null) {
+			for (ServiceRegistration reg : registrations) {
+				ServiceReference regRef = reg.getReference();
+				/* Don't bother to remove node types from table
+				String nodeType = (String) regRef.getProperty("nodeType");
+				if (nodeType != null) {
+					LOG.info("SLI - unregistering node type " + nodeType);
+					store.unregisterNodeType(nodeType);
+				}
+				*/
+				reg.unregister();
+			}
+			registrations = null;
+		}
+	}
+	
+	public static SvcLogicStore getStore() throws SvcLogicException {
+		// Create and initialize SvcLogicStore object - used to access
+		// saved service logic.
+		
+		SvcLogicStore store = null;
+		
+		try {
+			Driver dvr = new Driver();
+			store = SvcLogicStoreFactory.getSvcLogicStore(props);
+		} catch (Exception e) {
+			throw new ConfigurationException(
+					"Could not get service logic store", e);
+
+		}
+
+		try {
+			store.init(props);
+		} catch (Exception e) {
+			throw new ConfigurationException(
+					"Could not get service logic store", e);
+		}
+		
+		return(store);
+	}
+	
+	private static void registerNodeTypes(SvcLogicStore store) throws SvcLogicException {
+		
+		if (store == null) {
+			return;
+		}
+		// Advertise built-in node executors
+		LOG.info("SLI : Registering built-in node executors");
+		Hashtable propTable = new Hashtable();
+
+		for (String nodeType : BUILTIN_NODES.keySet()) {
+			LOG.info("SLI - registering node type " + nodeType);
+			propTable.clear();
+			propTable.put("nodeType", nodeType);
+
+			ServiceRegistration reg = bundleCtx.registerService(SvcLogicNodeExecutor.class.getName(),
+					BUILTIN_NODES.get(nodeType), propTable);
+			registrations.add(reg);
+
+			store.registerNodeType(nodeType);
+			
+			LOG.info("SLI - registering node executor");
+			
+			((SvcLogicServiceImpl)svcLogicServiceImpl).registerExecutor(nodeType, BUILTIN_NODES.get(nodeType));
+
+		}
+		
+	}
+
+}
diff --git a/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/SvcLogicAdaptorFactory.java b/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/SvcLogicAdaptorFactory.java
new file mode 100644
index 00000000..aa8c005a
--- /dev/null
+++ b/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/SvcLogicAdaptorFactory.java
@@ -0,0 +1,86 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdnc.sli.provider;
+
+import java.util.HashMap;
+
+import org.openecomp.sdnc.sli.SvcLogicAdaptor;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.FrameworkUtil;
+import org.osgi.framework.ServiceReference;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class SvcLogicAdaptorFactory {
+
+	private static final Logger LOG = LoggerFactory
+			.getLogger(SvcLogicAdaptorFactory.class);
+
+	private static HashMap<String, SvcLogicAdaptor> adaptorMap = new HashMap<String, SvcLogicAdaptor>();
+
+	public static void registerAdaptor(SvcLogicAdaptor adaptor) {
+		String name = adaptor.getClass().getName();
+		LOG.info("Registering adaptor " + name);
+		adaptorMap.put(name, adaptor);
+
+	}
+
+	public static void unregisterAdaptor(String name) {
+		if (adaptorMap.containsKey(name)) {
+			LOG.info("Unregistering " + name);
+			adaptorMap.remove(name);
+		}
+	}
+
+	public static SvcLogicAdaptor getInstance(String name) {
+		if (adaptorMap.containsKey(name)) {
+			return (adaptorMap.get(name));
+		} else {
+			BundleContext bctx = null;
+			try
+			{
+			 bctx = FrameworkUtil.getBundle(SvcLogicAdaptorFactory.class)
+					.getBundleContext();
+			}
+			catch (Exception e)
+			{
+				LOG.debug("Caught exception trying to locate device adaptor "+name, e);
+				return(null);
+			}
+
+			ServiceReference sref = bctx.getServiceReference(name);
+
+			if (sref != null) {
+				SvcLogicAdaptor adaptor = (SvcLogicAdaptor) bctx
+						.getService(sref);
+
+				if (adaptor != null) {
+					registerAdaptor(adaptor);
+
+					return (adaptor);
+				}
+				return (null);
+			}
+		}
+		return(null);
+	}
+}
diff --git a/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/SvcLogicExpressionResolver.java b/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/SvcLogicExpressionResolver.java
new file mode 100644
index 00000000..5c17c799
--- /dev/null
+++ b/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/SvcLogicExpressionResolver.java
@@ -0,0 +1,605 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdnc.sli.provider;
+
+import java.util.List;
+
+import org.apache.commons.lang.StringUtils;
+import org.openecomp.sdnc.sli.SvcLogicAtom;
+import org.openecomp.sdnc.sli.SvcLogicAtom.AtomType;
+import org.openecomp.sdnc.sli.SvcLogicBinaryExpression;
+import org.openecomp.sdnc.sli.SvcLogicBinaryExpression.OperatorType;
+import org.openecomp.sdnc.sli.SvcLogicContext;
+import org.openecomp.sdnc.sli.SvcLogicException;
+import org.openecomp.sdnc.sli.SvcLogicExpression;
+import org.openecomp.sdnc.sli.SvcLogicFunctionCall;
+import org.openecomp.sdnc.sli.SvcLogicNode;
+import org.openecomp.sdnc.sli.SvcLogicVariableTerm;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class SvcLogicExpressionResolver {
+
+	private static final Logger LOG = LoggerFactory
+			.getLogger(SvcLogicExpressionResolver.class);
+
+	public static String evaluate(SvcLogicExpression expr, SvcLogicNode node,
+			SvcLogicContext ctx) throws SvcLogicException {
+		if (expr == null) {
+			return (null);
+		}
+
+	
+
+		if (expr instanceof SvcLogicAtom) {
+			SvcLogicAtom atom = (SvcLogicAtom) expr;
+
+			AtomType atomType = atom.getAtomType();
+			switch (atomType) {
+			case NUMBER:
+			case STRING:
+				return (atom.toString());
+			case CONTEXT_VAR:
+			case IDENTIFIER:
+	
+				String varName = resolveVariableName(atom, node, ctx);
+				
+				if (atomType == AtomType.CONTEXT_VAR)
+				{
+					LOG.trace("Evaluating context variable $"+varName);
+					
+					String varValue = ctx.getAttribute(varName);
+					
+					if (varValue == null) {
+						LOG.trace("Context variable $"+varName+" unset - treating as empty string");
+						varValue = "";
+					}
+						
+					return (varValue);
+				}
+				SvcLogicExpression parm = node.getParameter(varName);
+				if (parm != null) {
+					LOG.trace("Evaluating value of parameter "+varName+": "+parm.asParsedExpr());
+					
+					return (evaluate(parm, node, ctx));
+				}
+				else
+				{
+					return(varName);
+				}
+			default:
+				return(null);
+			}
+
+		} else if (expr instanceof SvcLogicBinaryExpression) {
+			SvcLogicBinaryExpression binExpr = (SvcLogicBinaryExpression) expr;
+			List<OperatorType> operators = binExpr.getOperators();
+			if (operators.isEmpty())
+			{
+				List<SvcLogicExpression> operands = binExpr.getOperands();
+				if (operands.size() == 1)
+				{
+					LOG.trace("SvcLogicBinaryExpression as no operator and one operand - evaluating its operand");
+					return(evaluate(operands.get(0), node, ctx));
+				}
+				else
+				{
+					if (operands.isEmpty())
+					{
+						LOG.error("SvcLogicBinaryExpression has no operators and no operands - evaluating value as null");
+					}
+					else
+					{
+						LOG.error("SvcLogicBinaryExpression has no operators and "+operands.size()+" operands - evaluating value as null");
+					}
+					return(null);
+				}
+			}
+			switch (operators.get(0)) {
+				case addOp:
+				case subOp:
+				case multOp:
+				case divOp:
+					return(evalArithExpression(binExpr, node, ctx));
+				case equalOp:
+				case neOp:
+				case ltOp:
+				case leOp:
+				case gtOp:
+				case geOp:
+					return (evalCompareExpression(binExpr, node, ctx));
+				case andOp:
+				case orOp:
+					return(evalLogicExpression(binExpr, node, ctx));
+
+				default:
+					return(null);
+			}
+		}
+		else if (expr instanceof SvcLogicFunctionCall)
+		{
+			return(evalFunctionCall((SvcLogicFunctionCall)expr, node, ctx));
+		}
+		else
+		{
+			throw new SvcLogicException("Unrecognized expression type ["+expr+"]");
+		}
+	}
+
+	private static String evalArithExpression(SvcLogicBinaryExpression binExpr, SvcLogicNode node, SvcLogicContext ctx) throws SvcLogicException {
+		List<SvcLogicExpression> operands = binExpr.getOperands();
+		List<OperatorType> operators = binExpr.getOperators();
+		if (operands.size() != (operators.size()+1))
+		{
+			throw new SvcLogicException("Invalid expression ("+binExpr+")");
+		}	
+		String retval = evaluate(operands.get(0), node, ctx);
+		String retsval = retval;
+		long retlval = 0;
+		boolean valueIsLong = false;
+
+		int i = 1;
+		try
+		{
+			
+			if ((retval.length() > 0) && StringUtils.isNumeric(retval))
+			{
+				retlval = Long.parseLong(retval);
+				valueIsLong = true;
+			}
+			for (OperatorType operator: operators)
+			{
+				String curOperandValue = evaluate(operands.get(i++), node, ctx);
+				switch(operator) {
+				case addOp:
+					retsval = retsval + curOperandValue;
+					if (valueIsLong)
+					{
+						if ((curOperandValue.length() > 0) && StringUtils.isNumeric(curOperandValue) )
+						{
+							retlval = retlval + Long.parseLong(curOperandValue);
+						}
+						else
+						{
+							valueIsLong = false;
+						}
+					}
+					break;
+				case subOp:
+					retlval = retlval - Long.parseLong(curOperandValue);
+					break;
+				case multOp:
+					retlval = retlval * Long.parseLong(curOperandValue);
+					break;
+				case divOp:
+					retlval = retlval / Long.parseLong(curOperandValue);
+					break;
+				}
+
+			}
+		}
+		catch (NumberFormatException e1)
+		{
+			throw new SvcLogicException("Illegal value in arithmetic expression", e1);
+		}
+		
+		if (valueIsLong)
+		{
+			return("" + retlval);
+		}
+		else
+		{
+			return(retsval);
+		}
+		
+	}
+
+
+	
+	private static String evalCompareExpression(SvcLogicBinaryExpression expr, SvcLogicNode node, SvcLogicContext ctx) throws SvcLogicException
+	{
+
+		List<OperatorType> operators = expr.getOperators();
+		List<SvcLogicExpression> operands = expr.getOperands();
+		
+		if ((operators.size() != 1) || (operands.size() != 2))
+		{
+			throw new SvcLogicException ("Invalid comparison expression : "+expr);
+		}
+		
+		OperatorType operator = operators.get(0);
+		String op1Value = evaluate(operands.get(0), node, ctx);
+		String op2Value = evaluate(operands.get(1), node, ctx);
+		
+		if ((StringUtils.isNotEmpty(op1Value) && StringUtils.isNumeric(op1Value) && StringUtils.isNotEmpty(op2Value) && StringUtils.isNumeric(op2Value)))
+		{
+			try
+			{
+				double op1dbl = Double.parseDouble(op1Value);
+				double op2dbl = Double.parseDouble(op2Value);
+				
+				switch(operator)
+				{
+				case equalOp:
+					return(Boolean.toString(op1dbl == op2dbl));
+				case neOp:
+					return(Boolean.toString(op1dbl != op2dbl));
+				case ltOp:
+					return(Boolean.toString(op1dbl < op2dbl));
+				case leOp:
+					return(Boolean.toString(op1dbl <= op2dbl));
+				case gtOp:
+					return(Boolean.toString(op1dbl > op2dbl));
+				case geOp:
+					return(Boolean.toString(op1dbl >= op2dbl));
+				default:
+					return(null);
+				}
+			}
+			catch (NumberFormatException e)
+			{
+				throw new SvcLogicException("Caught exception trying to compare numeric values", e);
+			}
+		}
+		else
+		{
+			
+			int compResult = 0;
+			
+			if (op1Value == null) {
+				compResult = -1;
+			} else if (op2Value == null ) {
+				compResult = 1;
+			} else {
+				compResult = op1Value.compareToIgnoreCase(op2Value);
+			}
+			
+			switch(operator)
+			{
+			case equalOp:
+				return(Boolean.toString(compResult == 0));
+			case neOp:
+				return(Boolean.toString(compResult != 0));
+			case ltOp:
+				return(Boolean.toString(compResult < 0));
+			case leOp:
+				return(Boolean.toString(compResult <= 0));
+			case gtOp:
+				return(Boolean.toString(compResult > 0));
+			case geOp:
+				return(Boolean.toString(compResult >= 0));
+			default:
+				return(null);
+			}
+		}
+		
+	}
+	
+	private static String evalLogicExpression(SvcLogicBinaryExpression expr, SvcLogicNode node, SvcLogicContext ctx) throws SvcLogicException
+	{
+		boolean retval;
+		
+		List<SvcLogicExpression> operands = expr.getOperands();
+		List<OperatorType> operators = expr.getOperators();
+		
+		if (operands.size() != (operators.size()+1))
+		{
+			throw new SvcLogicException("Invalid expression ("+expr+")");
+		}
+		
+		try
+		{
+			retval = Boolean.parseBoolean(evaluate(operands.get(0), node, ctx));
+			int i = 1;
+			for (OperatorType operator : operators)
+			{
+				if (operator == OperatorType.andOp)
+				{
+					retval = retval && Boolean.parseBoolean(evaluate(operands.get(i++), node, ctx));
+				}
+				else
+				{
+
+					retval = retval || Boolean.parseBoolean(evaluate(operands.get(i++), node, ctx));
+				}
+				
+			}
+		}
+		catch (Exception e)
+		{
+			throw new SvcLogicException("Invalid expression ("+expr+")");
+		}
+		
+		
+		return(Boolean.toString(retval));
+	}
+	
+	private static String evalFunctionCall(SvcLogicFunctionCall func, SvcLogicNode node, SvcLogicContext ctx) throws SvcLogicException
+	{
+		String funcName = func.getFunctionName();
+		List<SvcLogicExpression> operands = func.getOperands();
+		
+		if ("length".equalsIgnoreCase(funcName))
+		{
+			
+			if (operands.size() == 1)
+			{
+				String opValue = evaluate(operands.get(0), node, ctx);
+				return(""+opValue.length());
+			}
+			else
+			{
+				throw new SvcLogicException("Invalid call to length() function");
+			}
+		}
+		else if ("substr".equalsIgnoreCase(funcName))
+		{
+			if (operands.size() == 3)
+			{
+				String op1Value = evaluate(operands.get(0), node, ctx);
+				String op2Value = evaluate(operands.get(1), node, ctx);
+				String op3Value = evaluate(operands.get(2), node, ctx);
+				
+				if (!StringUtils.isNumeric(op2Value) || !StringUtils.isNumeric(op3Value))
+				{
+					throw new SvcLogicException("Invalid arguments to substr() function");
+				}
+				
+				try
+				{
+					return(op1Value.substring(Integer.parseInt(op2Value), Integer.parseInt(op3Value)));
+				}
+				catch (Exception e)
+				{
+					throw new SvcLogicException("Caught exception trying to take substring", e);
+				}
+			}
+			else
+			{
+
+				throw new SvcLogicException("Invalid call to substr() function");
+			}
+			
+		}
+		else if ("toUpperCase".equalsIgnoreCase(funcName))
+		{
+			if (operands.size() == 1)
+			{
+				String opValue = evaluate(operands.get(0), node, ctx);
+				if (opValue != null) {
+					return(opValue.toUpperCase());
+				} else {
+					return("");
+				}
+			}
+			else
+			{
+				throw new SvcLogicException("Invalid call to toUpperCase() function");
+			}
+		}
+		else if ("toLowerCase".equalsIgnoreCase(funcName))
+		{
+			if (operands.size() == 1)
+			{
+				String opValue = evaluate(operands.get(0), node, ctx);
+				if (opValue != null) {
+					return(opValue.toLowerCase());
+				} else {
+					return("");
+				}
+			}
+			else
+			{
+				throw new SvcLogicException("Invalid call to toLowerCase() function");
+			}
+		}
+		else if ("convertBase".equalsIgnoreCase(funcName)) {
+			int fromBase = 10;
+			int toBase = 10;
+			String srcString = "";
+			
+			if (operands.size() == 2)
+			{
+				fromBase = 10;
+				srcString = evaluate(operands.get(0), node, ctx);
+				toBase = Integer.parseInt(evaluate(operands.get(1), node, ctx));
+			} else if (operands.size() == 3) {
+
+				srcString = evaluate(operands.get(0), node, ctx);
+				fromBase = Integer.parseInt(evaluate(operands.get(1), node, ctx));
+				toBase = Integer.parseInt(evaluate(operands.get(2), node, ctx));
+			} else {
+				throw new SvcLogicException("Invalid call to convertBase() function");
+			}
+			
+			long srcValue = Long.parseLong(srcString, fromBase);
+			return(Long.toString(srcValue, toBase));
+		}
+		else
+		{
+			throw new SvcLogicException("Unrecognized function ("+funcName+")");
+		}
+		
+	}
+	
+	public static String evaluateAsKey(SvcLogicExpression expr, SvcLogicNode node,
+			SvcLogicContext ctx) throws SvcLogicException {
+		if (expr == null) {
+			return (null);
+		}
+
+	
+
+		if (expr instanceof SvcLogicAtom) {
+			SvcLogicAtom atom = (SvcLogicAtom) expr;
+
+			AtomType atomType = atom.getAtomType();
+			StringBuffer varNameBuff = new StringBuffer();
+			switch (atomType) {
+			case NUMBER:
+				return (atom.toString());
+			case STRING:
+				return("'"+atom.toString()+"'");
+			case CONTEXT_VAR:
+			case IDENTIFIER:
+				boolean needDot = false;
+                for (SvcLogicExpression term : atom.getOperands())
+                {
+                	if (needDot)
+                	{
+                		varNameBuff.append(".");
+                	}
+                	if (term instanceof SvcLogicVariableTerm)
+                	{
+                		SvcLogicVariableTerm vterm = (SvcLogicVariableTerm) term;
+                		varNameBuff.append(vterm.getName());
+                		if (vterm.numOperands() > 0)
+                		{
+                			varNameBuff.append("[");
+                			varNameBuff.append(evaluate(vterm.getSubscript(), node, ctx));
+                			varNameBuff.append("]");
+                			
+                		}
+                	}
+                	else
+                	{
+                		varNameBuff.append(term.toString());
+                	}
+                	needDot = true;
+                }
+
+				String varName = varNameBuff.toString();
+				LOG.debug("Evaluating context variable $"+varName);
+				String ctxValue = ctx.getAttribute(varName);
+				if (ctxValue == null)
+				{
+					return(null);
+				}
+				if (StringUtils.isNumeric(ctxValue))
+				{
+					return(ctxValue);
+				}
+				else
+				{
+					return("'"+ctxValue+"'");
+				}
+	
+			default:
+				return(null);
+			}
+
+		} else if (expr instanceof SvcLogicBinaryExpression) {
+			SvcLogicBinaryExpression binExpr = (SvcLogicBinaryExpression) expr;
+			List<OperatorType> operators = binExpr.getOperators();
+			List<SvcLogicExpression> operands = binExpr.getOperands();
+			if (operators.isEmpty())
+			{
+				if (operands.size() == 1)
+				{
+					LOG.debug("SvcLogicBinaryExpression as no operator and one operand - evaluating its operand");
+					return(evaluateAsKey(operands.get(0), node, ctx));
+				}
+				else
+				{
+					if (operands.isEmpty())
+					{
+						LOG.error("SvcLogicBinaryExpression has no operators and no operands - evaluating value as null");
+					}
+					else
+					{
+						LOG.error("SvcLogicBinaryExpression has no operators and "+operands.size()+" operands - evaluating value as null");
+					}
+					return(null);
+				}
+			}
+			StringBuffer sbuff = new StringBuffer();
+			sbuff.append(evaluateAsKey(operands.get(0), node, ctx));
+			int i = 1;
+			for (OperatorType operator : operators)
+			{
+				sbuff.append(" ");
+				sbuff.append(operator.toString());
+				sbuff.append(" ");
+				sbuff.append(evaluateAsKey(operands.get(i++), node,ctx));
+			}
+			return(sbuff.toString());
+		}
+		else if (expr instanceof SvcLogicFunctionCall)
+		{
+			StringBuffer sbuff = new StringBuffer();
+			SvcLogicFunctionCall funcCall = (SvcLogicFunctionCall) expr;
+			sbuff.append(funcCall.getFunctionName());
+			sbuff.append("(");
+			boolean needComma = false;
+			for (SvcLogicExpression operand : funcCall.getOperands())
+			{
+				if (needComma)
+				{
+					sbuff.append(",");
+				}
+				else
+				{
+					needComma = true;
+				}
+				sbuff.append(evaluateAsKey(operand, node, ctx));
+			}
+			sbuff.append(")");
+			return(sbuff.toString());
+		}
+		else
+		{
+			throw new SvcLogicException("Unrecognized expression type ["+expr+"]");
+		}
+	}
+	
+	public static String resolveVariableName(SvcLogicExpression atom, SvcLogicNode node, SvcLogicContext ctx) throws SvcLogicException
+	{
+		StringBuffer varNameBuff = new StringBuffer();
+		
+		boolean needDot = false;
+		for (SvcLogicExpression term : atom.getOperands())
+		{
+			if (needDot)
+			{
+				varNameBuff.append(".");
+			}
+			if (term instanceof SvcLogicVariableTerm)
+			{
+				SvcLogicVariableTerm vterm = (SvcLogicVariableTerm) term;
+				varNameBuff.append(vterm.getName());
+				if (vterm.numOperands() > 0)
+				{
+					varNameBuff.append("[");
+					varNameBuff.append(evaluate(vterm.getSubscript(), node, ctx));
+					varNameBuff.append("]");
+				}
+			}
+			else
+			{
+				varNameBuff.append(term.toString());
+			}
+			needDot = true;
+		}
+		return(varNameBuff.toString());
+	}
+
+}
diff --git a/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/SvcLogicNodeExecutor.java b/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/SvcLogicNodeExecutor.java
new file mode 100644
index 00000000..0c8166ae
--- /dev/null
+++ b/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/SvcLogicNodeExecutor.java
@@ -0,0 +1,110 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdnc.sli.provider;
+
+import org.openecomp.sdnc.sli.SvcLogicAdaptor;
+import org.openecomp.sdnc.sli.SvcLogicContext;
+import org.openecomp.sdnc.sli.SvcLogicException;
+import org.openecomp.sdnc.sli.SvcLogicJavaPlugin;
+import org.openecomp.sdnc.sli.SvcLogicNode;
+import org.openecomp.sdnc.sli.SvcLogicRecorder;
+import org.openecomp.sdnc.sli.SvcLogicResource;
+import org.openecomp.sdnc.sli.SvcLogicStore;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.FrameworkUtil;
+import org.osgi.framework.ServiceReference;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public abstract class SvcLogicNodeExecutor {
+	
+	public abstract SvcLogicNode execute(SvcLogicServiceImpl svc, SvcLogicNode node, SvcLogicContext ctx) throws SvcLogicException;
+
+    private static final Logger LOG = LoggerFactory.getLogger(SvcLogicNodeExecutor.class);
+
+    protected String evaluateNodeTest(SvcLogicNode node, SvcLogicContext ctx)
+			throws SvcLogicException {
+		if (node == null) {
+			return null;
+		}
+
+		return (SvcLogicExpressionResolver.evaluate(node.getAttribute("test"),
+				node, ctx));
+
+	}
+	
+    protected SvcLogicStore getStore() throws SvcLogicException {
+        return SvcLogicActivator.getStore();
+    }
+    
+    protected SvcLogicAdaptor getAdaptor(String adaptorName) {
+        return SvcLogicAdaptorFactory.getInstance(adaptorName);
+    }
+    
+    protected SvcLogicResource getSvcLogicResource(String plugin) {
+        BundleContext bctx = FrameworkUtil.getBundle(this.getClass())
+                .getBundleContext();
+
+        ServiceReference sref = bctx.getServiceReference(plugin);
+        if (sref != null) {
+            SvcLogicResource resourcePlugin = (SvcLogicResource) bctx
+                    .getService(sref);
+            return resourcePlugin;
+        }
+        else {
+            LOG.warn("Could not find service reference object for plugin " + plugin);
+            return null;
+        }
+    }
+    
+    protected SvcLogicRecorder getSvcLogicRecorder(String plugin) {
+        BundleContext bctx = FrameworkUtil.getBundle(this.getClass())
+                .getBundleContext();
+
+        ServiceReference sref = bctx.getServiceReference(plugin);
+        if (sref != null) {
+            SvcLogicRecorder resourcePlugin = (SvcLogicRecorder) bctx
+                    .getService(sref);
+            return resourcePlugin;
+        }
+        else {
+            return null;
+        }
+    }
+    
+    protected SvcLogicJavaPlugin getSvcLogicJavaPlugin(String pluginName){
+        BundleContext bctx = FrameworkUtil.getBundle(this.getClass())
+                 .getBundleContext();
+
+         ServiceReference sref = bctx.getServiceReference(pluginName);
+
+         if (sref == null) {
+             LOG.warn("Could not find service reference object for plugin " + pluginName);
+             return null;
+         } else {
+             SvcLogicJavaPlugin plugin  = (SvcLogicJavaPlugin) bctx
+                     .getService(sref);
+             return plugin;
+         }
+ }
+    
+}
diff --git a/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/SvcLogicService.java b/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/SvcLogicService.java
new file mode 100644
index 00000000..f30b3fc0
--- /dev/null
+++ b/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/SvcLogicService.java
@@ -0,0 +1,76 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdnc.sli.provider;
+
+import java.util.Properties;
+
+import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker;
+import org.openecomp.sdnc.sli.SvcLogicException;
+
+public interface SvcLogicService {
+	
+	public static final String NAME = "org.openecomp.sdnc.sli.provider.SvcLogicService";
+	
+	// public SvcLogicContext execute(SvcLogicGraph graph, SvcLogicContext ctx) throws SvcLogicException;
+	/**
+	 * Check for existence of a directed graph
+	 * @param module - module name
+	 * @param rpc - rpc name
+	 * @param version - version.  If null, looks for active version
+	 * @param mode - mode (sync/async)
+	 * @return true if directed graph found, false otherwise
+	 * @throws SvcLogicException
+	 */
+	public boolean hasGraph(String module, String rpc, String version, String mode) throws SvcLogicException;
+	
+	/**
+	 *  Execute a directed graph
+	 *  
+	 * @param module - module name
+	 * @param rpc - rpc name
+	 * @param version - version.  If null, use active version
+	 * @param mode - mode (sync/async)
+	 * @param parms - parameters, used to set SvcLogicContext attributes
+	 * @return final values of attributes from SvcLogicContext, as Properties
+	 * @throws SvcLogicException
+	 * 
+	 * 
+	 *  @deprecated use execute(String module, String rpc, String version, String mode, DOMDataBroker dataBroker) instead
+	 */
+	@Deprecated
+	public Properties execute(String module, String rpc, String version, String mode, Properties parms) throws SvcLogicException;
+	
+	/**
+	 * Execute a directed graph
+	 *  
+	 * @param module - module name
+	 * @param rpc - rpc name
+	 * @param version - version.  If null, use active version
+	 * @param mode - mode (sync/async)
+	 * @param parms - parameters, used to set SvcLogicContext attributes
+	 * @param domDataBroker - DOMDataBroker object
+	 * @return final values of attributes from SvcLogicContext, as Properties
+	 * @throws SvcLogicException
+	 */
+	public Properties execute(String module, String rpc, String version, String mode, Properties parms, DOMDataBroker domDataBroker) throws SvcLogicException;
+	
+}
diff --git a/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/SvcLogicServiceImpl.java b/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/SvcLogicServiceImpl.java
new file mode 100644
index 00000000..ba929bae
--- /dev/null
+++ b/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/SvcLogicServiceImpl.java
@@ -0,0 +1,273 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdnc.sli.provider;
+
+import java.util.HashMap;
+import java.util.Properties;
+
+import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker;
+import org.openecomp.sdnc.sli.MetricLogger;
+import org.openecomp.sdnc.sli.SvcLogicContext;
+import org.openecomp.sdnc.sli.SvcLogicException;
+import org.openecomp.sdnc.sli.SvcLogicGraph;
+import org.openecomp.sdnc.sli.SvcLogicNode;
+import org.openecomp.sdnc.sli.SvcLogicStore;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.FrameworkUtil;
+import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.framework.ServiceEvent;
+import org.osgi.framework.ServiceListener;
+import org.osgi.framework.ServiceReference;
+import org.osgi.util.tracker.ServiceTracker;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.MDC;
+
+public class SvcLogicServiceImpl implements SvcLogicService {
+
+	private static final Logger LOG = LoggerFactory
+			.getLogger(SvcLogicServiceImpl.class);
+
+	private HashMap<String, SvcLogicNodeExecutor> nodeExecutors = null;
+
+	private BundleContext bctx = null;
+
+	private void registerExecutors() {
+
+		LOG.info("Entered register executors");
+		if (bctx == null) {
+			bctx = FrameworkUtil.getBundle(this.getClass()).getBundleContext();
+		}
+
+		if (nodeExecutors == null) {
+			nodeExecutors = new HashMap<String, SvcLogicNodeExecutor>();
+		}
+
+		LOG.info("Opening service tracker");
+		ServiceTracker tracker = new ServiceTracker(bctx,
+				SvcLogicNodeExecutor.class.getName(), null);
+		
+		tracker.open();
+
+		ServiceListener listener = new ServiceListener() {
+
+			public void serviceChanged(ServiceEvent ev) {
+				ServiceReference sr = ev.getServiceReference();
+				switch (ev.getType()) {
+				case ServiceEvent.REGISTERED: {
+					registerExecutor(sr);
+				}
+					break;
+				case ServiceEvent.UNREGISTERING: {
+					unregisterExecutor(sr);
+				}
+					break;
+				}
+			}
+		};
+
+		LOG.info("Adding service listener");
+		String filter = "(objectclass=" + SvcLogicNodeExecutor.class.getName()
+				+ ")";
+		try {
+			bctx.addServiceListener(listener, filter);
+			ServiceReference[] srl = bctx.getServiceReferences(
+					SvcLogicNodeExecutor.class.getName(), null);
+			for (int i = 0; srl != null && i < srl.length; i++) {
+				listener.serviceChanged(new ServiceEvent(
+						ServiceEvent.REGISTERED, srl[i]));
+			}
+		} catch (InvalidSyntaxException e) {
+			e.printStackTrace();
+		}
+		LOG.info("Done registerExecutors");
+	}
+
+	public void registerExecutor(ServiceReference sr) {
+
+		String nodeName = (String) sr.getProperty("nodeType");
+		if (nodeName != null) {
+
+			SvcLogicNodeExecutor executor = null;
+
+			try {
+				executor = (SvcLogicNodeExecutor) bctx.getService(sr);
+			} catch (Exception e) {
+				LOG.error("Cannot get service executor for " + nodeName);
+				return;
+			}
+
+            registerExecutor(nodeName, executor);
+
+		}
+	}
+	
+	public void registerExecutor(String nodeName, SvcLogicNodeExecutor executor)
+	{
+		if (nodeExecutors == null) {
+			nodeExecutors = new HashMap<String, SvcLogicNodeExecutor>();
+		}
+		LOG.info("SLI - registering executor for node type "+nodeName);
+		nodeExecutors.put(nodeName, executor);
+	}
+
+	public void unregisterExecutor(ServiceReference sr) {
+		String nodeName = (String) sr.getProperty("nodeType");
+
+		if (nodeName != null) {
+			
+             unregisterExecutor(nodeName);
+
+		}
+
+	}
+	
+	public void unregisterExecutor(String nodeName)
+	{
+
+		LOG.info("SLI - unregistering executor for node type "+nodeName);
+		nodeExecutors.remove(nodeName);
+	}
+	
+
+
+	
+	public SvcLogicContext execute(SvcLogicGraph graph, SvcLogicContext ctx)
+			throws SvcLogicException {
+
+		if (nodeExecutors == null) {
+			registerExecutors();
+		}
+		
+		// Set service name in MDC to reference current working directed graph
+		MDC.put(MetricLogger.SERVICE_NAME, graph.getModule()+":"+graph.getRpc()+"/v"+graph.getVersion());
+
+		SvcLogicNode curNode = graph.getRootNode();
+		LOG.info("About to execute graph " + graph.toString());
+		
+		
+
+		while (curNode != null) {
+			LOG.info("About to execute node # "+curNode.getNodeId()+" ("+curNode.getNodeType()+")");
+			
+			SvcLogicNode nextNode = executeNode(curNode, ctx);
+			curNode = nextNode;
+		}
+
+		return (ctx);
+	}
+
+
+	public SvcLogicNode executeNode(SvcLogicNode node, SvcLogicContext ctx)
+			throws SvcLogicException {
+		if (node == null) {
+			return (null);
+		}
+
+		if (LOG.isDebugEnabled()) {
+			LOG.debug("Executing node " + node.getNodeId());
+		}
+
+		SvcLogicNodeExecutor executor = nodeExecutors.get(node.getNodeType());
+
+		if (executor != null) {
+			LOG.debug("Executing node executor for node type "+node.getNodeType()+" - "+executor.getClass().getName());
+			return (executor.execute(this, node, ctx));
+		} else {
+			if (LOG.isDebugEnabled()) {
+				LOG.debug(node.getNodeType() + " node not implemented");
+			}
+			SvcLogicNode nextNode = node.getOutcomeValue("failure");
+			if (nextNode != null) {
+				if (LOG.isDebugEnabled()) {
+					LOG.debug("about to execute failure branch");
+				}
+				return (nextNode);
+			}
+
+			nextNode = node.getOutcomeValue("Other");
+			if (nextNode != null) {
+				if (LOG.isDebugEnabled()) {
+					LOG.debug("about to execute Other branch");
+				}
+			} else {
+				if (LOG.isDebugEnabled()) {
+					LOG.debug("no failure or Other branch found");
+				}
+			}
+			return (nextNode);
+		}
+
+	}
+
+	@Override
+	public boolean hasGraph(String module, String rpc, String version, String mode) throws SvcLogicException
+	{
+		SvcLogicStore store = SvcLogicActivator.getStore();
+
+		return (store.hasGraph(module, rpc, version, mode));
+	}
+	
+	@Override
+	public Properties execute(String module, String rpc, String version, String mode, Properties props)
+			throws SvcLogicException {
+		return(execute(module, rpc, version, mode, props, null));
+	}
+	
+	
+	@Override
+	public Properties execute(String module, String rpc, String version, String mode,
+			Properties props, DOMDataBroker domDataBroker) throws SvcLogicException {
+		
+
+		// See if there is a service logic defined
+		//
+		SvcLogicStore store = SvcLogicActivator.getStore();
+
+		LOG.info("Fetching service logic from data store");
+		SvcLogicGraph graph = store.fetch(module, rpc, version, mode);
+		
+		
+		
+		if (graph == null)
+		{
+			Properties retProps = new Properties();
+			retProps.setProperty("error-code", "401");
+			retProps.setProperty("error-message", "No service logic found for ["+module+","+rpc+","+version+","+mode+"]");
+			return(retProps);
+
+		}
+		
+		SvcLogicContext ctx = new SvcLogicContext(props);
+        ctx.setAttribute("currentGraph", graph.toString());
+        ctx.setAttribute("X-ECOMP-RequestID", MDC.get("X-ECOMP-RequestID"));
+		ctx.setDomDataBroker(domDataBroker);
+		
+		execute(graph, ctx);
+
+		return(ctx.toProperties());
+	}
+	
+
+
+	
+}
diff --git a/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/SwitchNodeExecutor.java b/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/SwitchNodeExecutor.java
new file mode 100644
index 00000000..e8ae7c89
--- /dev/null
+++ b/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/SwitchNodeExecutor.java
@@ -0,0 +1,63 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdnc.sli.provider;
+
+import org.openecomp.sdnc.sli.SvcLogicContext;
+import org.openecomp.sdnc.sli.SvcLogicException;
+import org.openecomp.sdnc.sli.SvcLogicNode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class SwitchNodeExecutor extends SvcLogicNodeExecutor {
+
+	private static final Logger LOG = LoggerFactory
+			.getLogger(SwitchNodeExecutor.class);
+	
+	@Override
+
+	public SvcLogicNode execute(SvcLogicServiceImpl svc, SvcLogicNode node,
+			SvcLogicContext ctx) throws SvcLogicException {
+
+
+		String testResult = evaluateNodeTest(node, ctx);
+
+		if (LOG.isDebugEnabled()) {
+			LOG.debug("Executing switch node");
+			
+
+			LOG.debug("test expression (" + node.getAttribute("test")
+					+ ") evaluates to " + testResult);
+		}
+
+		SvcLogicNode nextNode = node.getOutcomeValue(testResult);
+
+		if (LOG.isDebugEnabled()) {
+			if (nextNode != null) {
+                LOG.debug("Next node to execute is node " + nextNode.getNodeId());
+			} else {
+				LOG.debug("No next node found");
+			}
+		}
+		return (nextNode);
+
+	}
+}
diff --git a/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/UpdateNodeExecutor.java b/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/UpdateNodeExecutor.java
new file mode 100644
index 00000000..9eeab65a
--- /dev/null
+++ b/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/UpdateNodeExecutor.java
@@ -0,0 +1,136 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdnc.sli.provider;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+
+import org.openecomp.sdnc.sli.SvcLogicContext;
+import org.openecomp.sdnc.sli.SvcLogicException;
+import org.openecomp.sdnc.sli.SvcLogicExpression;
+import org.openecomp.sdnc.sli.SvcLogicNode;
+import org.openecomp.sdnc.sli.SvcLogicResource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class UpdateNodeExecutor extends SvcLogicNodeExecutor {
+
+	private static final Logger LOG = LoggerFactory
+			.getLogger(UpdateNodeExecutor.class);
+
+	@Override
+	public SvcLogicNode execute(SvcLogicServiceImpl svc, SvcLogicNode node,
+			SvcLogicContext ctx) throws SvcLogicException {
+
+		String plugin = SvcLogicExpressionResolver.evaluate(
+				node.getAttribute("plugin"), node, ctx);
+		String resourceType = SvcLogicExpressionResolver.evaluate(
+				node.getAttribute("resource"), node, ctx);
+		String key = SvcLogicExpressionResolver.evaluateAsKey(
+				node.getAttribute("key"), node, ctx);
+		String pfx = SvcLogicExpressionResolver.evaluate(
+				node.getAttribute("pfx"), node, ctx);
+
+
+		Map<String, String> parmMap = new HashMap<String, String>();
+
+		Set<Map.Entry<String, SvcLogicExpression>> parmSet = node
+				.getParameterSet();
+		boolean hasParms = false;
+
+		for (Iterator<Map.Entry<String, SvcLogicExpression>> iter = parmSet
+				.iterator(); iter.hasNext();) {
+			hasParms = true;
+			Map.Entry<String, SvcLogicExpression> curEnt = iter.next();
+			String curName = curEnt.getKey();
+			SvcLogicExpression curExpr = curEnt.getValue();
+			if (curExpr != null) {
+				String curExprValue = SvcLogicExpressionResolver.evaluate(
+						curExpr, node, ctx);
+
+				LOG.debug("Parameter " + curName + " = "
+						+ curExpr.asParsedExpr() + " resolves to "
+						+ curExprValue);
+
+				parmMap.put(curName, curExprValue);
+			}
+		}
+
+		String outValue = "failure";
+
+		if (LOG.isDebugEnabled()) {
+			LOG.debug("save node encountered - looking for resource class "
+					+ plugin);
+		}
+
+
+        SvcLogicResource resourcePlugin = getSvcLogicResource(plugin);
+
+
+			if (resourcePlugin != null) {
+
+				try {
+					switch (resourcePlugin.update(resourceType, key,
+							parmMap, pfx, ctx)) {
+					case SUCCESS:
+						outValue = "success";
+						break;
+					case NOT_FOUND:
+						outValue = "not-found";
+						break;
+					case FAILURE:
+					default:
+						outValue = "failure";
+					}
+				} catch (SvcLogicException e) {
+					LOG.error("Caught exception from resource plugin", e);
+					outValue = "failure";
+				}
+			} else {
+				LOG.warn("Could not find SvcLogicResource object for plugin "
+						+ plugin);
+			}
+
+		SvcLogicNode nextNode = node.getOutcomeValue(outValue);
+		if (nextNode != null) {
+			if (LOG.isDebugEnabled()) {
+				LOG.debug("about to execute " + outValue + " branch");
+			}
+			return (nextNode);
+		}
+
+		nextNode = node.getOutcomeValue("Other");
+		if (nextNode != null) {
+			if (LOG.isDebugEnabled()) {
+				LOG.debug("about to execute Other branch");
+			}
+		} else {
+			if (LOG.isDebugEnabled()) {
+				LOG.debug("no "+outValue+" or Other branch found");
+			}
+		}
+		return (nextNode);
+	}
+
+}
diff --git a/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/WhileNodeExecutor.java b/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/WhileNodeExecutor.java
new file mode 100644
index 00000000..5bbab323
--- /dev/null
+++ b/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/WhileNodeExecutor.java
@@ -0,0 +1,75 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdnc.sli.provider;
+
+import org.openecomp.sdnc.sli.BreakNodeException;
+import org.openecomp.sdnc.sli.SvcLogicContext;
+import org.openecomp.sdnc.sli.SvcLogicException;
+import org.openecomp.sdnc.sli.SvcLogicExpression;
+import org.openecomp.sdnc.sli.SvcLogicNode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class WhileNodeExecutor extends SvcLogicNodeExecutor {
+
+    private static final Logger LOG = LoggerFactory.getLogger(WhileNodeExecutor.class);
+
+    @Override
+    public SvcLogicNode execute(SvcLogicServiceImpl svc, SvcLogicNode node, SvcLogicContext ctx) throws SvcLogicException {
+
+        String testResult = evaluateNodeTest(node, ctx);
+        SvcLogicExpression silentFailureExpr = node.getAttribute("do");
+        String doWhile = SvcLogicExpressionResolver.evaluate(silentFailureExpr, node, ctx);
+        if ("true".equals(doWhile)) {
+            LOG.debug("While loop will execute once regardless of expression because do is set to true");
+        }
+
+        try {
+            while ("true".equals(testResult) || "true".equals(doWhile)) {
+                if (!"true".equals(doWhile)) {
+                    LOG.debug("Test expression (" + node.getAttribute("test") + ") evaluates to true, executing loop.");
+                }
+                int numOutcomes = node.getNumOutcomes() + 1;
+                for (int i = 0; i < numOutcomes; i++) {
+                    SvcLogicNode nextNode = node.getOutcomeValue("" + (i + 1));
+                    if (nextNode != null) {
+                        while (nextNode != null) {
+                            nextNode = svc.executeNode(nextNode, ctx);
+                        }
+                    } else {
+                        if ("true".equals(doWhile)) {
+                            LOG.debug("Do executed, will only execute again if test expression is true.");
+                            doWhile = "false";
+                        }
+                        testResult = evaluateNodeTest(node, ctx);
+                        LOG.debug("test expression (" + node.getAttribute("test") + ") evaluates to " + testResult);
+                    }
+                }
+            }
+            LOG.debug("testResult was " + testResult + " which is not equal to true, exiting while loop.");
+        } catch (BreakNodeException e) {
+            LOG.debug("WhileNodeExecutor caught break");
+        }
+        return (null);
+    }
+
+}
diff --git a/sli/provider/src/test/java/org/openecomp/sdnc/sli/provider/BadPlugin.java b/sli/provider/src/test/java/org/openecomp/sdnc/sli/provider/BadPlugin.java
new file mode 100644
index 00000000..d1ab4cfd
--- /dev/null
+++ b/sli/provider/src/test/java/org/openecomp/sdnc/sli/provider/BadPlugin.java
@@ -0,0 +1,56 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdnc.sli.provider;
+
+import java.util.Map;
+
+import org.openecomp.sdnc.sli.SvcLogicContext;
+import org.openecomp.sdnc.sli.SvcLogicException;
+import org.openecomp.sdnc.sli.SvcLogicJavaPlugin;
+
+
+public class BadPlugin implements SvcLogicJavaPlugin {
+    public String selectLunch(Map<String, String> parameters, SvcLogicContext ctx) throws SvcLogicException {
+        String day = parameters.get("day");
+        if (day == null || day.length() < 1) {
+            throw new SvcLogicException("What day is it?");
+        }
+        switch (day) {
+        case ("monday"): {
+            return "pizza";
+        }
+        case ("tuesday"): {
+            return "soup";
+        }
+        case ("wednesday"): {
+            return "salad";
+        }
+        case ("thursday"): {
+            return "sushi";
+        }
+        case ("friday"): {
+            return "bbq";
+        }
+        }
+        throw new SvcLogicException("Lunch cannot be served");
+    }
+}
diff --git a/sli/provider/src/test/java/org/openecomp/sdnc/sli/provider/ExecuteNodeExecutorTest.java b/sli/provider/src/test/java/org/openecomp/sdnc/sli/provider/ExecuteNodeExecutorTest.java
new file mode 100644
index 00000000..3d43ee11
--- /dev/null
+++ b/sli/provider/src/test/java/org/openecomp/sdnc/sli/provider/ExecuteNodeExecutorTest.java
@@ -0,0 +1,57 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdnc.sli.provider;
+
+import java.util.Map.Entry;
+
+import org.openecomp.sdnc.sli.DuplicateValueException;
+import org.openecomp.sdnc.sli.SvcLogicContext;
+import org.openecomp.sdnc.sli.SvcLogicException;
+import org.openecomp.sdnc.sli.SvcLogicExpression;
+import org.openecomp.sdnc.sli.SvcLogicGraph;
+import org.openecomp.sdnc.sli.SvcLogicJavaPlugin;
+import org.openecomp.sdnc.sli.SvcLogicNode;
+
+import junit.framework.TestCase;
+
+public class ExecuteNodeExecutorTest extends TestCase {
+    public class MockExecuteNodeExecutor extends ExecuteNodeExecutor {
+
+        protected SvcLogicJavaPlugin getSvcLogicJavaPlugin(String pluginName) {
+            return (SvcLogicJavaPlugin) new LunchSelectorPlugin();
+        }
+
+        protected String evaluate(SvcLogicExpression expr, SvcLogicNode node,
+                SvcLogicContext ctx) throws SvcLogicException {
+            return "selectLunch";
+        }
+    }
+
+    public void testBadPlugin() throws DuplicateValueException, SvcLogicException {
+        LunchSelectorPlugin p = new LunchSelectorPlugin();
+        MockExecuteNodeExecutor execute = new MockExecuteNodeExecutor();
+        SvcLogicNode node = new SvcLogicNode(0, "", "", new SvcLogicGraph());
+        node.setAttribute("method", "selectLunch");
+        execute.execute(new SvcLogicServiceImpl(), new SvcLogicNode(0, "", "", new SvcLogicGraph()), new SvcLogicContext());
+    }
+
+}
diff --git a/sli/provider/src/test/java/org/openecomp/sdnc/sli/provider/LunchSelectorPlugin.java b/sli/provider/src/test/java/org/openecomp/sdnc/sli/provider/LunchSelectorPlugin.java
new file mode 100644
index 00000000..b9156bcd
--- /dev/null
+++ b/sli/provider/src/test/java/org/openecomp/sdnc/sli/provider/LunchSelectorPlugin.java
@@ -0,0 +1,78 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdnc.sli.provider;
+
+import java.util.Map;
+
+import org.openecomp.sdnc.sli.SvcLogicContext;
+import org.openecomp.sdnc.sli.SvcLogicException;
+import org.openecomp.sdnc.sli.SvcLogicJavaPlugin;
+
+
+
+public class LunchSelectorPlugin implements SvcLogicJavaPlugin {
+    public class UnknownLunchDayException extends Exception{
+
+        public UnknownLunchDayException(String string) {
+            super(string);
+        }
+
+    }
+    class Sandwhich {
+        String meat;
+        String cheese;
+
+        public Sandwhich(String meat, String cheese) {
+            this.meat = meat;
+            this.cheese = cheese;
+        }
+    }
+
+    public String selectLunch(Map<String, String> parameters, SvcLogicContext ctx) throws Exception {
+        String day = parameters.get("day");
+        if (day == null || day.length() < 1) {
+            throw new UnknownLunchDayException("What day is it?");
+        }
+        switch (day) {
+        case ("monday"): {
+            return "pizza";
+        }
+        case ("tuesday"): {
+            return "soup";
+        }
+        case ("wednesday"): {
+            return "salad";
+        }
+        case ("thursday"): {
+            return "sushi";
+        }
+        case ("friday"): {
+            return "bbq";
+        }
+        }
+        throw new SvcLogicException("Lunch cannot be served");
+    }
+
+    public Sandwhich makeLunch(Map<String, String> parameters, SvcLogicContext ctx) throws SvcLogicException {
+        return new Sandwhich("ham", "american");
+    }
+}
diff --git a/sli/provider/src/test/java/org/openecomp/sdnc/sli/provider/MdsalHelperTest.java b/sli/provider/src/test/java/org/openecomp/sdnc/sli/provider/MdsalHelperTest.java
new file mode 100644
index 00000000..a4e41bba
--- /dev/null
+++ b/sli/provider/src/test/java/org/openecomp/sdnc/sli/provider/MdsalHelperTest.java
@@ -0,0 +1,43 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdnc.sli.provider;
+
+import junit.framework.TestCase;
+
+public class MdsalHelperTest extends TestCase {
+
+    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"));
+        assertEquals("notifycomplete", MdsalHelperTesterUtil.mapEnumeratedValue("request-status", "notifycomplete"));
+        assertEquals("service-configuration-operation", MdsalHelperTesterUtil.mapEnumeratedValue("rpc-name",
+                "ServiceConfigurationOperation"));
+    }
+
+    public void testNegativeSdnProperties() {
+        assertNotSame("synccomplete", MdsalHelperTesterUtil.mapEnumeratedValue("request-status", "Synccomplete"));
+    }
+
+}
diff --git a/sli/provider/src/test/java/org/openecomp/sdnc/sli/provider/MdsalHelperTesterUtil.java b/sli/provider/src/test/java/org/openecomp/sdnc/sli/provider/MdsalHelperTesterUtil.java
new file mode 100644
index 00000000..01e333f6
--- /dev/null
+++ b/sli/provider/src/test/java/org/openecomp/sdnc/sli/provider/MdsalHelperTesterUtil.java
@@ -0,0 +1,37 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdnc.sli.provider;
+
+import org.openecomp.sdnc.sli.provider.MdsalHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class MdsalHelperTesterUtil extends MdsalHelper {
+
+    private static final Logger LOG = LoggerFactory.getLogger(MdsalHelperTesterUtil.class);
+    
+    //Normally static init of classes goes here for some weird classloader thing
+    static {
+        String str = "Hello World!";
+    }
+
+}
diff --git a/sli/provider/src/test/java/org/openecomp/sdnc/sli/provider/PluginTest.java b/sli/provider/src/test/java/org/openecomp/sdnc/sli/provider/PluginTest.java
new file mode 100644
index 00000000..035cd3e7
--- /dev/null
+++ b/sli/provider/src/test/java/org/openecomp/sdnc/sli/provider/PluginTest.java
@@ -0,0 +1,106 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdnc.sli.provider;
+
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.openecomp.sdnc.sli.SvcLogicContext;
+import org.openecomp.sdnc.sli.SvcLogicGraph;
+import org.openecomp.sdnc.sli.SvcLogicJavaPlugin;
+import org.openecomp.sdnc.sli.SvcLogicNode;
+
+import junit.framework.TestCase;
+
+public class PluginTest extends TestCase {
+
+    // The existing plugins work just like a VoidDummyPlugin
+    // They will return null simply because they are all void
+    // The attribute emitsOutcome will not be present, the expected outcome is success when no exception is thrown by the plugin
+    public void testOldPlugin() throws Exception {
+        ExecuteNodeExecutor executor = new ExecuteNodeExecutor();
+        SvcLogicJavaPlugin plugin = new VoidDummyPlugin();
+
+        Class pluginClass = plugin.getClass();
+        Method pluginMethod = pluginClass.getMethod("dummy", Map.class, SvcLogicContext.class);
+        Map<String, String> parmMap = new HashMap<String, String>();
+        SvcLogicContext ctx = new SvcLogicContext();
+        Object o = pluginMethod.invoke(plugin, parmMap, ctx);
+
+        SvcLogicGraph graph = new SvcLogicGraph();
+        SvcLogicNode node = new SvcLogicNode(1, "return", graph);
+        String emitsOutcome = SvcLogicExpressionResolver.evaluate(node.getAttribute("emitsOutcome"),  node, ctx);
+        String outValue = executor.mapOutcome(o, emitsOutcome);
+        assertEquals("success",outValue);
+    }
+
+    //Newer plugins can set the attribute emitsOutcome to true, if so they should return a string
+    //The string represents the outcome value
+    public void testNewPlugin() throws Exception {
+        ExecuteNodeExecutor executor = new ExecuteNodeExecutor();
+        SvcLogicJavaPlugin plugin = new LunchSelectorPlugin();
+
+        Class pluginClass = plugin.getClass();
+        Method pluginMethod = pluginClass.getMethod("selectLunch", Map.class, SvcLogicContext.class);
+
+        Map<String, String> parmMap = new HashMap<String, String>();
+        SvcLogicContext ctx = new SvcLogicContext();
+
+        parmMap.put("day", "monday");
+        Object o = pluginMethod.invoke(plugin, parmMap, ctx);
+        SvcLogicGraph graph = new SvcLogicGraph();
+        SvcLogicNode node = new SvcLogicNode(1, "return", graph);
+        node.setAttribute("emitsOutcome", "true");
+        String emitsOutcome = SvcLogicExpressionResolver.evaluate(node.getAttribute("emitsOutcome"),  node, ctx);
+        String outValue = executor.mapOutcome(o, emitsOutcome);
+        assertEquals("pizza", outValue);
+
+        parmMap.put("day", "tuesday");
+        outValue = (String) pluginMethod.invoke(plugin, parmMap, ctx);
+        o = pluginMethod.invoke(plugin, parmMap, ctx);
+        outValue = executor.mapOutcome(o, emitsOutcome);
+        assertEquals("soup",outValue);
+
+    }
+
+    //APPC had some legacy plugins returning objects which should not be treated as outcomes
+    //The attribute emitsOutcome will not be set
+    //The outcome should be success as it has always been
+    public void testObjPlugin() throws Exception{
+        ExecuteNodeExecutor executor = new ExecuteNodeExecutor();
+        SvcLogicJavaPlugin plugin = new LunchSelectorPlugin();
+
+        Class pluginClass = plugin.getClass();
+        Method pluginMethod = pluginClass.getMethod("makeLunch", Map.class, SvcLogicContext.class);
+
+        Map<String, String> parmMap = new HashMap<String, String>();
+        SvcLogicContext ctx = new SvcLogicContext();
+        Object o = pluginMethod.invoke(plugin, parmMap, ctx);
+        SvcLogicGraph graph = new SvcLogicGraph();
+        SvcLogicNode node = new SvcLogicNode(1, "return", graph);
+        String emitsOutcome = SvcLogicExpressionResolver.evaluate(node.getAttribute("emitsOutcome"),  node, ctx);
+        String outValue = executor.mapOutcome(o, emitsOutcome);
+        assertEquals("success",outValue);
+    }
+
+}
diff --git a/sli/provider/src/test/java/org/openecomp/sdnc/sli/provider/SvcLogicExpressionResolverTest.java b/sli/provider/src/test/java/org/openecomp/sdnc/sli/provider/SvcLogicExpressionResolverTest.java
new file mode 100644
index 00000000..61815488
--- /dev/null
+++ b/sli/provider/src/test/java/org/openecomp/sdnc/sli/provider/SvcLogicExpressionResolverTest.java
@@ -0,0 +1,123 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdnc.sli.provider;
+
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+
+import org.openecomp.sdnc.sli.SvcLogicContext;
+import org.openecomp.sdnc.sli.SvcLogicExprListener;
+import org.openecomp.sdnc.sli.SvcLogicExpression;
+import org.openecomp.sdnc.sli.SvcLogicExpressionFactory;
+import org.openecomp.sdnc.sli.SvcLogicGraph;
+import org.openecomp.sdnc.sli.SvcLogicNode;
+import org.openecomp.sdnc.sli.provider.SvcLogicExpressionResolver;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
+public class SvcLogicExpressionResolverTest extends TestCase {
+	
+
+	private static final Logger LOG = LoggerFactory
+			.getLogger(SvcLogicExpressionResolver.class);
+	
+	public void testEvaluate()
+	{
+		InputStream testStr = getClass().getResourceAsStream("/expression.tests");
+		BufferedReader testsReader = new BufferedReader(new InputStreamReader(testStr));
+		
+		try
+		{
+			SvcLogicContext ctx = new SvcLogicContext();
+			SvcLogicGraph graph = new SvcLogicGraph();
+			SvcLogicNode node = new SvcLogicNode(1, "return", graph);
+			graph.setRootNode(node);
+
+			String line = null;
+			int lineNo = 0;
+			while ((line = testsReader.readLine()) != null) {
+				++lineNo;
+				if (line.startsWith("#"))
+				{
+					String testExpr = line.trim().substring(1).trim();
+					String[] nameValue = testExpr.split("=");
+					String name = nameValue[0].trim();
+					String value = nameValue[1].trim();
+
+					if (name.startsWith("$"))
+					{
+						LOG.info("Setting context attribute "+name+" = "+value);
+						ctx.setAttribute(name.substring(1), value);
+					}
+					else
+					{
+
+						LOG.info("Setting node attribute "+name+" = "+value);
+						node.setAttribute(name, value);
+						
+					}
+				}
+				else
+				{
+					// if the line contains #, what comes before is the expression to evaluate, and what comes after
+					// is the expected value
+					String[] substrings = line.split("#");
+					String expectedValue = substrings.length > 1 ? substrings[1].trim() : null;
+					String testExpr = substrings[0].trim();
+
+					LOG.info("Parsing expression "+testExpr);
+					SvcLogicExpression expr = SvcLogicExpressionFactory.parse(testExpr);
+					if (expr == null)
+					{
+						fail("Unable to parse expression "+testExpr);
+					}
+					else
+					{
+						LOG.info("Evaluating parsed expression "+expr.asParsedExpr());
+						String exprValue = SvcLogicExpressionResolver.evaluate(expr,  node, ctx);
+						if (exprValue == null)
+						{
+							fail("Unable to evaluate expression "+testExpr);
+						}
+						else
+						{
+							LOG.info("Expression " + testExpr + " evaluates to " + exprValue);
+							if (expectedValue != null) {
+								Assert.assertEquals("Line " + lineNo + ": " + testExpr, expectedValue, exprValue);
+							}
+						}
+					}
+				}
+			}
+		}
+		catch (Exception e)
+		{
+			LOG.error("Caught exception", e);
+			fail("Caught exception");
+		}
+	}
+
+}
diff --git a/sli/provider/src/test/java/org/openecomp/sdnc/sli/provider/SvcLogicGraphExecutorTest.java b/sli/provider/src/test/java/org/openecomp/sdnc/sli/provider/SvcLogicGraphExecutorTest.java
new file mode 100644
index 00000000..2e8b35e1
--- /dev/null
+++ b/sli/provider/src/test/java/org/openecomp/sdnc/sli/provider/SvcLogicGraphExecutorTest.java
@@ -0,0 +1,212 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdnc.sli.provider;
+
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.Map;
+import java.util.Properties;
+
+import org.openecomp.sdnc.sli.MetricLogger;
+import org.openecomp.sdnc.sli.SvcLogicContext;
+import org.openecomp.sdnc.sli.SvcLogicGraph;
+import org.openecomp.sdnc.sli.SvcLogicNode;
+import org.openecomp.sdnc.sli.SvcLogicParser;
+import org.openecomp.sdnc.sli.SvcLogicStore;
+import org.openecomp.sdnc.sli.SvcLogicStoreFactory;
+import org.openecomp.sdnc.sli.provider.BlockNodeExecutor;
+import org.openecomp.sdnc.sli.provider.CallNodeExecutor;
+import org.openecomp.sdnc.sli.provider.ConfigureNodeExecutor;
+import org.openecomp.sdnc.sli.provider.DeleteNodeExecutor;
+import org.openecomp.sdnc.sli.provider.ExecuteNodeExecutor;
+import org.openecomp.sdnc.sli.provider.ExistsNodeExecutor;
+import org.openecomp.sdnc.sli.provider.ForNodeExecutor;
+import org.openecomp.sdnc.sli.provider.GetResourceNodeExecutor;
+import org.openecomp.sdnc.sli.provider.IsAvailableNodeExecutor;
+import org.openecomp.sdnc.sli.provider.NotifyNodeExecutor;
+import org.openecomp.sdnc.sli.provider.RecordNodeExecutor;
+import org.openecomp.sdnc.sli.provider.ReleaseNodeExecutor;
+import org.openecomp.sdnc.sli.provider.ReserveNodeExecutor;
+import org.openecomp.sdnc.sli.provider.ReturnNodeExecutor;
+import org.openecomp.sdnc.sli.provider.SaveNodeExecutor;
+import org.openecomp.sdnc.sli.provider.SetNodeExecutor;
+import org.openecomp.sdnc.sli.provider.SvcLogicNodeExecutor;
+import org.openecomp.sdnc.sli.provider.SvcLogicServiceImpl;
+import org.openecomp.sdnc.sli.provider.SwitchNodeExecutor;
+import org.openecomp.sdnc.sli.provider.UpdateNodeExecutor;
+import org.osgi.framework.ServiceRegistration;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import junit.framework.TestCase;
+
+public class SvcLogicGraphExecutorTest extends TestCase {
+	private static final Logger LOG = LoggerFactory
+			.getLogger(SvcLogicGraph.class);
+	
+	private static final Map<String, SvcLogicNodeExecutor> BUILTIN_NODES = new HashMap<String, SvcLogicNodeExecutor>() {
+		{
+			put("block", new BlockNodeExecutor());
+			put("call", new CallNodeExecutor());
+			put("configure", new ConfigureNodeExecutor());
+			put("delete", new DeleteNodeExecutor());
+			put("execute", new ExecuteNodeExecutor());
+			put("exists", new ExistsNodeExecutor());
+			put("for", new ForNodeExecutor());
+			put("get-resource", new GetResourceNodeExecutor());
+			put("is-available", new IsAvailableNodeExecutor());
+			put("notify", new NotifyNodeExecutor());
+			put("record", new RecordNodeExecutor());
+			put("release", new ReleaseNodeExecutor());
+			put("reserve", new ReserveNodeExecutor());
+			put("return", new ReturnNodeExecutor());
+			put("save", new SaveNodeExecutor());
+			put("set", new SetNodeExecutor());
+			put("switch", new SwitchNodeExecutor());
+			put("update", new UpdateNodeExecutor());
+
+		}
+	};
+	
+	public void testExecute() {
+		
+		try {
+			InputStream testStr = getClass().getResourceAsStream("/executor.tests");
+			BufferedReader testsReader = new BufferedReader(new InputStreamReader(testStr));
+			
+			InputStream propStr = getClass().getResourceAsStream("/svclogic.properties");
+			
+			SvcLogicStore store = SvcLogicStoreFactory.getSvcLogicStore(propStr);
+			
+			assertNotNull(store);
+			
+			store.registerNodeType("switch");
+			store.registerNodeType("block");
+			store.registerNodeType("get-resource");
+			store.registerNodeType("reserve");
+			store.registerNodeType("is-available");
+			store.registerNodeType("exists");
+			store.registerNodeType("configure");
+			store.registerNodeType("return");
+			store.registerNodeType("record");
+			store.registerNodeType("allocate");
+			store.registerNodeType("release");
+			store.registerNodeType("for");
+			store.registerNodeType("set");
+			SvcLogicParser parser = new SvcLogicParser(store);
+			
+			// Loop through executor tests
+
+			SvcLogicServiceImpl svc = new SvcLogicServiceImpl();
+			
+			for (String nodeType : BUILTIN_NODES.keySet()) {
+
+				LOG.info("SLI - registering node executor for node type "+nodeType);
+				
+				svc.registerExecutor(nodeType, BUILTIN_NODES.get(nodeType));
+
+			}
+			String testCaseLine = null;
+			while ((testCaseLine = testsReader.readLine()) != null) {
+				
+				String[] testCaseFields = testCaseLine.split(":");
+				String testCaseFile = testCaseFields[0];
+				String testCaseMethod = testCaseFields[1];
+				String testCaseParameters = null;
+				
+				if (testCaseFields.length > 2) {
+					testCaseParameters = testCaseFields[2];
+				}
+
+				SvcLogicContext ctx = new SvcLogicContext();
+				if (testCaseParameters != null) {
+					String[] testCaseParameterSettings = testCaseParameters.split(",");
+					
+					for (int i = 0 ; i < testCaseParameterSettings.length ; i++) {
+						String[] nameValue = testCaseParameterSettings[i].split("=");
+						if (nameValue != null) {
+							String name = nameValue[0];
+							String value = "";
+							if (nameValue.length > 1) {
+								value = nameValue[1];
+							}
+							
+							ctx.setAttribute(name,  value);
+						}
+					}
+				}
+				
+				testCaseFile = testCaseFile.trim();
+				
+				if (testCaseFile.length() > 0) {
+					if (!testCaseFile.startsWith("/")) {
+						testCaseFile = "/"+testCaseFile;
+					}
+					URL testCaseUrl = getClass().getResource(testCaseFile);
+					if (testCaseUrl == null) {
+						fail("Could not resolve test case file "+testCaseFile);
+					}
+					
+					LinkedList<SvcLogicGraph> graphs = parser.parse(testCaseUrl.getPath());
+					
+
+					assertNotNull(graphs);
+					
+					for (SvcLogicGraph graph: graphs) {
+						if (graph.getRpc().equals(testCaseMethod)) {
+							Properties props = ctx.toProperties();
+							LOG.info("SvcLogicContext before executing "+testCaseMethod+":");
+							for (Enumeration e1 = props.propertyNames(); e1.hasMoreElements() ; ) {
+								String propName = (String) e1.nextElement();
+								LOG.info(propName+" = "+props.getProperty(propName));
+							}
+							
+							svc.execute(graph, ctx);
+							
+							props = ctx.toProperties();
+							LOG.info("SvcLogicContext after executing "+testCaseMethod+":");
+							for (Enumeration e2 = props.propertyNames(); e2.hasMoreElements() ; ) {
+								String propName = (String) e2.nextElement();
+								LOG.info(propName+" = "+props.getProperty(propName));
+							}
+						}
+					}
+
+				}
+				
+				
+			}
+			
+			
+		} catch (Exception e) {
+			LOG.error("Caught exception executing directed graphs", e);
+			fail("Exception executing graphs");
+		}
+	}
+
+	
+}
diff --git a/sli/provider/src/test/java/org/openecomp/sdnc/sli/provider/VoidDummyPlugin.java b/sli/provider/src/test/java/org/openecomp/sdnc/sli/provider/VoidDummyPlugin.java
new file mode 100644
index 00000000..6c8214ab
--- /dev/null
+++ b/sli/provider/src/test/java/org/openecomp/sdnc/sli/provider/VoidDummyPlugin.java
@@ -0,0 +1,38 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdnc.sli.provider;
+
+import java.util.Map;
+
+import org.openecomp.sdnc.sli.SvcLogicContext;
+import org.openecomp.sdnc.sli.SvcLogicException;
+import org.openecomp.sdnc.sli.SvcLogicJavaPlugin;
+
+
+
+public class VoidDummyPlugin implements SvcLogicJavaPlugin {
+
+    public void dummy(Map<String, String> parameters, SvcLogicContext ctx) throws SvcLogicException {
+        return;
+    }
+
+}
diff --git a/sli/provider/src/test/resources/executor.tests b/sli/provider/src/test/resources/executor.tests
new file mode 100755
index 00000000..e7547e63
--- /dev/null
+++ b/sli/provider/src/test/resources/executor.tests
@@ -0,0 +1,2 @@
+l3sdn_logic_v10.xml:switchTester:test-value=""
+l3sdn_logic_v10.xml:switchTester:test-value="hi"
\ No newline at end of file
diff --git a/sli/provider/src/test/resources/expression.tests b/sli/provider/src/test/resources/expression.tests
new file mode 100755
index 00000000..848a0e7a
--- /dev/null
+++ b/sli/provider/src/test/resources/expression.tests
@@ -0,0 +1,24 @@
+# $uni-circuit-id = abc123
+# $uni-cir-units = 10
+# value = 1
+# $arg1 = 2
+# $network.name = vCE0001.in
+# $network.segment[0].provider-segmentation-id = 1212
+# $network.segment[1].provider-segmentation-id = 1213
+# $availability-zone = mtsnj-esx-az01
+length($uni-circuit-id) > 0 # true
+$uni-cir-units * 1000 * 100 / 100 # 10000
+$uni-cir-units / 1000 # 0
+$uni-cir-units - 100 # -90
+$uni-cir-units + 100 # 110
+(value * 3 - $arg1 > 0) and (length($uni-circuit-id) == 0) # true
+'pg-'+$network.name # pg-vCE0001.in
+$network.segment[0].provider-segmentation-id # 1212
+toUpperCase($network.name) # VCE0001.IN
+toLowerCase($network.name) # vce0001.in
+toUpperCase(substr($availability-zone, 0, 5)) # MTSNJ
+convertBase(1234, 10) # 1234
+convertBase(10, 16, 10) # 16
+convertBase(ZZ, 36, 10) # 1295
+convertBase(10, 10, 36) # a
+(0 - 1) * $arg1 # -1
diff --git a/sli/provider/src/test/resources/l3sdn_logic_v10.xml b/sli/provider/src/test/resources/l3sdn_logic_v10.xml
new file mode 100644
index 00000000..d81b8b78
--- /dev/null
+++ b/sli/provider/src/test/resources/l3sdn_logic_v10.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ============LICENSE_START=======================================================
+  openECOMP : SDN-C
+  ================================================================================
+  Copyright (C) 2017 AT&T Intellectual Property. All rights
+  						reserved.
+  ================================================================================
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  ============LICENSE_END=========================================================
+  -->
+
+
+<service-logic xmlns="http://www.openecomp.org/sdnc/svclogic"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd"
+    module="neutron" version="1.0.0">
+
+    <method rpc="canCreateNetwork" mode="sync">
+        <return status="success">
+            <parameter name="error-code" value="200" />
+        </return>
+    </method>
+
+    <method rpc="switchTester" mode="sync">
+
+       <switch test="`$test-value`">
+         <outcome value="">
+             <return status="success">
+                <parameter name="visited-outcome" value="empty string" />
+            </return>
+         </outcome>
+         <outcome value="Other">
+            <return status="success">
+                <parameter name="visited-outcome" value="Other" />
+            </return>
+         </outcome>
+       </switch>
+
+
+    </method>
+
+    <method rpc="networkCreated" mode="sync">
+        <switch test="length($network.segment[0].provider-physical-network) >= 5 and substr($network.segment[0].provider-physical-network,0,5) == 'dvspg'">
+            <outcome value="true">
+                <block>
+                <set>
+                  <parameter name="$vlanlist" value="$network.segment[0].provider-segmentation-id"/>
+                </set>
+                <for index="i" start="1" end="$network.num-segments">
+                  <set>
+                    <parameter name="$vlanlist" value="eval($vlanlist+','+$network.segment[i].provider-segmentation-id)"/>
+                  </set>
+                </for>
+
+                </block>
+            </outcome>
+            <outcome value="Other">
+                <return status="success">
+                    <parameter name="error-code" value="200"/>
+                </return>
+            </outcome>
+        </switch>
+    </method>
+
+</service-logic>
diff --git a/sli/provider/src/test/resources/simplelogger.properties b/sli/provider/src/test/resources/simplelogger.properties
new file mode 100644
index 00000000..3581395a
--- /dev/null
+++ b/sli/provider/src/test/resources/simplelogger.properties
@@ -0,0 +1,22 @@
+###
+# ============LICENSE_START=======================================================
+# openECOMP : SDN-C
+# ================================================================================
+# Copyright (C) 2017 AT&T Intellectual Property. All rights
+# 						reserved.
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#      http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ============LICENSE_END=========================================================
+###
+
+org.slf4j.simpleLogger.defaultLogLevel=info
diff --git a/sli/provider/src/test/resources/svclogic.properties b/sli/provider/src/test/resources/svclogic.properties
new file mode 100644
index 00000000..fa33146e
--- /dev/null
+++ b/sli/provider/src/test/resources/svclogic.properties
@@ -0,0 +1,26 @@
+###
+# ============LICENSE_START=======================================================
+# openECOMP : SDN-C
+# ================================================================================
+# Copyright (C) 2017 AT&T Intellectual Property. All rights
+# 						reserved.
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#      http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ============LICENSE_END=========================================================
+###
+
+org.openecomp.sdnc.sli.dbtype = jdbc
+org.openecomp.sdnc.sli.jdbc.url = jdbc:mysql://localhost:3306/sdnctl
+org.openecomp.sdnc.sli.jdbc.database = sdnctl
+org.openecomp.sdnc.sli.jdbc.user = sdnctl
+org.openecomp.sdnc.sli.jdbc.password = gamma
diff --git a/sli/recording/pom.xml b/sli/recording/pom.xml
new file mode 100755
index 00000000..4fb4a797
--- /dev/null
+++ b/sli/recording/pom.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.openecomp.sdnc.core</groupId>
+    <artifactId>sli</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+  </parent>
+  <artifactId>sli-recording</artifactId>
+  <packaging>bundle</packaging>
+  <name>SLI - Recording</name>
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+    		<dependency>
+			<groupId>org.openecomp.sdnc.core</groupId>
+			<artifactId>sli-common</artifactId>
+			<version>${project.version}</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>equinoxSDK381</groupId>
+			<artifactId>org.eclipse.osgi</artifactId>
+			<version>${equinox.osgi.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>${slf4j.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>jcl-over-slf4j</artifactId>
+			<version>${slf4j.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>commons-lang</groupId>
+			<artifactId>commons-lang</artifactId>
+			<version>2.6</version>
+			<scope>compile</scope>
+		</dependency>
+
+  </dependencies>
+
+  <build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<version>${bundle.plugin.version}</version>
+				<extensions>true</extensions>
+				<configuration>
+					<instructions>
+						<Bundle-Activator>org.openecomp.sdnc.sli.recording.RecordingActivator</Bundle-Activator>
+						<Export-Package>org.openecomp.sdnc.sli.recording;version=${project.version}</Export-Package>
+						<Import-Package>*</Import-Package>
+						<Embed-Transitive>true</Embed-Transitive>
+					</instructions>
+
+
+				</configuration>
+
+			</plugin>
+
+
+		</plugins>
+	</build>
+  <description>SLI Recording is an OSGi bundle that implements recording service for the service logic record node.</description>
+</project>
diff --git a/sli/recording/src/main/java/org/openecomp/sdnc/sli/recording/FileRecorder.java b/sli/recording/src/main/java/org/openecomp/sdnc/sli/recording/FileRecorder.java
new file mode 100644
index 00000000..dc857b25
--- /dev/null
+++ b/sli/recording/src/main/java/org/openecomp/sdnc/sli/recording/FileRecorder.java
@@ -0,0 +1,117 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdnc.sli.recording;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.PrintWriter;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Map;
+import java.util.TimeZone;
+
+import org.openecomp.sdnc.sli.ConfigurationException;
+import org.openecomp.sdnc.sli.SvcLogicException;
+import org.openecomp.sdnc.sli.SvcLogicRecorder;
+
+
+public class FileRecorder implements SvcLogicRecorder {
+
+	@Override
+	public void record(Map<String, String> parmMap) throws SvcLogicException {
+		
+		String fileName = parmMap.get("file");
+		if (fileName == null)
+		{
+			throw new ConfigurationException("No file parameter specified");
+		}
+		
+		String record = parmMap.get("record");
+		if (record == null)
+		{
+			String delimiter = parmMap.get("delimiter");
+			if (delimiter == null)
+			{
+				delimiter = "|";
+			}
+			
+			int idx = 1;
+			boolean moreFields = true;
+			while (moreFields)
+			{
+				String curField = parmMap.get("field"+idx++);
+				if (curField == null)
+				{
+					moreFields = false;
+				}
+				else
+				{
+					if (record == null)
+					{
+						record = delimiter;
+					}
+					record = record + curField + delimiter;
+				}
+			}
+		}
+		
+		if (record == null)
+		{
+			throw new ConfigurationException("No record/fields passed in record node");
+		}
+		
+		File recordFile = new File(fileName);
+		PrintWriter recPrinter = null;
+		Date now = new Date();
+
+		TimeZone tz = TimeZone.getTimeZone("UTC");
+		DateFormat dateFmt = new SimpleDateFormat("yyy-MM-dd'T'HH:mm:ss:SS'+00:00'");
+		dateFmt.setTimeZone(tz);
+		if (record.indexOf("__TIMESTAMP__") != -1)
+		{
+			record = record.replaceFirst("__TIMESTAMP__", dateFmt.format(now));
+		}
+		
+		try
+		{
+		
+			recPrinter = new PrintWriter(new FileWriter(recordFile, true));
+			recPrinter.println(record);
+		}
+		catch (Exception e)
+		{
+			throw new SvcLogicException("Cannot write record to file", e);
+		}
+		finally
+		{
+			if (recPrinter != null)
+			{
+				recPrinter.close();
+			}
+		}
+		
+		
+	}
+
+}
+
diff --git a/sli/recording/src/main/java/org/openecomp/sdnc/sli/recording/RecordingActivator.java b/sli/recording/src/main/java/org/openecomp/sdnc/sli/recording/RecordingActivator.java
new file mode 100644
index 00000000..d6e016af
--- /dev/null
+++ b/sli/recording/src/main/java/org/openecomp/sdnc/sli/recording/RecordingActivator.java
@@ -0,0 +1,75 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdnc.sli.recording;
+
+import java.util.LinkedList;
+
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+import org.osgi.framework.ServiceRegistration;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+public class RecordingActivator implements BundleActivator {
+
+	private LinkedList<ServiceRegistration> registrations = new LinkedList<ServiceRegistration>();
+
+	private static final Logger LOG = LoggerFactory
+			.getLogger(RecordingActivator.class);
+	
+	@Override
+	public void start(BundleContext ctx) throws Exception {
+		
+		if (registrations == null)
+		{
+			registrations = new LinkedList<ServiceRegistration>();
+		}
+		
+
+		FileRecorder fileRecorder = new FileRecorder();
+		String regName = fileRecorder.getClass().getName();
+		LOG.debug("Registering FileRecorder service "+regName);
+		ServiceRegistration reg =ctx.registerService(regName, fileRecorder, null);
+		registrations.add(reg);
+		
+		Slf4jRecorder slf4jRecorder = new Slf4jRecorder();
+		regName = slf4jRecorder.getClass().getName();
+		LOG.debug("Registering Slf4jRecorder service "+regName);
+		reg =ctx.registerService(regName, slf4jRecorder, null);
+		registrations.add(reg);
+		
+	}
+
+	@Override
+	public void stop(BundleContext arg0) throws Exception {
+		if (registrations != null) {
+			for (ServiceRegistration reg : registrations) {
+				ServiceReference regRef = reg.getReference();
+				reg.unregister();
+			}
+			registrations = null;
+		}
+	}
+
+}
diff --git a/sli/recording/src/main/java/org/openecomp/sdnc/sli/recording/Slf4jRecorder.java b/sli/recording/src/main/java/org/openecomp/sdnc/sli/recording/Slf4jRecorder.java
new file mode 100644
index 00000000..5aad6f25
--- /dev/null
+++ b/sli/recording/src/main/java/org/openecomp/sdnc/sli/recording/Slf4jRecorder.java
@@ -0,0 +1,130 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdnc.sli.recording;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Map;
+import java.util.TimeZone;
+
+import org.openecomp.sdnc.sli.ConfigurationException;
+import org.openecomp.sdnc.sli.SvcLogicException;
+import org.openecomp.sdnc.sli.SvcLogicRecorder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class Slf4jRecorder implements SvcLogicRecorder {
+	
+	
+	public enum Level {
+		ERROR,
+		WARN,
+		INFO,
+		DEBUG,
+		TRACE
+	}
+
+	@Override
+	public void record(Map<String, String> parmMap) throws SvcLogicException {
+		String loggerName = parmMap.get("logger");
+		if (loggerName == null) {
+			loggerName = "Log4jRecorder";
+		}
+		
+		String lvl = parmMap.get("level");
+		if (lvl == null) {
+			lvl = "INFO";
+		}
+
+		Level level = Level.INFO;
+		
+		try {
+			level = Level.valueOf(lvl.toUpperCase());
+		} catch (Exception e) {}
+		
+		
+		
+		String record = parmMap.get("record");
+		if (record == null)
+		{
+			String delimiter = parmMap.get("delimiter");
+			if (delimiter == null)
+			{
+				delimiter = "|";
+			}
+			
+			int idx = 1;
+			boolean moreFields = true;
+			while (moreFields)
+			{
+				String curField = parmMap.get("field"+idx++);
+				if (curField == null)
+				{
+					moreFields = false;
+				}
+				else
+				{
+					if (record == null)
+					{
+						record = delimiter;
+					}
+					record = record + curField + delimiter;
+				}
+			}
+		}
+		
+		if (record == null)
+		{
+			throw new ConfigurationException("No record/fields passed in record node");
+		}
+		
+		Logger logger = LoggerFactory.getLogger(loggerName);
+
+		Date now = new Date();
+		TimeZone tz = TimeZone.getTimeZone("UTC");
+		DateFormat dateFmt = new SimpleDateFormat("yyy-MM-dd'T'HH:mm:ss:SS'+00:00'");
+		dateFmt.setTimeZone(tz);
+		if (record.indexOf("__TIMESTAMP__") != -1)
+		{
+			record = record.replaceFirst("__TIMESTAMP__", dateFmt.format(now));
+		}
+		
+		switch (level) {
+		case ERROR:
+			logger.error(record);
+			break;
+		case WARN:
+			logger.warn(record);
+			break;
+		case INFO:
+			logger.info(record);
+			break;
+		case DEBUG:
+			logger.debug(record);
+			break;
+		case TRACE:
+			logger.trace(record);
+		}
+	}
+
+}
diff --git a/sli/recording/src/main/resources/svclogic.properties b/sli/recording/src/main/resources/svclogic.properties
new file mode 100644
index 00000000..0cf3b419
--- /dev/null
+++ b/sli/recording/src/main/resources/svclogic.properties
@@ -0,0 +1,26 @@
+###
+# ============LICENSE_START=======================================================
+# openECOMP : SDN-C
+# ================================================================================
+# Copyright (C) 2017 AT&T Intellectual Property. All rights
+# 						reserved.
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#      http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ============LICENSE_END=========================================================
+###
+
+org.openecomp.sdnc.sli.dbtype = jdbc
+org.openecomp.sdnc.sli.jdbc.url = jdbc:mysql://dbhost:3306/sdnctl
+org.openecomp.sdnc.sli.jdbc.database = sdnctl
+org.openecomp.sdnc.sli.jdbc.user = sdnctl
+org.openecomp.sdnc.sli.jdbc.password = gamma