X-Git-Url: https://gerrit.onap.org/r/gitweb?p=sdnc%2Fnorthbound.git;a=blobdiff_plain;f=generic-resource-api%2Fprovider%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fsdnc%2Fnorthbound%2FGenericResourceApiProvider.java;h=db93b2dea0ec1205054241bcd7908106428d2df5;hp=7d8f4b3a7ef1429318b74345a6ea21ac8cea77a1;hb=7f77043ea4d205bd4a146e1efe7c85cb542f53f2;hpb=03575373024593fd1cac6812f0992152edde4d37

diff --git a/generic-resource-api/provider/src/main/java/org/onap/sdnc/northbound/GenericResourceApiProvider.java b/generic-resource-api/provider/src/main/java/org/onap/sdnc/northbound/GenericResourceApiProvider.java
index 7d8f4b3a..db93b2de 100644
--- a/generic-resource-api/provider/src/main/java/org/onap/sdnc/northbound/GenericResourceApiProvider.java
+++ b/generic-resource-api/provider/src/main/java/org/onap/sdnc/northbound/GenericResourceApiProvider.java
@@ -1,5 +1,10 @@
 package org.onap.sdnc.northbound;
 
+import com.google.common.base.Optional;
+import com.google.common.util.concurrent.CheckedFuture;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
+
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -23,25 +28,48 @@ import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.re
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.BrgTopologyOperationInputBuilder;
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.BrgTopologyOperationOutput;
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.BrgTopologyOperationOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.ConnectionAttachmentTopologyOperationInput;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.ConnectionAttachmentTopologyOperationInputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.ConnectionAttachmentTopologyOperationOutput;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.ConnectionAttachmentTopologyOperationOutputBuilder;
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.ContrailRouteTopologyOperationInput;
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.ContrailRouteTopologyOperationInputBuilder;
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.ContrailRouteTopologyOperationOutput;
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.ContrailRouteTopologyOperationOutputBuilder;
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.GENERICRESOURCEAPIService;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.GenericConfigurationNotificationInput;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.GenericConfigurationNotificationInputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.GenericConfigurationNotificationOutput;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.GenericConfigurationTopologyOperationInput;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.GenericConfigurationTopologyOperationInputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.GenericConfigurationTopologyOperationOutput;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.GenericConfigurationTopologyOperationOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.GetpathsegmentTopologyOperationInput;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.GetpathsegmentTopologyOperationInputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.GetpathsegmentTopologyOperationOutput;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.GetpathsegmentTopologyOperationOutputBuilder;
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.NetworkTopologyOperationInput;
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.NetworkTopologyOperationInputBuilder;
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.NetworkTopologyOperationOutput;
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.NetworkTopologyOperationOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PolicyUpdateNotifyOperationInput;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PolicyUpdateNotifyOperationInputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PolicyUpdateNotifyOperationOutput;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PolicyUpdateNotifyOperationOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PortMirrorTopologyOperationInput;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PortMirrorTopologyOperationInputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PortMirrorTopologyOperationOutput;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PortMirrorTopologyOperationOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PreloadInformation;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PreloadInformationBuilder;
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PreloadNetworkTopologyOperationInput;
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PreloadNetworkTopologyOperationInputBuilder;
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PreloadNetworkTopologyOperationOutput;
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PreloadNetworkTopologyOperationOutputBuilder;
-import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PreloadVnfTopologyOperationInput;
-import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PreloadVnfTopologyOperationInputBuilder;
-import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PreloadVnfTopologyOperationOutput;
-import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PreloadVnfTopologyOperationOutputBuilder;
-import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PreloadVnfs;
-import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PreloadVnfsBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PreloadVfModuleTopologyOperationInput;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PreloadVfModuleTopologyOperationInputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PreloadVfModuleTopologyOperationOutput;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PreloadVfModuleTopologyOperationOutputBuilder;
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.SecurityZoneTopologyOperationInput;
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.SecurityZoneTopologyOperationInputBuilder;
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.SecurityZoneTopologyOperationOutput;
@@ -60,18 +88,29 @@ import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.re
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.VfModuleTopologyOperationInputBuilder;
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.VfModuleTopologyOperationOutput;
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.VfModuleTopologyOperationOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.VnfGetResourceRequestInput;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.VnfGetResourceRequestInputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.VnfGetResourceRequestOutput;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.VnfGetResourceRequestOutputBuilder;
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.VnfTopologyOperationInput;
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.VnfTopologyOperationInputBuilder;
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.VnfTopologyOperationOutput;
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.VnfTopologyOperationOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PnfTopologyOperationInput;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PnfTopologyOperationInputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PnfTopologyOperationOutput;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PnfTopologyOperationOutputBuilder;
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.brg.response.information.BrgResponseInformationBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.connection.attachment.response.information.ConnectionAttachmentResponseInformationBuilder;
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.contrail.route.response.information.ContrailRouteResponseInformationBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.gc.response.information.GcResponseInformationBuilder;
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.network.response.information.NetworkResponseInformationBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.port.mirror.response.information.PortMirrorResponseInformationBuilder;
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.preload.data.PreloadData;
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.preload.data.PreloadDataBuilder;
-import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.preload.model.information.VnfPreloadList;
-import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.preload.model.information.VnfPreloadListBuilder;
-import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.preload.model.information.VnfPreloadListKey;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.preload.model.information.PreloadList;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.preload.model.information.PreloadListBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.preload.model.information.PreloadListKey;
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.request.information.RequestInformation;
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.sdnc.request.header.SdncRequestHeader;
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.sdnc.request.header.SdncRequestHeader.SvcAction;
@@ -86,49 +125,46 @@ import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.re
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.service.status.ServiceStatus.RpcAction;
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.service.status.ServiceStatusBuilder;
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.tunnelxconn.response.information.TunnelxconnResponseInformationBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vf.module.response.information.VfModuleResponseInformationBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vnf.response.information.VnfResponseInformationBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.pnf.response.information.PnfResponseInformationBuilder;
+import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.base.Optional;
-import com.google.common.util.concurrent.CheckedFuture;
-import com.google.common.util.concurrent.Futures;
-import com.google.common.util.concurrent.SettableFuture;
-
 /**
- * Defines a base implementation for your provider. This class extends from a
- * helper class which provides storage for the most commonly used components of
- * the MD-SAL. Additionally the base class provides some basic logging and
+ * Defines a base implementation for your provider. This class extends from a helper class which provides storage for
+ * the most commonly used components of the MD-SAL. Additionally the base class provides some basic logging and
  * initialization / clean up methods.
  *
- * To use this, copy and paste (overwrite) the following method into the
- * TestApplicationProviderModule class which is auto generated under
- * src/main/java in this project (created only once during first compilation):
+ * To use this, copy and paste (overwrite) the following method into the TestApplicationProviderModule class which is
+ * auto generated under src/main/java in this project (created only once during first compilation):
  *
  * <pre>
  *
  * &#64;Override
  * public java.lang.AutoCloseable createInstance() {
  *
- * 	// final GENERIC-RESOURCE-APIProvider provider = new
- * 	// GENERIC-RESOURCE-APIProvider();
- * 	final GenericResourceApiProvider provider = new GenericResourceApiProvider();
- * 	provider.setDataBroker(getDataBrokerDependency());
- * 	provider.setNotificationService(getNotificationServiceDependency());
- * 	provider.setRpcRegistry(getRpcRegistryDependency());
- * 	provider.initialize();
- * 	return new AutoCloseable() {
+ *     // final GENERIC-RESOURCE-APIProvider provider = new
+ *     // GENERIC-RESOURCE-APIProvider();
+ *     final GenericResourceApiProvider provider = new GenericResourceApiProvider();
+ *     provider.setDataBroker(getDataBrokerDependency());
+ *     provider.setNotificationService(getNotificationServiceDependency());
+ *     provider.setRpcRegistry(getRpcRegistryDependency());
+ *     provider.initialize();
+ *     return new AutoCloseable() {
  *
- * 		&#64;Override
- * 		public void close() throws Exception {
- * 			// TODO: CLOSE ANY REGISTRATION OBJECTS CREATED USING ABOVE
- * 			// BROKER/NOTIFICATION
- * 			// SERVIE/RPC REGISTRY
- * 			provider.close();
- * 		}
- * 	};
+ *         &#64;Override
+ *         public void close() throws Exception {
+ *             // TODO: CLOSE ANY REGISTRATION OBJECTS CREATED USING ABOVE
+ *             // BROKER/NOTIFICATION
+ *             // SERVIE/RPC REGISTRY
+ *             provider.close();
+ *         }
+ *     };
  * }
  *
  * </pre>
@@ -136,2127 +172,3457 @@ import com.google.common.util.concurrent.SettableFuture;
 
 public class GenericResourceApiProvider implements AutoCloseable, GENERICRESOURCEAPIService {
 
-	private final Logger log = LoggerFactory.getLogger(GenericResourceApiProvider.class);
-	private final String appName = "generic-resource-api";
-
-	private final ExecutorService executor;
-
-	protected DataBroker dataBroker;
-	protected NotificationPublishService notificationService;
-	protected RpcProviderRegistry rpcRegistry;
-	protected BindingAwareBroker.RpcRegistration<GENERICRESOURCEAPIService> rpcRegistration;
-
-	private GenericResourceApiSvcLogicServiceClient svcLogicClient;
-
-	public GenericResourceApiProvider(DataBroker dataBroker2, NotificationPublishService notificationPublishService,
-			RpcProviderRegistry rpcProviderRegistry, GenericResourceApiSvcLogicServiceClient client) {
-		log.info("Creating provider for {}", appName);
-		executor = Executors.newFixedThreadPool(1);
-		dataBroker = dataBroker2;
-		notificationService = notificationPublishService;
-		rpcRegistry = rpcProviderRegistry;
-		svcLogicClient = client;
-		initialize();
-
-	}
-
-	public void initialize() {
-		log.info("Initializing provider for {}", appName);
-		// Create the top level containers
-		createContainers();
-		try {
-			GenericResourceApiUtil.loadProperties();
-		} catch (Exception e) {
-			log.error("Caught Exception while trying to load properties file");
-		}
-
-		log.info("Initialization complete for {}", appName);
-	}
-
-	protected void initializeChild() {
-		// Override if you have custom initialization intelligence
-	}
-
-	@Override
-	public void close() throws Exception {
-		log.info("Closing provider for {}", appName);
-		executor.shutdown();
-		rpcRegistration.close();
-		log.info("Successfully closed provider for {}", appName);
-	}
-
-	private static class Iso8601Util {
-		private static TimeZone tz = TimeZone.getTimeZone("UTC");
-		private static DateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
-
-		static {
-			df.setTimeZone(tz);
-		}
-
-		private static String now() {
-			return df.format(new Date());
-		}
-	}
-
-	public void setDataBroker(DataBroker dataBroker) {
-		this.dataBroker = dataBroker;
-		if (log.isDebugEnabled()) {
-			log.debug("DataBroker set to {}", (dataBroker == null ? "null" : "non-null"));
-		}
-	}
-
-	public void setNotificationService(NotificationPublishService notificationService) {
-		this.notificationService = notificationService;
-		if (log.isDebugEnabled()) {
-			log.debug("Notification Service set to {}", (notificationService == null ? "null" : "non-null"));
-		}
-	}
-
-	public void setRpcRegistry(RpcProviderRegistry rpcRegistry) {
-		this.rpcRegistry = rpcRegistry;
-		if (log.isDebugEnabled()) {
-			log.debug("RpcRegistry set to {}", (rpcRegistry == null ? "null" : "non-null"));
-		}
-	}
-
-	private void createContainers() {
-
-		final WriteTransaction t = dataBroker.newReadWriteTransaction();
-
-		// Create the service-instance container
-		t.merge(LogicalDatastoreType.CONFIGURATION, InstanceIdentifier.create(Services.class),
-				new ServicesBuilder().build());
-		t.merge(LogicalDatastoreType.OPERATIONAL, InstanceIdentifier.create(Services.class),
-				new ServicesBuilder().build());
-
-		// Create the PreloadVnfs container
-		t.merge(LogicalDatastoreType.CONFIGURATION, InstanceIdentifier.create(PreloadVnfs.class),
-				new PreloadVnfsBuilder().build());
-		t.merge(LogicalDatastoreType.OPERATIONAL, InstanceIdentifier.create(PreloadVnfs.class),
-				new PreloadVnfsBuilder().build());
-
-		try {
-			CheckedFuture<Void, TransactionCommitFailedException> checkedFuture = t.submit();
-			checkedFuture.get();
-			log.info("Create containers succeeded!");
-
-		} catch (InterruptedException | ExecutionException e) {
-			log.error("Create containers failed: ", e);
-		}
-	}
-
-	private void setServiceStatus(ServiceStatusBuilder serviceStatusBuilder, String errorCode, String errorMessage,
-			String ackFinal) {
-		serviceStatusBuilder.setResponseCode(errorCode);
-		serviceStatusBuilder.setResponseMessage(errorMessage);
-		serviceStatusBuilder.setFinalIndicator(ackFinal);
-		serviceStatusBuilder.setResponseTimestamp(Iso8601Util.now());
-	}
-
-	private void setServiceStatus(ServiceStatusBuilder serviceStatusBuilder, RequestInformation requestInformation) {
-		if (requestInformation != null && requestInformation.getRequestAction() != null) {
-			serviceStatusBuilder.setAction(requestInformation.getRequestAction().toString());
-		}
-
-		/*
-		 * if (requestInformation != null && requestInformation.getRequestSubAction() !=
-		 * null) { switch (requestInformation.getRequestSubAction()) { case SUPP:
-		 * serviceStatusBuilder.setVnfsdnSubaction(VnfsdnSubaction.SUPP); break; case
-		 * CANCEL: serviceStatusBuilder.setVnfsdnSubaction(VnfsdnSubaction.CANCEL);
-		 * break; default: log.error("Unknown RequestSubAction: " +
-		 * requestInformation.getRequestSubAction() ); break; }; }
-		 */
-	}
-
-	private void setServiceStatus(ServiceStatusBuilder serviceStatusBuilder, SdncRequestHeader requestHeader) {
-		if (requestHeader != null && requestHeader.getSvcAction() != null) {
-			switch (requestHeader.getSvcAction()) {
-			case Assign:
-				serviceStatusBuilder.setRpcAction(RpcAction.Assign);
-				break;
-			case Unassign:
-				serviceStatusBuilder.setRpcAction(RpcAction.Unassign);
-				break;
-			case Activate:
-				serviceStatusBuilder.setRpcAction(RpcAction.Activate);
-				break;
-			case Deactivate:
-				serviceStatusBuilder.setRpcAction(RpcAction.Deactivate);
-				break;
-			case Delete:
-				serviceStatusBuilder.setRpcAction(RpcAction.Delete);
-				break;
-			default:
-				log.error("Unknown SvcAction: {}", requestHeader.getSvcAction());
-				break;
-			}
-		}
-	}
-
-	private void getServiceData(String siid, ServiceDataBuilder serviceDataBuilder) {
-		// default to config
-		getServiceData(siid, serviceDataBuilder, LogicalDatastoreType.CONFIGURATION);
-	}
-
-	private void getServiceData(String siid, ServiceDataBuilder serviceDataBuilder, LogicalDatastoreType type) {
-		// See if any data exists yet for this siid, if so grab it.
-		InstanceIdentifier serviceInstanceIdentifier = InstanceIdentifier.<Services>builder(Services.class)
-				.child(Service.class, new ServiceKey(siid)).build();
-		ReadOnlyTransaction readTx = dataBroker.newReadOnlyTransaction();
-		Optional<Service> data = null;
-		try {
-			data = (Optional<Service>) readTx.read(type, serviceInstanceIdentifier).get();
-		} catch (InterruptedException | ExecutionException e) {
-			log.error("Caught Exception reading MD-SAL ({}) data for [{}] ", type, siid, e);
-		}
-
-		if (data != null && data.isPresent()) {
-			ServiceData serviceData = data.get().getServiceData();
-			if (serviceData != null) {
-				log.info("Read MD-SAL ({}) data for [{}] ServiceData: {}", type, siid, serviceData);
-				serviceDataBuilder.setSdncRequestHeader(serviceData.getSdncRequestHeader());
-				serviceDataBuilder.setRequestInformation(serviceData.getRequestInformation());
-				serviceDataBuilder.setServiceInformation(serviceData.getServiceInformation());
-				serviceDataBuilder.setServiceRequestInput(serviceData.getServiceRequestInput());
-				serviceDataBuilder.setServiceTopology(serviceData.getServiceTopology());
-				serviceDataBuilder.setServiceLevelOperStatus(serviceData.getServiceLevelOperStatus());
-				serviceDataBuilder.setNetworks(serviceData.getNetworks());
-				serviceDataBuilder.setVnfs(serviceData.getVnfs());
-				serviceDataBuilder.setProvidedAllottedResources(serviceData.getProvidedAllottedResources());
-				serviceDataBuilder.setConsumedAllottedResources(serviceData.getConsumedAllottedResources());
-				// service-instance-id needs to be set
-			} else {
-				log.info("No service-data found in MD-SAL ({}) for [{}]", type, siid);
-			}
-		} else {
-			log.info("No data found in MD-SAL ({}) for [{}]", type, siid);
-		}
-	}
-
-	private void getPreloadData(String vnf_name, String vnf_type, PreloadDataBuilder preloadDataBuilder) {
-		// default to config
-		getPreloadData(vnf_name, vnf_type, preloadDataBuilder, LogicalDatastoreType.CONFIGURATION);
-	}
-
-	private void getPreloadData(String preload_name, String preload_type, PreloadDataBuilder preloadDataBuilder,
-			LogicalDatastoreType type) {
-		// See if any data exists yet for this name/type, if so grab it.
-		InstanceIdentifier preloadInstanceIdentifier = InstanceIdentifier.<PreloadVnfs>builder(PreloadVnfs.class)
-				.child(VnfPreloadList.class, new VnfPreloadListKey(preload_name, preload_type)).build();
-		ReadOnlyTransaction readTx = dataBroker.newReadOnlyTransaction();
-		Optional<VnfPreloadList> data = null;
-		try {
-			data = (Optional<VnfPreloadList>) readTx.read(type, preloadInstanceIdentifier).get();
-		} catch (InterruptedException | ExecutionException e) {
-			log.error("Caught Exception reading MD-SAL ({}) for [{},{}] ", type, preload_name, preload_type, e);
-		}
-
-		if (data != null && data.isPresent()) {
-			PreloadData preloadData = data.get().getPreloadData();
-			if (preloadData != null) {
-				log.info("Read MD-SAL ({}) data for [{},{}] PreloadData: {}", type, preload_name, preload_type,
-						preloadData);
-				preloadDataBuilder.setVnfTopologyInformation(preloadData.getVnfTopologyInformation());
-				preloadDataBuilder.setNetworkTopologyInformation(preloadData.getNetworkTopologyInformation());
-				preloadDataBuilder.setOperStatus(preloadData.getOperStatus());
-			} else {
-				log.info("No preload-data found in MD-SAL ({}) for [{},{}] ", type, preload_name, preload_type);
-			}
-		} else {
-			log.info("No data found in MD-SAL ({}) for [{},{}] ", type, preload_name, preload_type);
-		}
-	}
-
-	private void saveService(final Service entry, boolean merge, LogicalDatastoreType storeType)
-			throws IllegalStateException {
-		// Each entry will be identifiable by a unique key, we have to create that
-		// identifier
-		InstanceIdentifier.InstanceIdentifierBuilder<Service> serviceBuilder = InstanceIdentifier
-				.<Services>builder(Services.class).child(Service.class, entry.getKey());
-		InstanceIdentifier<Service> path = serviceBuilder.build();
-
-		int tries = 2;
-		while (true) {
-			try {
-				WriteTransaction tx = dataBroker.newWriteOnlyTransaction();
-				if (merge) {
-					tx.merge(storeType, path, entry);
-				} else {
-					tx.put(storeType, path, entry);
-				}
-				tx.submit().checkedGet();
-				log.debug("Update DataStore succeeded");
-				break;
-			} catch (final TransactionCommitFailedException e) {
-				if (e instanceof OptimisticLockFailedException) {
-					if (--tries <= 0) {
-						log.debug("Got OptimisticLockFailedException on last try - failing ");
-						throw new IllegalStateException(e);
-					}
-					log.debug("Got OptimisticLockFailedException - trying again ");
-				} else {
-					log.debug("Update DataStore failed");
-					throw new IllegalStateException(e);
-				}
-			}
-		}
-	}
-
-	private void deleteService(final Service entry, LogicalDatastoreType storeType) throws IllegalStateException {
-		// Each entry will be identifiable by a unique key, we have to create
-		// that identifier
-		InstanceIdentifier.InstanceIdentifierBuilder<Service> serviceListIdBuilder = InstanceIdentifier
-				.<Services>builder(Services.class).child(Service.class, entry.getKey());
-		InstanceIdentifier<Service> path = serviceListIdBuilder.build();
-
-		int tries = 2;
-		while (true) {
-			try {
-				WriteTransaction tx = dataBroker.newWriteOnlyTransaction();
-				tx.delete(storeType, path);
-				tx.submit().checkedGet();
-				log.debug("DataStore delete succeeded");
-				break;
-			} catch (final TransactionCommitFailedException e) {
-				if (e instanceof OptimisticLockFailedException) {
-					if (--tries <= 0) {
-						log.debug("Got OptimisticLockFailedException on last try - failing ");
-						throw new IllegalStateException(e);
-					}
-					log.debug("Got OptimisticLockFailedException - trying again ");
-				} else {
-					log.debug("Update DataStore failed");
-					throw new IllegalStateException(e);
-				}
-			}
-		}
-	}
-
-	private void savePreloadList(final VnfPreloadList entry, boolean merge, LogicalDatastoreType storeType)
-			throws IllegalStateException {
-
-		// Each entry will be identifiable by a unique key, we have to create that
-		// identifier
-		InstanceIdentifier.InstanceIdentifierBuilder<VnfPreloadList> vnfPreloadListBuilder = InstanceIdentifier
-				.<PreloadVnfs>builder(PreloadVnfs.class).child(VnfPreloadList.class, entry.getKey());
-		InstanceIdentifier<VnfPreloadList> path = vnfPreloadListBuilder.build();
-		int tries = 2;
-		while (true) {
-			try {
-				WriteTransaction tx = dataBroker.newWriteOnlyTransaction();
-				if (merge) {
-					tx.merge(storeType, path, entry);
-				} else {
-					tx.put(storeType, path, entry);
-				}
-				tx.submit().checkedGet();
-				log.debug("Update DataStore succeeded");
-				break;
-			} catch (final TransactionCommitFailedException e) {
-				if (e instanceof OptimisticLockFailedException) {
-					if (--tries <= 0) {
-						log.debug("Got OptimisticLockFailedException on last try - failing ");
-						throw new IllegalStateException(e);
-					}
-					log.debug("Got OptimisticLockFailedException - trying again ");
-				} else {
-					log.debug("Update DataStore failed");
-					throw new IllegalStateException(e);
-				}
-			}
-		}
-	}
-
-	@Override
-	public Future<RpcResult<ServiceTopologyOperationOutput>> serviceTopologyOperation(
-			ServiceTopologyOperationInput input) {
-
-		final String SVC_OPERATION = "service-topology-operation";
-		ServiceData serviceData;
-		ServiceStatusBuilder serviceStatusBuilder = new ServiceStatusBuilder();
-		Properties parms = new Properties();
-
-		log.info("{} called.", SVC_OPERATION);
-		// create a new response object
-		ServiceTopologyOperationOutputBuilder responseBuilder = new ServiceTopologyOperationOutputBuilder();
-
-		if (input == null || input.getServiceInformation() == null
-				|| input.getServiceInformation().getServiceInstanceId() == null
-				|| input.getServiceInformation().getServiceInstanceId().length() == 0) {
-			log.debug("exiting {} because of null or empty service-instance-id", SVC_OPERATION);
-			responseBuilder.setResponseCode("404");
-			responseBuilder.setResponseMessage("invalid input, null or empty service-instance-id");
-			responseBuilder.setAckFinalIndicator("Y");
-			RpcResult<ServiceTopologyOperationOutput> rpcResult = RpcResultBuilder
-					.<ServiceTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
-			return Futures.immediateFuture(rpcResult);
-		}
-
-		// Grab the service instance ID from the input buffer
-		String siid = input.getServiceInformation().getServiceInstanceId();
-
-		if (input.getSdncRequestHeader() != null) {
-			responseBuilder.setSvcRequestId(input.getSdncRequestHeader().getSvcRequestId());
-		}
-
-		ServiceDataBuilder serviceDataBuilder = new ServiceDataBuilder();
-		getServiceData(siid, serviceDataBuilder);
-
-		ServiceDataBuilder operDataBuilder = new ServiceDataBuilder();
-		getServiceData(siid, operDataBuilder, LogicalDatastoreType.OPERATIONAL);
-
-		// Set the serviceStatus based on input
-		setServiceStatus(serviceStatusBuilder, input.getSdncRequestHeader());
-		setServiceStatus(serviceStatusBuilder, input.getRequestInformation());
-
-		/*
-		 * // setup a service-data object builder // ACTION service-topology-operation
-		 * // INPUT: // USES uses service-operation-information // OUTPUT: // uses
-		 * topology-response-common; // uses service-response-information;
-		 */
-
-		log.info("Adding INPUT data for {} [{}] input: {}", SVC_OPERATION, siid, input);
-		ServiceTopologyOperationInputBuilder inputBuilder = new ServiceTopologyOperationInputBuilder(input);
-		GenericResourceApiUtil.toProperties(parms, inputBuilder.build());
-
-		log.info("Adding OPERATIONAL data for {} [{}] operational-data: {}", SVC_OPERATION, siid,
-				operDataBuilder.build());
-		GenericResourceApiUtil.toProperties(parms, "operational-data", operDataBuilder);
-
-		// Call SLI sync method
-		// Get SvcLogicService reference
-
-		Properties respProps = null;
-
-		String errorCode = "200";
-		String errorMessage = null;
-		String ackFinal = "Y";
-		String serviceObjectPath = null;
-
-		try {
-			if (svcLogicClient.hasGraph(appName, SVC_OPERATION, null, "sync")) {
-
-				try {
-					respProps = svcLogicClient.execute(appName, SVC_OPERATION, null, "sync", serviceDataBuilder, parms);
-				} catch (Exception e) {
-					log.error("Caught exception executing service logic for {} ", SVC_OPERATION, e);
-					errorMessage = e.getMessage();
-					errorCode = "500";
-				}
-			} else {
-				errorMessage = "No service logic active for " + appName + ": '" + SVC_OPERATION + "'";
-				errorCode = "503";
-			}
-		} catch (Exception e) {
-			errorCode = "500";
-			errorMessage = e.getMessage();
-			log.error("Caught exception looking for service logic", e);
-		}
-
-		if (respProps != null) {
-			errorCode = respProps.getProperty("error-code");
-			errorMessage = respProps.getProperty("error-message");
-			ackFinal = respProps.getProperty("ack-final", "Y");
-			serviceObjectPath = respProps.getProperty("service-object-path");
-		}
-
-		setServiceStatus(serviceStatusBuilder, errorCode, errorMessage, ackFinal);
-		serviceStatusBuilder.setRequestStatus(RequestStatus.Synccomplete);
-		// serviceStatusBuilder.setRpcName(RpcName.ServiceTopologyOperation);
-		serviceStatusBuilder.setRpcName(SVC_OPERATION);
-
-		if (errorCode != null && errorCode.length() != 0 && !(errorCode.equals("0") || errorCode.equals("200"))) {
-			responseBuilder.setResponseCode(errorCode);
-			responseBuilder.setResponseMessage(errorMessage);
-			responseBuilder.setAckFinalIndicator(ackFinal);
-
-			ServiceBuilder serviceBuilder = new ServiceBuilder();
-			serviceBuilder.setServiceInstanceId(siid);
-			serviceBuilder.setServiceStatus(serviceStatusBuilder.build());
-			try {
-				saveService(serviceBuilder.build(), true, LogicalDatastoreType.CONFIGURATION);
-			} catch (Exception e) {
-				log.error("Caught Exception updating MD-SAL for {} [{}] \n", SVC_OPERATION, siid, e);
-			}
-			log.error("Returned FAILED for {} [{}] {}", SVC_OPERATION, siid, responseBuilder.build());
-			RpcResult<ServiceTopologyOperationOutput> rpcResult = RpcResultBuilder
-					.<ServiceTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
-			return Futures.immediateFuture(rpcResult);
-		}
-
-		// Got success from SLI
-		try {
-			serviceData = serviceDataBuilder.build();
-			log.info("Updating MD-SAL for {} [{}] ServiceData: {}", SVC_OPERATION, siid, serviceData);
-
-			// service object
-			ServiceBuilder serviceBuilder = new ServiceBuilder();
-			serviceBuilder.setServiceData(serviceData);
-			serviceBuilder.setServiceInstanceId(siid);
-			serviceBuilder.setServiceStatus(serviceStatusBuilder.build());
-			saveService(serviceBuilder.build(), false, LogicalDatastoreType.CONFIGURATION);
-
-			if (input.getSdncRequestHeader() != null && input.getSdncRequestHeader().getSvcAction() != null) {
-				// Only update operational tree on delete
-				if (input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Delete)) {
-					log.info("Delete from both CONFIGURATION and OPERATIONAL tree.");
-					deleteService(serviceBuilder.build(), LogicalDatastoreType.OPERATIONAL);
-					deleteService(serviceBuilder.build(), LogicalDatastoreType.CONFIGURATION);
-				}
-			}
-
-			ServiceResponseInformationBuilder serviceResponseInformationBuilder = new ServiceResponseInformationBuilder();
-			serviceResponseInformationBuilder.setInstanceId(siid);
-			serviceResponseInformationBuilder.setObjectPath(serviceObjectPath);
-			responseBuilder.setServiceResponseInformation(serviceResponseInformationBuilder.build());
-
-		} catch (Exception e) {
-			log.error("Caught Exception updating MD-SAL for {} [{}] \n", SVC_OPERATION, siid, e);
-			responseBuilder.setResponseCode("500");
-			responseBuilder.setResponseMessage(e.toString());
-			responseBuilder.setAckFinalIndicator("Y");
-			log.error("Returned FAILED for {} [{}] {}", SVC_OPERATION, siid, responseBuilder.build());
-			RpcResult<ServiceTopologyOperationOutput> rpcResult = RpcResultBuilder
-					.<ServiceTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
-			return Futures.immediateFuture(rpcResult);
-		}
-
-		// Update succeeded
-		responseBuilder.setResponseCode(errorCode);
-		responseBuilder.setAckFinalIndicator(ackFinal);
-		if (errorMessage != null) {
-			responseBuilder.setResponseMessage(errorMessage);
-		}
-		log.info("Updated MD-SAL for {} [{}]", SVC_OPERATION, siid);
-		log.info("Returned SUCCESS for {} [{}] {}", SVC_OPERATION, siid, responseBuilder.build());
-
-		RpcResult<ServiceTopologyOperationOutput> rpcResult = RpcResultBuilder
-				.<ServiceTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
-		return Futures.immediateFuture(rpcResult);
-	}
-
-	@Override
-	public Future<RpcResult<VnfTopologyOperationOutput>> vnfTopologyOperation(VnfTopologyOperationInput input) {
-
-		final String SVC_OPERATION = "vnf-topology-operation";
-		ServiceData serviceData;
-		ServiceStatusBuilder serviceStatusBuilder = new ServiceStatusBuilder();
-		Properties parms = new Properties();
-
-		log.info("{} called.", SVC_OPERATION);
-		// create a new response object
-		VnfTopologyOperationOutputBuilder responseBuilder = new VnfTopologyOperationOutputBuilder();
-
-		if (input == null || input.getServiceInformation() == null
-				|| input.getServiceInformation().getServiceInstanceId() == null
-				|| input.getServiceInformation().getServiceInstanceId().length() == 0) {
-			log.debug("exiting {} because of null or empty service-instance-id", SVC_OPERATION);
-			responseBuilder.setResponseCode("404");
-			responseBuilder.setResponseMessage("invalid input, null or empty service-instance-id");
-			responseBuilder.setAckFinalIndicator("Y");
-			RpcResult<VnfTopologyOperationOutput> rpcResult = RpcResultBuilder.<VnfTopologyOperationOutput>status(true)
-					.withResult(responseBuilder.build()).build();
-			// return error
-			return Futures.immediateFuture(rpcResult);
-		}
-
-		// Grab the service instance ID from the input buffer
-		String siid = input.getServiceInformation().getServiceInstanceId();
-
-		if (input.getSdncRequestHeader() != null) {
-			responseBuilder.setSvcRequestId(input.getSdncRequestHeader().getSvcRequestId());
-		}
-
-		if (input.getVnfInformation() == null || input.getVnfInformation().getVnfId() == null
-				|| input.getVnfInformation().getVnfId().length() == 0) {
-			log.debug("exiting {} because of null or empty vnf-id", SVC_OPERATION);
-			responseBuilder.setResponseCode("404");
-			responseBuilder.setResponseMessage("invalid input, null or empty vnf-id");
-			responseBuilder.setAckFinalIndicator("Y");
-			RpcResult<VnfTopologyOperationOutput> rpcResult = RpcResultBuilder.<VnfTopologyOperationOutput>status(true)
-					.withResult(responseBuilder.build()).build();
-			return Futures.immediateFuture(rpcResult);
-		}
-
-		/*
-		 * Mobility wont use vipr intf in 1707
-		 *
-		 * String preload_name = null; String preload_type = null; if
-		 * (input.getVnfRequestInput() != null &&
-		 * input.getVnfRequestInput().getVnfName() != null &&
-		 * input.getVnfRequestInput().getVnfName().length() != 0) { preload_name =
-		 * input.getVnfRequestInput().getVnfName(); } if
-		 * (input.getVnfInformation().getVnfType() != null &&
-		 * input.getVnfInformation().getVnfType().length() != 0) { preload_type =
-		 * input.getVnfInformation().getVnfType(); }
-		 *
-		 * PreloadDataBuilder preloadDataBuilder = new PreloadDataBuilder(); if
-		 * (preload_name != null && preload_type != null) { getPreloadData(preload_name,
-		 * preload_type, preloadDataBuilder); } else {
-		 * log.info("vnf-name and vnf-type not present in the request"); }
-		 */
-
-		ServiceDataBuilder serviceDataBuilder = new ServiceDataBuilder();
-		getServiceData(siid, serviceDataBuilder);
-
-		ServiceDataBuilder operDataBuilder = new ServiceDataBuilder();
-		getServiceData(siid, operDataBuilder, LogicalDatastoreType.OPERATIONAL);
-
-		// Set the serviceStatus based on input
-		setServiceStatus(serviceStatusBuilder, input.getSdncRequestHeader());
-		setServiceStatus(serviceStatusBuilder, input.getRequestInformation());
-
-		//
-		// setup a service-data object builder
-		// ACTION vnf-topology-operation
-		// INPUT:
-		// USES sdnc-request-header;
-		// USES request-information;
-		// USES service-information;
-		// USES vnf-request-information
-		// OUTPUT:
-		// USES vnf-topology-response-body;
-		// USES vnf-information
-		// USES service-information
-		//
-		// container service-data
-		// uses vnf-configuration-information;
-		// uses oper-status;
-
-		log.info("Adding INPUT data for {} [{}] input: {}", SVC_OPERATION, siid, input);
-		VnfTopologyOperationInputBuilder inputBuilder = new VnfTopologyOperationInputBuilder(input);
-		GenericResourceApiUtil.toProperties(parms, inputBuilder.build());
-
-		log.info("Adding OPERATIONAL data for {} [{}] operational-data: {}", SVC_OPERATION, siid,
-				operDataBuilder.build());
-		GenericResourceApiUtil.toProperties(parms, "operational-data", operDataBuilder);
-
-		/*
-		 * log.info("Adding CONFIG data for "+SVC_OPERATION+" ["+preload_name+","+
-		 * preload_type+"] preload-data: " + preloadDataBuilder.build());
-		 * GenericResourceApiUtil.toProperties(parms, "preload-data",
-		 * preloadDataBuilder);
-		 */
-
-		// Call SLI sync method
-		// Get SvcLogicService reference
-
-		Properties respProps = null;
-
-		String errorCode = "200";
-		String errorMessage = null;
-		String ackFinal = "Y";
-		String serviceObjectPath = null;
-
-		try {
-			if (svcLogicClient.hasGraph(appName, SVC_OPERATION, null, "sync")) {
-
-				try {
-					respProps = svcLogicClient.execute(appName, SVC_OPERATION, null, "sync", serviceDataBuilder, parms);
-				} catch (Exception e) {
-					log.error("Caught exception executing service logic for {} ", SVC_OPERATION, e);
-					errorMessage = e.getMessage();
-					errorCode = "500";
-				}
-			} else {
-				errorMessage = "No service logic active for " + appName + ": '" + SVC_OPERATION + "'";
-				errorCode = "503";
-			}
-		} catch (Exception e) {
-			errorCode = "500";
-			errorMessage = e.getMessage();
-			log.error("Caught exception looking for service logic", e);
-		}
-
-		if (respProps != null) {
-			errorCode = respProps.getProperty("error-code");
-			errorMessage = respProps.getProperty("error-message");
-			ackFinal = respProps.getProperty("ack-final", "Y");
-			serviceObjectPath = respProps.getProperty("vnf-object-path");
-		}
-
-		setServiceStatus(serviceStatusBuilder, errorCode, errorMessage, ackFinal);
-		serviceStatusBuilder.setRequestStatus(RequestStatus.Synccomplete);
-		// serviceStatusBuilder.setRpcName(RpcName.VnfTopologyOperation);
-		serviceStatusBuilder.setRpcName(SVC_OPERATION);
-
-		if (errorCode != null && errorCode.length() != 0 && !(errorCode.equals("0") || errorCode.equals("200"))) {
-			responseBuilder.setResponseCode(errorCode);
-			responseBuilder.setResponseMessage(errorMessage);
-			responseBuilder.setAckFinalIndicator(ackFinal);
-
-			ServiceBuilder serviceBuilder = new ServiceBuilder();
-			serviceBuilder.setServiceInstanceId(siid);
-			serviceBuilder.setServiceStatus(serviceStatusBuilder.build());
-			try {
-				saveService(serviceBuilder.build(), true, LogicalDatastoreType.CONFIGURATION);
-				if (input.getSdncRequestHeader() != null && input.getSdncRequestHeader().getSvcAction() != null) {
-					// Only update operational tree on activate or delete
-					if (input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Delete)
-							|| input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Activate)) {
-						log.info("Updating OPERATIONAL tree.");
-						saveService(serviceBuilder.build(), false, LogicalDatastoreType.OPERATIONAL);
-					}
-				}
-			} catch (Exception e) {
-				log.error("Caught Exception updating MD-SAL for {} [{}] \n", SVC_OPERATION, siid, e);
-			}
-			log.error("Returned FAILED for {} [{}] {}", SVC_OPERATION, siid, responseBuilder.build());
-			RpcResult<VnfTopologyOperationOutput> rpcResult = RpcResultBuilder.<VnfTopologyOperationOutput>status(true)
-					.withResult(responseBuilder.build()).build();
-			// return error
-			return Futures.immediateFuture(rpcResult);
-		}
-
-		// Got success from SLI
-		try {
-			serviceData = serviceDataBuilder.build();
-			log.info("Updating MD-SAL for {} [{}] ServiceData: {}", SVC_OPERATION, siid, serviceData);
-
-			// service object
-			ServiceBuilder serviceBuilder = new ServiceBuilder();
-			serviceBuilder.setServiceData(serviceData);
-			serviceBuilder.setServiceInstanceId(siid);
-			serviceBuilder.setServiceStatus(serviceStatusBuilder.build());
-			saveService(serviceBuilder.build(), false, LogicalDatastoreType.CONFIGURATION);
-
-			if (input.getSdncRequestHeader() != null && input.getSdncRequestHeader().getSvcAction() != null) {
-				// Only update operational tree on Assign
-				if (input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Activate)) {
-					log.info("Updating OPERATIONAL tree.");
-					saveService(serviceBuilder.build(), false, LogicalDatastoreType.OPERATIONAL);
-				}
-			}
-
-			ServiceResponseInformationBuilder serviceResponseInformationBuilder = new ServiceResponseInformationBuilder();
-			serviceResponseInformationBuilder.setInstanceId(siid);
-			serviceResponseInformationBuilder.setObjectPath(serviceObjectPath);
-			responseBuilder.setServiceResponseInformation(serviceResponseInformationBuilder.build());
-
-		} catch (Exception e) {
-			log.error("Caught Exception updating MD-SAL for {} [{}] \n", SVC_OPERATION, siid, e);
-			responseBuilder.setResponseCode("500");
-			responseBuilder.setResponseMessage(e.toString());
-			responseBuilder.setAckFinalIndicator("Y");
-			log.error("Returned FAILED for {} [{}] {}", SVC_OPERATION, siid, responseBuilder.build());
-			RpcResult<VnfTopologyOperationOutput> rpcResult = RpcResultBuilder.<VnfTopologyOperationOutput>status(true)
-					.withResult(responseBuilder.build()).build();
-			return Futures.immediateFuture(rpcResult);
-		}
-
-		// Update succeeded
-		responseBuilder.setResponseCode(errorCode);
-		responseBuilder.setAckFinalIndicator(ackFinal);
-		if (errorMessage != null) {
-			responseBuilder.setResponseMessage(errorMessage);
-		}
-		log.info("Updated MD-SAL for {} [{}]", SVC_OPERATION, siid);
-		log.info("Returned SUCCESS for {} [{}] {}", SVC_OPERATION, siid, responseBuilder.build());
-
-		RpcResult<VnfTopologyOperationOutput> rpcResult = RpcResultBuilder.<VnfTopologyOperationOutput>status(true)
-				.withResult(responseBuilder.build()).build();
-		// return success
-		return Futures.immediateFuture(rpcResult);
-	}
-
-	@Override
-	public Future<RpcResult<VfModuleTopologyOperationOutput>> vfModuleTopologyOperation(
-			VfModuleTopologyOperationInput input) {
-
-		final String SVC_OPERATION = "vf-module-topology-operation";
-		ServiceData serviceData;
-		ServiceStatusBuilder serviceStatusBuilder = new ServiceStatusBuilder();
-		Properties parms = new Properties();
-
-		log.info("{} called.", SVC_OPERATION);
-		// create a new response object
-		VfModuleTopologyOperationOutputBuilder responseBuilder = new VfModuleTopologyOperationOutputBuilder();
-
-		if (input == null || input.getServiceInformation() == null
-				|| input.getServiceInformation().getServiceInstanceId() == null
-				|| input.getServiceInformation().getServiceInstanceId().length() == 0) {
-			log.debug("exiting {} because of null or empty service-instance-id", SVC_OPERATION);
-			responseBuilder.setResponseCode("403");
-			responseBuilder.setResponseMessage("invalid input, null or empty service-instance-id");
-			responseBuilder.setAckFinalIndicator("Y");
-			RpcResult<VfModuleTopologyOperationOutput> rpcResult = RpcResultBuilder
-					.<VfModuleTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
-			// return error
-			return Futures.immediateFuture(rpcResult);
-		}
-
-		if (input.getVnfInformation() == null || input.getVnfInformation().getVnfId() == null
-				|| input.getVnfInformation().getVnfId().length() == 0) {
-			log.debug("exiting {} because of null or empty vnf-id", SVC_OPERATION);
-			responseBuilder.setResponseCode("403");
-			responseBuilder.setResponseMessage("invalid input, null or empty vnf-id");
-			responseBuilder.setAckFinalIndicator("Y");
-			RpcResult<VfModuleTopologyOperationOutput> rpcResult = RpcResultBuilder
-					.<VfModuleTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
-			return Futures.immediateFuture(rpcResult);
-		}
-
-		if (input.getVfModuleInformation() == null || input.getVfModuleInformation().getVfModuleId() == null
-				|| input.getVfModuleInformation().getVfModuleId().length() == 0) {
-			log.debug("exiting {} because of null or empty vf-module-id", SVC_OPERATION);
-			responseBuilder.setResponseCode("403");
-			responseBuilder.setResponseMessage("invalid input, vf-module-id is null or empty");
-			responseBuilder.setAckFinalIndicator("Y");
-			RpcResult<VfModuleTopologyOperationOutput> rpcResult = RpcResultBuilder
-					.<VfModuleTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
-			return Futures.immediateFuture(rpcResult);
-		}
-
-		// Grab the service instance ID from the input buffer
-		String siid = input.getServiceInformation().getServiceInstanceId();
-
-		if (input.getSdncRequestHeader() != null) {
-			responseBuilder.setSvcRequestId(input.getSdncRequestHeader().getSvcRequestId());
-		}
-
-		/*
-		 * String preload_name = null; String preload_type = null;
-		 *
-		 * preload_name = input.getVfModuleRequestInput().getVfModuleName();
-		 *
-		 * if(input.getVfModuleInformation().getVfModuleType() != null &&
-		 * input.getVfModuleInformation().getVfModuleType().length() != 0) {
-		 * preload_type = input.getVfModuleInformation().getVfModuleType(); }
-		 *
-		 * PreloadDataBuilder preloadDataBuilder = new PreloadDataBuilder(); if
-		 * (preload_name != null && preload_type != null) { getPreloadData(preload_name,
-		 * preload_type, preloadDataBuilder); } else {
-		 * log.debug("vf-module-name and vf-module-type not present in the request."); }
-		 */
-
-		ServiceDataBuilder serviceDataBuilder = new ServiceDataBuilder();
-		getServiceData(siid, serviceDataBuilder);
-
-		ServiceDataBuilder operDataBuilder = new ServiceDataBuilder();
-		getServiceData(siid, operDataBuilder, LogicalDatastoreType.OPERATIONAL);
-
-		// Set the serviceStatus based on input
-		setServiceStatus(serviceStatusBuilder, input.getSdncRequestHeader());
-		setServiceStatus(serviceStatusBuilder, input.getRequestInformation());
-
-		//
-		// setup a service-data object builder
-		// ACTION vnf-topology-operation
-		// INPUT:
-		// USES sdnc-request-header;
-		// USES request-information;
-		// USES service-information;
-		// USES vnf-request-information
-		// OUTPUT:
-		// USES vnf-topology-response-body;
-		// USES vnf-information
-		// USES service-information
-		//
-		// container service-data
-		// uses vnf-configuration-information;
-		// uses oper-status;
-
-		log.info("Adding INPUT data for {} [{}] input: {}", SVC_OPERATION, siid, input);
-		VfModuleTopologyOperationInputBuilder inputBuilder = new VfModuleTopologyOperationInputBuilder(input);
-		GenericResourceApiUtil.toProperties(parms, inputBuilder.build());
-
-		log.info("Adding OPERATIONAL data for {} [{}] operational-data: {}", SVC_OPERATION, siid,
-				operDataBuilder.build());
-		GenericResourceApiUtil.toProperties(parms, "operational-data", operDataBuilder);
-
-		/*
-		 * log.info("Adding CONFIG data for "+SVC_OPERATION+" ["+preload_name+","+
-		 * preload_type+"] preload-data: " +preloadDataBuilder.build());
-		 * GenericResourceApiUtil.toProperties(parms, "preload-data",
-		 * preloadDataBuilder);
-		 */
-
-		// Call SLI sync method
-		// Get SvcLogicService reference
-
-		Properties respProps = null;
-
-		String errorCode = "200";
-		String errorMessage = null;
-		String ackFinal = "Y";
-		String serviceObjectPath = null;
-
-		try {
-			if (svcLogicClient.hasGraph(appName, SVC_OPERATION, null, "sync")) {
-
-				try {
-					respProps = svcLogicClient.execute(appName, SVC_OPERATION, null, "sync", serviceDataBuilder, parms);
-				} catch (Exception e) {
-					log.error("Caught exception executing service logic for " + SVC_OPERATION, e);
-					errorMessage = e.getMessage();
-					errorCode = "500";
-				}
-			} else {
-				errorMessage = "No service logic active for " + appName + ": '" + SVC_OPERATION + "'";
-				errorCode = "503";
-			}
-		} catch (Exception e) {
-			errorCode = "500";
-			errorMessage = e.getMessage();
-			log.error("Caught exception looking for service logic", e);
-		}
-
-		if (respProps != null) {
-			errorCode = respProps.getProperty("error-code");
-			errorMessage = respProps.getProperty("error-message");
-			ackFinal = respProps.getProperty("ack-final", "Y");
-			serviceObjectPath = respProps.getProperty("vf-module-object-path");
-		}
-
-		setServiceStatus(serviceStatusBuilder, errorCode, errorMessage, ackFinal);
-		serviceStatusBuilder.setRequestStatus(RequestStatus.Synccomplete);
-		serviceStatusBuilder.setRpcName(SVC_OPERATION);
-
-		if (errorCode != null && errorCode.length() != 0 && !(errorCode.equals("0") || errorCode.equals("200"))) {
-			responseBuilder.setResponseCode(errorCode);
-			responseBuilder.setResponseMessage(errorMessage);
-			responseBuilder.setAckFinalIndicator(ackFinal);
-
-			ServiceBuilder serviceBuilder = new ServiceBuilder();
-			serviceBuilder.setServiceInstanceId(siid);
-			serviceBuilder.setServiceStatus(serviceStatusBuilder.build());
-			try {
-				saveService(serviceBuilder.build(), true, LogicalDatastoreType.CONFIGURATION);
-			} catch (Exception e) {
-				log.error("Caught Exception updating MD-SAL for {} [{}] \n", SVC_OPERATION, siid, e);
-			}
-			log.error("Returned FAILED for {} [{}] {}", SVC_OPERATION, siid, responseBuilder.build());
-			RpcResult<VfModuleTopologyOperationOutput> rpcResult = RpcResultBuilder
-					.<VfModuleTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
-			// return error
-			return Futures.immediateFuture(rpcResult);
-		}
-
-		// Got success from SLI
-		try {
-			serviceData = serviceDataBuilder.build();
-			log.info("Updating MD-SAL for {} [{}] ServiceData: {}", SVC_OPERATION, siid, serviceData);
-
-			// service object
-			ServiceBuilder serviceBuilder = new ServiceBuilder();
-			serviceBuilder.setServiceData(serviceData);
-			// serviceBuilder.setServiceInstanceId(serviceData.getServiceTopology().getServiceTopologyIdentifier().getServiceInstanceId());
-			serviceBuilder.setServiceInstanceId(siid);
-			serviceBuilder.setServiceStatus(serviceStatusBuilder.build());
-			saveService(serviceBuilder.build(), false, LogicalDatastoreType.CONFIGURATION);
-
-			if (input.getSdncRequestHeader() != null && input.getSdncRequestHeader().getSvcAction() != null) {
-				// Only update operational tree on activate or delete
-				if (input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Unassign)
-						|| input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Activate)) {
-					log.info("Updating OPERATIONAL tree.");
-					saveService(serviceBuilder.build(), false, LogicalDatastoreType.OPERATIONAL);
-				}
-			}
-
-			ServiceResponseInformationBuilder serviceResponseInformationBuilder = new ServiceResponseInformationBuilder();
-			serviceResponseInformationBuilder.setInstanceId(siid);
-			serviceResponseInformationBuilder.setObjectPath(serviceObjectPath);
-			responseBuilder.setServiceResponseInformation(serviceResponseInformationBuilder.build());
-
-		} catch (Exception e) {
-			log.error("Caught Exception updating MD-SAL for {} [{}] \n", SVC_OPERATION, siid, e);
-			responseBuilder.setResponseCode("500");
-			responseBuilder.setResponseMessage(e.toString());
-			responseBuilder.setAckFinalIndicator("Y");
-			log.error("Returned FAILED for {} [{}] {}", SVC_OPERATION, siid, responseBuilder.build());
-			RpcResult<VfModuleTopologyOperationOutput> rpcResult = RpcResultBuilder
-					.<VfModuleTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
-			return Futures.immediateFuture(rpcResult);
-		}
-
-		// Update succeeded
-		responseBuilder.setResponseCode(errorCode);
-		responseBuilder.setAckFinalIndicator(ackFinal);
-		if (errorMessage != null) {
-			responseBuilder.setResponseMessage(errorMessage);
-		}
-		log.info("Updated MD-SAL for {} [{}]", SVC_OPERATION, siid);
-		log.info("Returned SUCCESS for {} [{}] {}", SVC_OPERATION, siid, responseBuilder.build());
-
-		RpcResult<VfModuleTopologyOperationOutput> rpcResult = RpcResultBuilder
-				.<VfModuleTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
-		// return success
-		return Futures.immediateFuture(rpcResult);
-	}
-
-	@Override
-	public Future<RpcResult<NetworkTopologyOperationOutput>> networkTopologyOperation(
-			NetworkTopologyOperationInput input) {
-
-		final String SVC_OPERATION = "network-topology-operation";
-		ServiceData serviceData;
-		ServiceStatusBuilder serviceStatusBuilder = new ServiceStatusBuilder();
-		Properties parms = new Properties();
-
-		log.info("{} called.", SVC_OPERATION);
-		// create a new response object
-		NetworkTopologyOperationOutputBuilder responseBuilder = new NetworkTopologyOperationOutputBuilder();
-
-		if (input == null || input.getServiceInformation() == null
-				|| input.getServiceInformation().getServiceInstanceId() == null
-				|| input.getServiceInformation().getServiceInstanceId().length() == 0) {
-			log.debug("exiting {} because of null or empty service-instance-id", SVC_OPERATION);
-			responseBuilder.setResponseCode("404");
-			responseBuilder.setResponseMessage("invalid input, null or empty service-instance-id");
-			responseBuilder.setAckFinalIndicator("Y");
-			RpcResult<NetworkTopologyOperationOutput> rpcResult = RpcResultBuilder
-					.<NetworkTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
-			return Futures.immediateFuture(rpcResult);
-		}
-
-		String siid = input.getServiceInformation().getServiceInstanceId();
-
-		// Get the service-instance service data from MD-SAL
-		ServiceDataBuilder serviceDataBuilder = new ServiceDataBuilder();
-		getServiceData(siid, serviceDataBuilder);
-
-		if (input.getSdncRequestHeader() != null) {
-			responseBuilder.setSvcRequestId(input.getSdncRequestHeader().getSvcRequestId());
-		}
-
-		ServiceData sd = serviceDataBuilder.build();
-		if (sd == null || sd.getServiceLevelOperStatus() == null) {
-			log.debug("exiting {} because the service-instance does not have any service data in SDNC", SVC_OPERATION);
-			responseBuilder.setResponseCode("404");
-			responseBuilder
-					.setResponseMessage("invalid input: the service-instance does not have any service data in SDNC");
-			responseBuilder.setAckFinalIndicator("Y");
-			RpcResult<NetworkTopologyOperationOutput> rpcResult = RpcResultBuilder
-					.<NetworkTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
-			return Futures.immediateFuture(rpcResult);
-		}
-
-		/*
-		 * //String preload_name = null; //String preload_type = null; // If both
-		 * network-name and network-type are present in request, get the preload network
-		 * from MD-SAL if (input.getNetworkRequestInput() != null &&
-		 * input.getNetworkRequestInput().getNetworkName() != null &&
-		 * input.getNetworkRequestInput().getNetworkName().length() != 0) { preload_name
-		 * = input.getNetworkRequestInput().getNetworkName(); } if
-		 * (input.getNetworkInformation() != null &&
-		 * input.getNetworkInformation().getNetworkType() != null &&
-		 * input.getNetworkInformation().getNetworkType().length() != 0) { preload_type
-		 * = input.getNetworkInformation().getNetworkType(); }
-		 *
-		 * PreloadDataBuilder preloadDataBuilder = new PreloadDataBuilder(); if
-		 * (preload_name != null && preload_type != null) { getPreloadData(preload_name,
-		 * preload_type, preloadDataBuilder); } else {
-		 * log.debug("network-name and network-type not present in request"); }
-		 */
-
-		log.info("Adding INPUT data for {} [{}] input: {}", SVC_OPERATION, siid, input);
-		NetworkTopologyOperationInputBuilder inputBuilder = new NetworkTopologyOperationInputBuilder(input);
-		GenericResourceApiUtil.toProperties(parms, inputBuilder.build());
-
-		// Call SLI sync method
-		// Get SvcLogicService reference
-
-		Properties respProps = null;
-
-		String errorCode = "200";
-		String errorMessage = null;
-		String ackFinal = "Y";
-		String networkId = "error";
-		String serviceObjectPath = null;
-		String networkObjectPath = null;
-
-		try {
-			if (svcLogicClient.hasGraph(appName, SVC_OPERATION, null, "sync")) {
-
-				try {
-					respProps = svcLogicClient.execute(appName, SVC_OPERATION, null, "sync", serviceDataBuilder, parms);
-				} catch (Exception e) {
-					log.error("Caught exception executing service logic for {}", SVC_OPERATION, e);
-					errorMessage = e.getMessage();
-					errorCode = "500";
-				}
-			} else {
-				errorMessage = "No service logic active for " + appName + ": '" + SVC_OPERATION + "'";
-				errorCode = "503";
-			}
-		} catch (Exception e) {
-			errorCode = "500";
-			errorMessage = e.getMessage();
-			log.error("Caught exception looking for service logic", e);
-		}
-
-		if (respProps != null) {
-			errorCode = respProps.getProperty("error-code");
-			errorMessage = respProps.getProperty("error-message");
-			ackFinal = respProps.getProperty("ack-final", "Y");
-			networkId = respProps.getProperty("networkId");
-			serviceObjectPath = respProps.getProperty("service-object-path");
-			networkObjectPath = respProps.getProperty("network-object-path");
-		}
-
-		if (errorCode != null && errorCode.length() != 0 && !(errorCode.equals("0") || errorCode.equals("200"))) {
-			responseBuilder.setResponseCode(errorCode);
-			responseBuilder.setResponseMessage(errorMessage);
-			responseBuilder.setAckFinalIndicator(ackFinal);
-
-			log.error("Returned FAILED for {} [{}] {}", SVC_OPERATION, siid, responseBuilder.build());
-
-			RpcResult<NetworkTopologyOperationOutput> rpcResult = RpcResultBuilder
-					.<NetworkTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
-			return Futures.immediateFuture(rpcResult);
-		}
-
-		// Got success from SLI
-		try {
-
-			serviceData = serviceDataBuilder.build();
-			log.info("Updating MD-SAL for {} [{}] ServiceData: {}", SVC_OPERATION, siid, serviceData);
-
-			// service object
-			ServiceBuilder serviceBuilder = new ServiceBuilder();
-			serviceBuilder.setServiceData(serviceData);
-			serviceBuilder.setServiceInstanceId(siid);
-			serviceBuilder.setServiceStatus(serviceStatusBuilder.build());
-			saveService(serviceBuilder.build(), false, LogicalDatastoreType.CONFIGURATION);
-
-			if (input.getSdncRequestHeader() != null && input.getSdncRequestHeader().getSvcAction() != null) {
-				// Only update operational tree on Activate
-				if (input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Activate)) {
-					log.info("Updating OPERATIONAL tree.");
-					saveService(serviceBuilder.build(), false, LogicalDatastoreType.OPERATIONAL);
-				}
-			}
-
-			NetworkResponseInformationBuilder networkResponseInformationBuilder = new NetworkResponseInformationBuilder();
-			networkResponseInformationBuilder.setInstanceId(networkId);
-			networkResponseInformationBuilder.setObjectPath(networkObjectPath);
-			responseBuilder.setNetworkResponseInformation(networkResponseInformationBuilder.build());
-
-			ServiceResponseInformationBuilder serviceResponseInformationBuilder = new ServiceResponseInformationBuilder();
-			serviceResponseInformationBuilder.setInstanceId(siid);
-			serviceResponseInformationBuilder.setObjectPath(serviceObjectPath);
-			responseBuilder.setServiceResponseInformation(serviceResponseInformationBuilder.build());
-
-		} catch (IllegalStateException e) {
-			log.error("Caught Exception updating MD-SAL for {} [{}] \n", SVC_OPERATION, siid, e);
-			responseBuilder.setResponseCode("500");
-			responseBuilder.setResponseMessage(e.toString());
-			responseBuilder.setAckFinalIndicator("Y");
-			log.error("Returned FAILED for {} [{}] {}", SVC_OPERATION, siid, responseBuilder.build());
-			RpcResult<NetworkTopologyOperationOutput> rpcResult = RpcResultBuilder
-					.<NetworkTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
-			return Futures.immediateFuture(rpcResult);
-		}
-
-		// Update succeeded
-		responseBuilder.setResponseCode(errorCode);
-		responseBuilder.setAckFinalIndicator(ackFinal);
-		if (errorMessage != null) {
-			responseBuilder.setResponseMessage(errorMessage);
-		}
-		log.info("Updated MD-SAL for {} [{}]", SVC_OPERATION, siid);
-		log.info("Returned SUCCESS for {} [{}] {}", SVC_OPERATION, siid, responseBuilder.build());
-
-		RpcResult<NetworkTopologyOperationOutput> rpcResult = RpcResultBuilder
-				.<NetworkTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
-		return Futures.immediateFuture(rpcResult);
-	}
-
-	@Override
-	public Future<RpcResult<ContrailRouteTopologyOperationOutput>> contrailRouteTopologyOperation(
-			ContrailRouteTopologyOperationInput input) {
-
-		final String SVC_OPERATION = "contrail-route-topology-operation";
-		ServiceData serviceData;
-		ServiceStatusBuilder serviceStatusBuilder = new ServiceStatusBuilder();
-		Properties parms = new Properties();
-
-		log.info("{} called.", SVC_OPERATION);
-		// create a new response object
-		ContrailRouteTopologyOperationOutputBuilder responseBuilder = new ContrailRouteTopologyOperationOutputBuilder();
-
-		if (input == null || input.getServiceInformation() == null
-				|| input.getServiceInformation().getServiceInstanceId() == null
-				|| input.getServiceInformation().getServiceInstanceId().length() == 0) {
-			log.debug("exiting {} because of null or empty service-instance-id", SVC_OPERATION);
-			responseBuilder.setResponseCode("404");
-			responseBuilder.setResponseMessage("invalid input, null or empty service-instance-id");
-			responseBuilder.setAckFinalIndicator("Y");
-			RpcResult<ContrailRouteTopologyOperationOutput> rpcResult = RpcResultBuilder
-					.<ContrailRouteTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
-			return Futures.immediateFuture(rpcResult);
-		}
-
-		String siid = input.getServiceInformation().getServiceInstanceId();
-
-		// Get the service-instance service data from MD-SAL
-		ServiceDataBuilder serviceDataBuilder = new ServiceDataBuilder();
-		getServiceData(siid, serviceDataBuilder);
-
-		if (input.getSdncRequestHeader() != null) {
-			responseBuilder.setSvcRequestId(input.getSdncRequestHeader().getSvcRequestId());
-		}
-
-		ServiceData sd = serviceDataBuilder.build();
-		if (sd == null || sd.getServiceLevelOperStatus() == null) {
-			log.debug("exiting {} because the service-instance does not have any service data in SDNC", SVC_OPERATION);
-			responseBuilder.setResponseCode("404");
-			responseBuilder
-					.setResponseMessage("invalid input: the service-instance does not have any service data in SDNC");
-			responseBuilder.setAckFinalIndicator("Y");
-			RpcResult<ContrailRouteTopologyOperationOutput> rpcResult = RpcResultBuilder
-					.<ContrailRouteTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
-			return Futures.immediateFuture(rpcResult);
-		}
-
-		log.info("Adding INPUT data for " + SVC_OPERATION + " [" + siid + "] input: " + input);
-		ContrailRouteTopologyOperationInputBuilder inputBuilder = new ContrailRouteTopologyOperationInputBuilder(input);
-		GenericResourceApiUtil.toProperties(parms, inputBuilder.build());
-
-		// Call SLI sync method
-		// Get SvcLogicService reference
-
-		Properties respProps = null;
-
-		String errorCode = "200";
-		String errorMessage = null;
-		String ackFinal = "Y";
-		String allottedResourceId = "error";
-		String serviceObjectPath = null;
-		String contrailRouteObjectPath = null;
-
-		try {
-			if (svcLogicClient.hasGraph(appName, SVC_OPERATION, null, "sync")) {
-
-				try {
-					respProps = svcLogicClient.execute(appName, SVC_OPERATION, null, "sync", serviceDataBuilder, parms);
-				} catch (Exception e) {
-					log.error("Caught exception executing service logic for {}", SVC_OPERATION, e);
-					errorMessage = e.getMessage();
-					errorCode = "500";
-				}
-			} else {
-				errorMessage = "No service logic active for " + appName + ": '" + SVC_OPERATION + "'";
-				errorCode = "503";
-			}
-		} catch (Exception e) {
-			errorCode = "500";
-			errorMessage = e.getMessage();
-			log.error("Caught exception looking for service logic", e);
-		}
-
-		if (respProps != null) {
-			errorCode = respProps.getProperty("error-code");
-			errorMessage = respProps.getProperty("error-message");
-			ackFinal = respProps.getProperty("ack-final", "Y");
-			allottedResourceId = respProps.getProperty("allotted-resource-id");
-			serviceObjectPath = respProps.getProperty("service-object-path");
-			contrailRouteObjectPath = respProps.getProperty("contrail-route-object-path");
-		}
-
-		if (errorCode != null && errorCode.length() != 0 && !(errorCode.equals("0") || errorCode.equals("200"))) {
-			responseBuilder.setResponseCode(errorCode);
-			responseBuilder.setResponseMessage(errorMessage);
-			responseBuilder.setAckFinalIndicator(ackFinal);
-
-			log.error("Returned FAILED for {} [{}] {}", SVC_OPERATION, siid, responseBuilder.build());
-
-			RpcResult<ContrailRouteTopologyOperationOutput> rpcResult = RpcResultBuilder
-					.<ContrailRouteTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
-			return Futures.immediateFuture(rpcResult);
-		}
-
-		// Got success from SLI
-		try {
-
-			serviceData = serviceDataBuilder.build();
-			log.info("Updating MD-SAL for {} [{}] ServiceData: {}", SVC_OPERATION, siid, serviceData);
-
-			// service object
-			ServiceBuilder serviceBuilder = new ServiceBuilder();
-			serviceBuilder.setServiceData(serviceData);
-			serviceBuilder.setServiceInstanceId(siid);
-			serviceBuilder.setServiceStatus(serviceStatusBuilder.build());
-			saveService(serviceBuilder.build(), false, LogicalDatastoreType.CONFIGURATION);
-
-			if (input.getSdncRequestHeader() != null && input.getSdncRequestHeader().getSvcAction() != null) {
-				// Only update operational tree on activate or delete
-				if (input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Unassign)
-						|| input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Activate)) {
-					log.info("Updating OPERATIONAL tree.");
-					saveService(serviceBuilder.build(), false, LogicalDatastoreType.OPERATIONAL);
-				}
-			}
-
-			ContrailRouteResponseInformationBuilder contrailRouteResponseInformationBuilder = new ContrailRouteResponseInformationBuilder();
-			contrailRouteResponseInformationBuilder.setInstanceId(allottedResourceId);
-			contrailRouteResponseInformationBuilder.setObjectPath(contrailRouteObjectPath);
-			responseBuilder.setContrailRouteResponseInformation(contrailRouteResponseInformationBuilder.build());
-
-			ServiceResponseInformationBuilder serviceResponseInformationBuilder = new ServiceResponseInformationBuilder();
-			serviceResponseInformationBuilder.setInstanceId(siid);
-			serviceResponseInformationBuilder.setObjectPath(serviceObjectPath);
-			responseBuilder.setServiceResponseInformation(serviceResponseInformationBuilder.build());
-
-		} catch (IllegalStateException e) {
-			log.error("Caught Exception updating MD-SAL for {} [{}] \n", SVC_OPERATION, siid, e);
-			responseBuilder.setResponseCode("500");
-			responseBuilder.setResponseMessage(e.toString());
-			responseBuilder.setAckFinalIndicator("Y");
-			log.error("Returned FAILED for {} [{}] {}", SVC_OPERATION, siid, responseBuilder.build());
-			RpcResult<ContrailRouteTopologyOperationOutput> rpcResult = RpcResultBuilder
-					.<ContrailRouteTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
-			return Futures.immediateFuture(rpcResult);
-		}
-
-		// Update succeeded
-		responseBuilder.setResponseCode(errorCode);
-		responseBuilder.setAckFinalIndicator(ackFinal);
-		if (errorMessage != null) {
-			responseBuilder.setResponseMessage(errorMessage);
-		}
-		log.info("Updated MD-SAL for {} [{}]", SVC_OPERATION, siid);
-		log.info("Returned SUCCESS for {} [{}] {}", SVC_OPERATION, siid, responseBuilder.build());
-
-		RpcResult<ContrailRouteTopologyOperationOutput> rpcResult = RpcResultBuilder
-				.<ContrailRouteTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
-		return Futures.immediateFuture(rpcResult);
-	}
-
-	@Override
-	public Future<RpcResult<SecurityZoneTopologyOperationOutput>> securityZoneTopologyOperation(
-			SecurityZoneTopologyOperationInput input) {
-
-		final String SVC_OPERATION = "security-zone-topology-operation";
-		ServiceData serviceData;
-		ServiceStatusBuilder serviceStatusBuilder = new ServiceStatusBuilder();
-		Properties parms = new Properties();
-
-		log.info("{} called.", SVC_OPERATION);
-		// create a new response object
-		SecurityZoneTopologyOperationOutputBuilder responseBuilder = new SecurityZoneTopologyOperationOutputBuilder();
-
-		if (input == null || input.getServiceInformation() == null
-				|| input.getServiceInformation().getServiceInstanceId() == null
-				|| input.getServiceInformation().getServiceInstanceId().length() == 0) {
-			log.debug("exiting {} because of null or empty service-instance-id", SVC_OPERATION);
-			responseBuilder.setResponseCode("404");
-			responseBuilder.setResponseMessage("invalid input, null or empty service-instance-id");
-			responseBuilder.setAckFinalIndicator("Y");
-			RpcResult<SecurityZoneTopologyOperationOutput> rpcResult = RpcResultBuilder
-					.<SecurityZoneTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
-			return Futures.immediateFuture(rpcResult);
-		}
-
-		String siid = input.getServiceInformation().getServiceInstanceId();
-
-		// Get the service-instance service data from MD-SAL
-		ServiceDataBuilder serviceDataBuilder = new ServiceDataBuilder();
-		getServiceData(siid, serviceDataBuilder);
-
-		if (input.getSdncRequestHeader() != null) {
-			responseBuilder.setSvcRequestId(input.getSdncRequestHeader().getSvcRequestId());
-		}
-
-		ServiceData sd = serviceDataBuilder.build();
-		if (sd == null || sd.getServiceLevelOperStatus() == null) {
-			log.debug("exiting {} because the service-instance does not have any service data in SDNC", SVC_OPERATION);
-			responseBuilder.setResponseCode("404");
-			responseBuilder
-					.setResponseMessage("invalid input: the service-instance does not have any service data in SDNC");
-			responseBuilder.setAckFinalIndicator("Y");
-			RpcResult<SecurityZoneTopologyOperationOutput> rpcResult = RpcResultBuilder
-					.<SecurityZoneTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
-			return Futures.immediateFuture(rpcResult);
-		}
-
-		log.info("Adding INPUT data for {} [{}] input: {}", SVC_OPERATION, siid, input);
-		SecurityZoneTopologyOperationInputBuilder inputBuilder = new SecurityZoneTopologyOperationInputBuilder(input);
-		GenericResourceApiUtil.toProperties(parms, inputBuilder.build());
-
-		// Call SLI sync method
-		// Get SvcLogicService reference
-
-		Properties respProps = null;
-
-		String errorCode = "200";
-		String errorMessage = null;
-		String ackFinal = "Y";
-		String allottedResourceId = "error";
-		String serviceObjectPath = null;
-		String securityZoneObjectPath = null;
-
-		try {
-			if (svcLogicClient.hasGraph(appName, SVC_OPERATION, null, "sync")) {
-
-				try {
-					respProps = svcLogicClient.execute(appName, SVC_OPERATION, null, "sync", serviceDataBuilder, parms);
-				} catch (Exception e) {
-					log.error("Caught exception executing service logic for {}", SVC_OPERATION, e);
-					errorMessage = e.getMessage();
-					errorCode = "500";
-				}
-			} else {
-				errorMessage = "No service logic active for " + appName + ": '" + SVC_OPERATION + "'";
-				errorCode = "503";
-			}
-		} catch (Exception e) {
-			errorCode = "500";
-			errorMessage = e.getMessage();
-			log.error("Caught exception looking for service logic", e);
-		}
-
-		if (respProps != null) {
-			errorCode = respProps.getProperty("error-code");
-			errorMessage = respProps.getProperty("error-message");
-			ackFinal = respProps.getProperty("ack-final", "Y");
-			allottedResourceId = respProps.getProperty("allotted-resource-id");
-			serviceObjectPath = respProps.getProperty("service-object-path");
-			securityZoneObjectPath = respProps.getProperty("security-zone-object-path");
-		}
-
-		if (errorCode != null && errorCode.length() != 0 && !(errorCode.equals("0") || errorCode.equals("200"))) {
-			responseBuilder.setResponseCode(errorCode);
-			responseBuilder.setResponseMessage(errorMessage);
-			responseBuilder.setAckFinalIndicator(ackFinal);
-
-			log.error("Returned FAILED for {} [{}] {}", SVC_OPERATION, siid, responseBuilder.build());
-
-			RpcResult<SecurityZoneTopologyOperationOutput> rpcResult = RpcResultBuilder
-					.<SecurityZoneTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
-			return Futures.immediateFuture(rpcResult);
-		}
-
-		// Got success from SLI
-		try {
-
-			serviceData = serviceDataBuilder.build();
-			log.info("Updating MD-SAL for {} [{}] ServiceData: {}", SVC_OPERATION, siid, serviceData);
-
-			// service object
-			ServiceBuilder serviceBuilder = new ServiceBuilder();
-			serviceBuilder.setServiceData(serviceData);
-			serviceBuilder.setServiceInstanceId(siid);
-			serviceBuilder.setServiceStatus(serviceStatusBuilder.build());
-			saveService(serviceBuilder.build(), false, LogicalDatastoreType.CONFIGURATION);
-
-			if (input.getSdncRequestHeader() != null && input.getSdncRequestHeader().getSvcAction() != null) {
-				// Only update operational tree on activate or delete
-				if (input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Unassign)
-						|| input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Activate)) {
-					log.info("Updating OPERATIONAL tree.");
-					saveService(serviceBuilder.build(), false, LogicalDatastoreType.OPERATIONAL);
-				}
-			}
-
-			SecurityZoneResponseInformationBuilder securityZoneResponseInformationBuilder = new SecurityZoneResponseInformationBuilder();
-			securityZoneResponseInformationBuilder.setInstanceId(allottedResourceId);
-			securityZoneResponseInformationBuilder.setObjectPath(securityZoneObjectPath);
-			responseBuilder.setSecurityZoneResponseInformation(securityZoneResponseInformationBuilder.build());
-
-			ServiceResponseInformationBuilder serviceResponseInformationBuilder = new ServiceResponseInformationBuilder();
-			serviceResponseInformationBuilder.setInstanceId(siid);
-			serviceResponseInformationBuilder.setObjectPath(serviceObjectPath);
-			responseBuilder.setServiceResponseInformation(serviceResponseInformationBuilder.build());
-
-		} catch (IllegalStateException e) {
-			log.error("Caught Exception updating MD-SAL for {} [{}] \n", SVC_OPERATION, siid, e);
-			responseBuilder.setResponseCode("500");
-			responseBuilder.setResponseMessage(e.toString());
-			responseBuilder.setAckFinalIndicator("Y");
-			log.error("Returned FAILED for {} [{}] {}", SVC_OPERATION, siid, responseBuilder.build());
-			RpcResult<SecurityZoneTopologyOperationOutput> rpcResult = RpcResultBuilder
-					.<SecurityZoneTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
-			return Futures.immediateFuture(rpcResult);
-		}
-
-		// Update succeeded
-		responseBuilder.setResponseCode(errorCode);
-		responseBuilder.setAckFinalIndicator(ackFinal);
-		if (errorMessage != null) {
-			responseBuilder.setResponseMessage(errorMessage);
-		}
-		log.info("Updated MD-SAL for {} [{}]", SVC_OPERATION, siid);
-		log.info("Returned SUCCESS for {} [{}] {}", SVC_OPERATION, siid, responseBuilder.build());
-
-		RpcResult<SecurityZoneTopologyOperationOutput> rpcResult = RpcResultBuilder
-				.<SecurityZoneTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
-		return Futures.immediateFuture(rpcResult);
-	}
-
-	@Override
-	public Future<RpcResult<TunnelxconnTopologyOperationOutput>> tunnelxconnTopologyOperation(
-			TunnelxconnTopologyOperationInput input) {
-
-		final String SVC_OPERATION = "tunnelxconn-topology-operation";
-		ServiceData serviceData;
-		ServiceStatusBuilder serviceStatusBuilder = new ServiceStatusBuilder();
-		Properties parms = new Properties();
-
-		log.info("{} called.", SVC_OPERATION);
-		// create a new response object
-		TunnelxconnTopologyOperationOutputBuilder responseBuilder = new TunnelxconnTopologyOperationOutputBuilder();
-
-		if (input == null || input.getServiceInformation() == null
-				|| input.getServiceInformation().getServiceInstanceId() == null
-				|| input.getServiceInformation().getServiceInstanceId().length() == 0) {
-			log.debug("exiting {} because of null or empty service-instance-id", SVC_OPERATION);
-			responseBuilder.setResponseCode("404");
-			responseBuilder.setResponseMessage("invalid input, null or empty service-instance-id");
-			responseBuilder.setAckFinalIndicator("Y");
-			RpcResult<TunnelxconnTopologyOperationOutput> rpcResult = RpcResultBuilder
-					.<TunnelxconnTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
-			return Futures.immediateFuture(rpcResult);
-		}
-
-		String siid = input.getServiceInformation().getServiceInstanceId();
-
-		// Get the service-instance service data from MD-SAL
-		ServiceDataBuilder serviceDataBuilder = new ServiceDataBuilder();
-		getServiceData(siid, serviceDataBuilder);
-
-		if (input.getSdncRequestHeader() != null) {
-			responseBuilder.setSvcRequestId(input.getSdncRequestHeader().getSvcRequestId());
-		}
-
-		ServiceData sd = serviceDataBuilder.build();
-		if (sd == null || sd.getServiceLevelOperStatus() == null) {
-			log.debug("exiting {} because the service-instance does not have any service data in SDNC", SVC_OPERATION);
-			responseBuilder.setResponseCode("404");
-			responseBuilder
-					.setResponseMessage("invalid input: the service-instance does not have any service data in SDNC");
-			responseBuilder.setAckFinalIndicator("Y");
-			RpcResult<TunnelxconnTopologyOperationOutput> rpcResult = RpcResultBuilder
-					.<TunnelxconnTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
-			return Futures.immediateFuture(rpcResult);
-		}
-
-		log.info("Adding INPUT data for {} [{}] input: {}", SVC_OPERATION, siid, input);
-		TunnelxconnTopologyOperationInputBuilder inputBuilder = new TunnelxconnTopologyOperationInputBuilder(input);
-		GenericResourceApiUtil.toProperties(parms, inputBuilder.build());
-
-		// Call SLI sync method
-		// Get SvcLogicService reference
-
-		Properties respProps = null;
-
-		String errorCode = "200";
-		String errorMessage = null;
-		String ackFinal = "Y";
-		String allottedResourceId = "error";
-		String serviceObjectPath = null;
-		String tunnelxconnObjectPath = null;
-
-		try {
-			if (svcLogicClient.hasGraph(appName, SVC_OPERATION, null, "sync")) {
-
-				try {
-					respProps = svcLogicClient.execute(appName, SVC_OPERATION, null, "sync", serviceDataBuilder, parms);
-				} catch (Exception e) {
-					log.error("Caught exception executing service logic for {}", SVC_OPERATION, e);
-					errorMessage = e.getMessage();
-					errorCode = "500";
-				}
-			} else {
-				errorMessage = "No service logic active for " + appName + ": '" + SVC_OPERATION + "'";
-				errorCode = "503";
-			}
-		} catch (Exception e) {
-			errorCode = "500";
-			errorMessage = e.getMessage();
-			log.error("Caught exception looking for service logic", e);
-		}
-
-		if (respProps != null) {
-			errorCode = respProps.getProperty("error-code");
-			errorMessage = respProps.getProperty("error-message");
-			ackFinal = respProps.getProperty("ack-final", "Y");
-			allottedResourceId = respProps.getProperty("allotted-resource-id");
-			serviceObjectPath = respProps.getProperty("service-object-path");
-			tunnelxconnObjectPath = respProps.getProperty("tunnelxconn-object-path");
-		}
-
-		if (errorCode != null && errorCode.length() != 0 && !(errorCode.equals("0") || errorCode.equals("200"))) {
-			responseBuilder.setResponseCode(errorCode);
-			responseBuilder.setResponseMessage(errorMessage);
-			responseBuilder.setAckFinalIndicator(ackFinal);
-
-			log.error("Returned FAILED for {} [{}] {}", SVC_OPERATION, siid, responseBuilder.build());
-
-			RpcResult<TunnelxconnTopologyOperationOutput> rpcResult = RpcResultBuilder
-					.<TunnelxconnTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
-			return Futures.immediateFuture(rpcResult);
-		}
-
-		// Got success from SLI
-		try {
-
-			serviceData = serviceDataBuilder.build();
-			log.info("Updating MD-SAL for {} [{}] ServiceData: {}", SVC_OPERATION, siid, serviceData);
-
-			// service object
-			ServiceBuilder serviceBuilder = new ServiceBuilder();
-			serviceBuilder.setServiceData(serviceData);
-			serviceBuilder.setServiceInstanceId(siid);
-			serviceBuilder.setServiceStatus(serviceStatusBuilder.build());
-			saveService(serviceBuilder.build(), false, LogicalDatastoreType.CONFIGURATION);
-
-			if (input.getSdncRequestHeader() != null && input.getSdncRequestHeader().getSvcAction() != null) {
-				// Only update operational tree on activate or delete
-				if (input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Unassign)
-						|| input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Activate)) {
-					log.info("Updating OPERATIONAL tree.");
-					saveService(serviceBuilder.build(), false, LogicalDatastoreType.OPERATIONAL);
-				}
-			}
-
-			TunnelxconnResponseInformationBuilder tunnelxconnResponseInformationBuilder = new TunnelxconnResponseInformationBuilder();
-			tunnelxconnResponseInformationBuilder.setInstanceId(allottedResourceId);
-			tunnelxconnResponseInformationBuilder.setObjectPath(tunnelxconnObjectPath);
-			responseBuilder.setTunnelxconnResponseInformation(tunnelxconnResponseInformationBuilder.build());
-
-			ServiceResponseInformationBuilder serviceResponseInformationBuilder = new ServiceResponseInformationBuilder();
-			serviceResponseInformationBuilder.setInstanceId(siid);
-			serviceResponseInformationBuilder.setObjectPath(serviceObjectPath);
-			responseBuilder.setServiceResponseInformation(serviceResponseInformationBuilder.build());
-
-		} catch (IllegalStateException e) {
-			log.error("Caught Exception updating MD-SAL for {} [{}] \n", SVC_OPERATION, siid, e);
-			responseBuilder.setResponseCode("500");
-			responseBuilder.setResponseMessage(e.toString());
-			responseBuilder.setAckFinalIndicator("Y");
-			log.error("Returned FAILED for {} [{}] {}", SVC_OPERATION, siid, responseBuilder.build());
-			RpcResult<TunnelxconnTopologyOperationOutput> rpcResult = RpcResultBuilder
-					.<TunnelxconnTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
-			return Futures.immediateFuture(rpcResult);
-		}
-
-		// Update succeeded
-		responseBuilder.setResponseCode(errorCode);
-		responseBuilder.setAckFinalIndicator(ackFinal);
-		if (errorMessage != null) {
-			responseBuilder.setResponseMessage(errorMessage);
-		}
-		log.info("Updated MD-SAL for {} [{}]", SVC_OPERATION, siid);
-		log.info("Returned SUCCESS for {} [{}] {}", SVC_OPERATION, siid, responseBuilder.build());
-
-		RpcResult<TunnelxconnTopologyOperationOutput> rpcResult = RpcResultBuilder
-				.<TunnelxconnTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
-		return Futures.immediateFuture(rpcResult);
-	}
-
-	@Override
-	public Future<RpcResult<BrgTopologyOperationOutput>> brgTopologyOperation(BrgTopologyOperationInput input) {
-		final String SVC_OPERATION = "brg-topology-operation";
-		ServiceData serviceData;
-		ServiceStatusBuilder serviceStatusBuilder = new ServiceStatusBuilder();
-		Properties parms = new Properties();
-
-		log.info("{} called.", SVC_OPERATION);
-		// create a new response object
-		BrgTopologyOperationOutputBuilder responseBuilder = new BrgTopologyOperationOutputBuilder();
-
-		if (input == null || input.getServiceInformation() == null
-				|| input.getServiceInformation().getServiceInstanceId() == null
-				|| input.getServiceInformation().getServiceInstanceId().length() == 0) {
-			log.debug("exiting {} because of null or empty service-instance-id", SVC_OPERATION);
-			responseBuilder.setResponseCode("404");
-			responseBuilder.setResponseMessage("invalid input, null or empty service-instance-id");
-			responseBuilder.setAckFinalIndicator("Y");
-			RpcResult<BrgTopologyOperationOutput> rpcResult = RpcResultBuilder.<BrgTopologyOperationOutput>status(true)
-					.withResult(responseBuilder.build()).build();
-			return Futures.immediateFuture(rpcResult);
-		}
-
-		String siid = input.getServiceInformation().getServiceInstanceId();
-
-		// Get the service-instance service data from MD-SAL
-		ServiceDataBuilder serviceDataBuilder = new ServiceDataBuilder();
-		getServiceData(siid, serviceDataBuilder);
-
-		if (input.getSdncRequestHeader() != null) {
-			responseBuilder.setSvcRequestId(input.getSdncRequestHeader().getSvcRequestId());
-		}
-
-		ServiceData sd = serviceDataBuilder.build();
-		if (sd == null || sd.getServiceLevelOperStatus() == null) {
-			log.debug("exiting {} because the service-instance does not have any service data in SDNC", SVC_OPERATION);
-			responseBuilder.setResponseCode("404");
-			responseBuilder
-					.setResponseMessage("invalid input: the service-instance does not have any service data in SDNC");
-			responseBuilder.setAckFinalIndicator("Y");
-			RpcResult<BrgTopologyOperationOutput> rpcResult = RpcResultBuilder.<BrgTopologyOperationOutput>status(true)
-					.withResult(responseBuilder.build()).build();
-			return Futures.immediateFuture(rpcResult);
-		}
-
-		log.info("Adding INPUT data for {} [{}] input: {}", SVC_OPERATION, siid, input);
-		BrgTopologyOperationInputBuilder inputBuilder = new BrgTopologyOperationInputBuilder(input);
-		GenericResourceApiUtil.toProperties(parms, inputBuilder.build());
-
-		// Call SLI sync method
-		// Get SvcLogicService reference
-
-		Properties respProps = null;
-
-		String errorCode = "200";
-		String errorMessage = null;
-		String ackFinal = "Y";
-		String allottedResourceId = "error";
-		String serviceObjectPath = null;
-		String brgObjectPath = null;
-
-		try {
-			if (svcLogicClient.hasGraph(appName, SVC_OPERATION, null, "sync")) {
-
-				try {
-					respProps = svcLogicClient.execute(appName, SVC_OPERATION, null, "sync", serviceDataBuilder, parms);
-				} catch (Exception e) {
-					log.error("Caught exception executing service logic for {}", SVC_OPERATION, e);
-					errorMessage = e.getMessage();
-					errorCode = "500";
-				}
-			} else {
-				errorMessage = "No service logic active for " + appName + ": '" + SVC_OPERATION + "'";
-				errorCode = "503";
-			}
-		} catch (Exception e) {
-			errorCode = "500";
-			errorMessage = e.getMessage();
-			log.error("Caught exception looking for service logic", e);
-		}
-
-		if (respProps != null) {
-			errorCode = respProps.getProperty("error-code");
-			errorMessage = respProps.getProperty("error-message");
-			ackFinal = respProps.getProperty("ack-final", "Y");
-			allottedResourceId = respProps.getProperty("allotted-resource-id");
-			serviceObjectPath = respProps.getProperty("service-object-path");
-			brgObjectPath = respProps.getProperty("brg-object-path");
-		}
-
-		if (errorCode != null && errorCode.length() != 0 && !(errorCode.equals("0") || errorCode.equals("200"))) {
-			responseBuilder.setResponseCode(errorCode);
-			responseBuilder.setResponseMessage(errorMessage);
-			responseBuilder.setAckFinalIndicator(ackFinal);
-
-			log.error("Returned FAILED for {} [{}] {}", SVC_OPERATION, siid, responseBuilder.build());
-
-			RpcResult<BrgTopologyOperationOutput> rpcResult = RpcResultBuilder.<BrgTopologyOperationOutput>status(true)
-					.withResult(responseBuilder.build()).build();
-			return Futures.immediateFuture(rpcResult);
-		}
-
-		// Got success from SLI
-		try {
-
-			serviceData = serviceDataBuilder.build();
-			log.info("Updating MD-SAL for {} [{}] ServiceData: {}", SVC_OPERATION, siid, serviceData);
-
-			// service object
-			ServiceBuilder serviceBuilder = new ServiceBuilder();
-			serviceBuilder.setServiceData(serviceData);
-			serviceBuilder.setServiceInstanceId(siid);
-			serviceBuilder.setServiceStatus(serviceStatusBuilder.build());
-			saveService(serviceBuilder.build(), false, LogicalDatastoreType.CONFIGURATION);
-
-			if (input.getSdncRequestHeader() != null && input.getSdncRequestHeader().getSvcAction() != null) {
-				// Only update operational tree on activate or delete
-				if (input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Unassign)
-						|| input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Activate)) {
-					log.info("Updating OPERATIONAL tree.");
-					saveService(serviceBuilder.build(), false, LogicalDatastoreType.OPERATIONAL);
-				}
-			}
-
-			BrgResponseInformationBuilder brgResponseInformationBuilder = new BrgResponseInformationBuilder();
-			brgResponseInformationBuilder.setInstanceId(allottedResourceId);
-			brgResponseInformationBuilder.setObjectPath(brgObjectPath);
-			responseBuilder.setBrgResponseInformation(brgResponseInformationBuilder.build());
-
-			ServiceResponseInformationBuilder serviceResponseInformationBuilder = new ServiceResponseInformationBuilder();
-			serviceResponseInformationBuilder.setInstanceId(siid);
-			serviceResponseInformationBuilder.setObjectPath(serviceObjectPath);
-			responseBuilder.setServiceResponseInformation(serviceResponseInformationBuilder.build());
-
-		} catch (IllegalStateException e) {
-			log.error("Caught Exception updating MD-SAL for {} [{}] \n", SVC_OPERATION, siid, e);
-			responseBuilder.setResponseCode("500");
-			responseBuilder.setResponseMessage(e.toString());
-			responseBuilder.setAckFinalIndicator("Y");
-			log.error("Returned FAILED for {} [{}] {}", SVC_OPERATION, siid, responseBuilder.build());
-			RpcResult<BrgTopologyOperationOutput> rpcResult = RpcResultBuilder.<BrgTopologyOperationOutput>status(true)
-					.withResult(responseBuilder.build()).build();
-			return Futures.immediateFuture(rpcResult);
-		}
-
-		// Update succeeded
-		responseBuilder.setResponseCode(errorCode);
-		responseBuilder.setAckFinalIndicator(ackFinal);
-		if (errorMessage != null) {
-			responseBuilder.setResponseMessage(errorMessage);
-		}
-		log.info("Updated MD-SAL for {} [{}]", SVC_OPERATION, siid);
-		log.info("Returned SUCCESS for {} [{}] {}", SVC_OPERATION, siid, responseBuilder.build());
-
-		RpcResult<BrgTopologyOperationOutput> rpcResult = RpcResultBuilder.<BrgTopologyOperationOutput>status(true)
-				.withResult(responseBuilder.build()).build();
-		return Futures.immediateFuture(rpcResult);
-	}
-
-	@Override
-	public Future<RpcResult<PreloadVnfTopologyOperationOutput>> preloadVnfTopologyOperation(
-			PreloadVnfTopologyOperationInput input) {
-
-		final String SVC_OPERATION = "preload-vnf-topology-operation";
-		PreloadData preloadData;
-		Properties parms = new Properties();
-
-		log.info("{} called.", SVC_OPERATION);
-		// create a new response object
-		PreloadVnfTopologyOperationOutputBuilder responseBuilder = new PreloadVnfTopologyOperationOutputBuilder();
-
-		// Result from savePreloadData
-		final SettableFuture<RpcResult<Void>> futureResult = SettableFuture.create();
-
-		if (input == null || input.getVnfTopologyInformation() == null
-				|| input.getVnfTopologyInformation().getVnfTopologyIdentifier() == null) {
-			log.debug("exiting {} because of null input", SVC_OPERATION);
-			responseBuilder.setResponseCode("403");
-			responseBuilder.setResponseMessage("invalid input: input is null");
-			responseBuilder.setAckFinalIndicator("Y");
-			RpcResult<PreloadVnfTopologyOperationOutput> rpcResult = RpcResultBuilder
-					.<PreloadVnfTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
-			return Futures.immediateFuture(rpcResult);
-		}
-
-		// Grab the name and type from the input buffer
-		String preload_name = input.getVnfTopologyInformation().getVnfTopologyIdentifier().getVnfName();
-		String preload_type = input.getVnfTopologyInformation().getVnfTopologyIdentifier().getVnfType();
-
-		// Make sure we have a preload_name and preload_type
-		if (preload_name == null || preload_name.length() == 0 || preload_type == null || preload_type.length() == 0) {
-			log.debug("exiting {} vnf-name or vnf-type is null or empty", SVC_OPERATION);
-			responseBuilder.setResponseCode("403");
-			responseBuilder.setResponseMessage("invalid input: vnf-name or vnf-type is null or empty");
-			responseBuilder.setAckFinalIndicator("Y");
-			RpcResult<PreloadVnfTopologyOperationOutput> rpcResult = RpcResultBuilder
-					.<PreloadVnfTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
-			return Futures.immediateFuture(rpcResult);
-		}
-
-		if (input.getSdncRequestHeader() != null) {
-			responseBuilder.setSvcRequestId(input.getSdncRequestHeader().getSvcRequestId());
-		}
-
-		PreloadDataBuilder preloadDataBuilder = new PreloadDataBuilder();
-		getPreloadData(preload_name, preload_type, preloadDataBuilder);
-
-		PreloadDataBuilder operDataBuilder = new PreloadDataBuilder();
-		getPreloadData(preload_name, preload_type, operDataBuilder, LogicalDatastoreType.OPERATIONAL);
-
-		// setup a preload-data object builder
-		// ACTION preload-vnf-topology-operation
-		// INPUT:
-		// USES sdnc-request-header;
-		// USES request-information;
-		// uses vnf-topology-information;
-		// OUTPUT:
-		// USES vnf-topology-response-body;
-		//
-		// container preload-data
-		// uses vnf-topology-information;
-		// uses network-topology-information;
-		// uses oper-status;
-
-		log.info("Adding INPUT data for {} [{},{}] input: {}", SVC_OPERATION, preload_name, preload_type, input);
-		PreloadVnfTopologyOperationInputBuilder inputBuilder = new PreloadVnfTopologyOperationInputBuilder(input);
-		GenericResourceApiUtil.toProperties(parms, inputBuilder.build());
-		log.info("Adding OPERATIONAL data for {} [{},{}] operational-data: {}", SVC_OPERATION, preload_name,
-				preload_type, operDataBuilder.build());
-		GenericResourceApiUtil.toProperties(parms, "operational-data", operDataBuilder);
-
-		// Call SLI sync method
-		// Get SvcLogicService reference
-
-		Properties respProps = null;
-
-		String errorCode = "200";
-		String errorMessage = null;
-		String ackFinal = "Y";
-
-		try {
-			if (svcLogicClient.hasGraph(appName, SVC_OPERATION, null, "sync")) {
-
-				try {
-					respProps = svcLogicClient.execute(appName, SVC_OPERATION, null, "sync", preloadDataBuilder, parms);
-				} catch (Exception e) {
-					log.error("Caught exception executing service logic for {}", SVC_OPERATION, e);
-					errorMessage = e.getMessage();
-					errorCode = "500";
-				}
-			} else {
-				errorMessage = "No service logic active for " + appName + ": '" + SVC_OPERATION + "'";
-				errorCode = "503";
-			}
-		} catch (Exception e) {
-			errorCode = "500";
-			errorMessage = e.getMessage();
-			log.error("Caught exception looking for service logic", e);
-		}
-
-		if (respProps != null) {
-			errorCode = respProps.getProperty("error-code");
-			errorMessage = respProps.getProperty("error-message");
-			ackFinal = respProps.getProperty("ack-final", "Y");
-			// internalError = respProps.getProperty("internal-error", "false");
-		}
-
-		if (errorCode != null && errorCode.length() != 0 && !(errorCode.equals("0") || errorCode.equals("200"))) {
-
-			responseBuilder.setResponseCode(errorCode);
-			responseBuilder.setResponseMessage(errorMessage);
-			responseBuilder.setAckFinalIndicator(ackFinal);
-
-			VnfPreloadListBuilder preloadVnfListBuilder = new VnfPreloadListBuilder();
-			preloadVnfListBuilder.setVnfName(preload_name);
-			preloadVnfListBuilder.setVnfType(preload_type);
-			preloadVnfListBuilder.setPreloadData(preloadDataBuilder.build());
-			log.error("Returned FAILED for {} [{},{}] error code: '{}', Reason: '{}'", SVC_OPERATION, preload_name,
-					preload_type, errorCode, errorMessage);
-			try {
-				savePreloadList(preloadVnfListBuilder.build(), true, LogicalDatastoreType.CONFIGURATION);
-			} catch (Exception e) {
-				log.error("Caught Exception updating MD-SAL for {} [{},{}] \n", SVC_OPERATION, preload_name,
-						preload_type, e);
-			}
-			log.debug("Sending Success rpc result due to external error");
-			RpcResult<PreloadVnfTopologyOperationOutput> rpcResult = RpcResultBuilder
-					.<PreloadVnfTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
-			return Futures.immediateFuture(rpcResult);
-		}
-
-		// Got success from SLI
-		try {
-			preloadData = preloadDataBuilder.build();
-			log.info("Updating MD-SAL for {} [{},{}] preloadData: {}", SVC_OPERATION, preload_name, preload_type,
-					preloadData);
-			// svc-configuration-list
-			VnfPreloadListBuilder preloadVnfListBuilder = new VnfPreloadListBuilder();
-			preloadVnfListBuilder.setVnfName(preload_name);
-			preloadVnfListBuilder.setVnfType(preload_type);
-			preloadVnfListBuilder.setPreloadData(preloadData);
-
-			// merge flag sets to false to allow it to be overwritten (not appended)
-			savePreloadList(preloadVnfListBuilder.build(), false, LogicalDatastoreType.CONFIGURATION);
-			log.info("Updating OPERATIONAL tree.");
-			savePreloadList(preloadVnfListBuilder.build(), false, LogicalDatastoreType.OPERATIONAL);
-		} catch (Exception e) {
-			log.error("Caught Exception updating MD-SAL for {} [{},{}] \n", SVC_OPERATION, preload_name, preload_type,
-					e);
-			responseBuilder.setResponseCode("500");
-			responseBuilder.setResponseMessage(e.toString());
-			responseBuilder.setAckFinalIndicator("Y");
-			log.error("Returned FAILED for {} [{},{}] {}", SVC_OPERATION, preload_name, preload_type,
-					responseBuilder.build());
-			RpcResult<PreloadVnfTopologyOperationOutput> rpcResult = RpcResultBuilder
-					.<PreloadVnfTopologyOperationOutput>status(false).withResult(responseBuilder.build()).build();
-			return Futures.immediateFuture(rpcResult);
-		}
-
-		// Update succeeded
-		responseBuilder.setResponseCode(errorCode);
-		responseBuilder.setAckFinalIndicator(ackFinal);
-		if (errorMessage != null) {
-			responseBuilder.setResponseMessage(errorMessage);
-		}
-		log.info("Updated MD-SAL for {} [{},{}]", SVC_OPERATION, preload_name, preload_type);
-		log.info("Returned SUCCESS for {} [{},{}] {}", SVC_OPERATION, preload_name, preload_type,
-				responseBuilder.build());
-
-		RpcResult<PreloadVnfTopologyOperationOutput> rpcResult = RpcResultBuilder
-				.<PreloadVnfTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
-		return Futures.immediateFuture(rpcResult);
-	}
-
-	@Override
-	public Future<RpcResult<PreloadNetworkTopologyOperationOutput>> preloadNetworkTopologyOperation(
-			PreloadNetworkTopologyOperationInput input) {
-
-		final String SVC_OPERATION = "preload-network-topology-operation";
-		PreloadData preloadData;
-		Properties parms = new Properties();
-
-		log.info("{} called.", SVC_OPERATION);
-		// create a new response object
-		PreloadNetworkTopologyOperationOutputBuilder responseBuilder = new PreloadNetworkTopologyOperationOutputBuilder();
-
-		// Result from savePreloadData
-		final SettableFuture<RpcResult<Void>> futureResult = SettableFuture.create();
-
-		if (input == null || input.getNetworkTopologyInformation() == null
-				|| input.getNetworkTopologyInformation().getNetworkTopologyIdentifier() == null) {
-
-			log.debug("exiting {} because of null input", SVC_OPERATION);
-			responseBuilder.setResponseCode("403");
-			responseBuilder.setResponseMessage("input is null");
-			responseBuilder.setAckFinalIndicator("Y");
-			RpcResult<PreloadNetworkTopologyOperationOutput> rpcResult = RpcResultBuilder
-					.<PreloadNetworkTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
-			return Futures.immediateFuture(rpcResult);
-		}
-
-		// Grab the name and type from the input buffer
-		String preload_name = input.getNetworkTopologyInformation().getNetworkTopologyIdentifier().getNetworkName();
-		String preload_type = input.getNetworkTopologyInformation().getNetworkTopologyIdentifier().getNetworkType();
-
-		// Make sure we have a preload_name and preload_type
-		if (preload_name == null || preload_name.length() == 0 || preload_type == null || preload_type.length() == 0) {
-			log.debug("exiting {} because of invalid preload-name", SVC_OPERATION);
-			responseBuilder.setResponseCode("403");
-			responseBuilder.setResponseMessage("input, invalid preload-name");
-			responseBuilder.setAckFinalIndicator("Y");
-			RpcResult<PreloadNetworkTopologyOperationOutput> rpcResult = RpcResultBuilder
-					.<PreloadNetworkTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
-			return Futures.immediateFuture(rpcResult);
-		}
-
-		if (input.getSdncRequestHeader() != null) {
-			responseBuilder.setSvcRequestId(input.getSdncRequestHeader().getSvcRequestId());
-		}
-
-		PreloadDataBuilder preloadDataBuilder = new PreloadDataBuilder();
-		getPreloadData(preload_name, preload_type, preloadDataBuilder);
-
-		PreloadDataBuilder operDataBuilder = new PreloadDataBuilder();
-		getPreloadData(preload_name, preload_type, operDataBuilder, LogicalDatastoreType.OPERATIONAL);
-
-		//
-		// setup a preload-data object builder
-		// ACTION preload-network-topology-operation
-		// INPUT:
-		// USES sdnc-request-header;
-		// USES request-information;
-		// uses network-topology-information;
-		// OUTPUT:
-		// USES vnf-topology-response-body;
-		//
-		// container preload-data
-		// uses vnf-topology-information;
-		// uses network-topology-information;
-		// uses oper-status;
-
-		log.info("Adding INPUT data for {} [{},{}] input: {}", SVC_OPERATION, preload_name, preload_type, input);
-		PreloadNetworkTopologyOperationInputBuilder inputBuilder = new PreloadNetworkTopologyOperationInputBuilder(
-				input);
-		GenericResourceApiUtil.toProperties(parms, inputBuilder.build());
-		log.info("Adding OPERATIONAL data for {} [{},{}] operational-data: {}", SVC_OPERATION, preload_name,
-				preload_type, operDataBuilder.build());
-		GenericResourceApiUtil.toProperties(parms, "operational-data", operDataBuilder);
-
-		// Call SLI sync method
-		// Get SvcLogicService reference
-
-		Properties respProps = null;
-
-		String errorCode = "200";
-		String errorMessage = null;
-		String ackFinal = "Y";
-
-		try {
-			if (svcLogicClient.hasGraph(appName, SVC_OPERATION, null, "sync")) {
-
-				try {
-					respProps = svcLogicClient.execute(appName, SVC_OPERATION, null, "sync", preloadDataBuilder, parms);
-				} catch (Exception e) {
-					log.error("Caught exception executing service logic for {}", SVC_OPERATION, e);
-					errorMessage = e.getMessage();
-					errorCode = "500";
-				}
-			} else {
-				errorMessage = "No service logic active for " + appName + ": '" + SVC_OPERATION + "'";
-				errorCode = "503";
-			}
-		} catch (Exception e) {
-			errorCode = "500";
-			errorMessage = e.getMessage();
-			log.error("Caught exception looking for service logic", e);
-		}
-
-		if (respProps != null) {
-			errorCode = respProps.getProperty("error-code");
-			errorMessage = respProps.getProperty("error-message");
-			ackFinal = respProps.getProperty("ack-final", "Y");
-			// internalError = respProps.getProperty("internal-error", "false");
-		}
-
-		if (errorCode != null && errorCode.length() != 0 && !(errorCode.equals("0") || errorCode.equals("200"))) {
-
-			responseBuilder.setResponseCode(errorCode);
-			responseBuilder.setResponseMessage(errorMessage);
-			responseBuilder.setAckFinalIndicator(ackFinal);
-
-			VnfPreloadListBuilder preloadVnfListBuilder = new VnfPreloadListBuilder();
-			preloadVnfListBuilder.setVnfName(preload_name);
-			preloadVnfListBuilder.setVnfType(preload_type);
-			preloadVnfListBuilder.setPreloadData(preloadDataBuilder.build());
-			log.error("Returned FAILED for {} [{},{}] error code: '{}', Reason: '{}'", SVC_OPERATION, preload_name,
-					preload_type, errorCode, errorMessage);
-			try {
-				savePreloadList(preloadVnfListBuilder.build(), true, LogicalDatastoreType.CONFIGURATION);
-			} catch (Exception e) {
-				log.error("Caught Exception updating MD-SAL for {} [{},{}] \n", SVC_OPERATION, preload_name,
-						preload_type, e);
-
-			}
-			log.debug("Sending Success rpc result due to external error");
-			RpcResult<PreloadNetworkTopologyOperationOutput> rpcResult = RpcResultBuilder
-					.<PreloadNetworkTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
-			return Futures.immediateFuture(rpcResult);
-		}
-
-		// Got success from SLI
-		try {
-			preloadData = preloadDataBuilder.build();
-			log.info("Updating MD-SAL for {} [{},{}] preloadData: {}", SVC_OPERATION, preload_name, preload_type,
-					preloadData);
-			// svc-configuration-list
-			VnfPreloadListBuilder preloadVnfListBuilder = new VnfPreloadListBuilder();
-			preloadVnfListBuilder.setVnfName(preload_name);
-			preloadVnfListBuilder.setVnfType(preload_type);
-			preloadVnfListBuilder.setPreloadData(preloadData);
-
-			// merge flag sets to false to allow it to be overwritten (not appended)
-			savePreloadList(preloadVnfListBuilder.build(), false, LogicalDatastoreType.CONFIGURATION);
-			log.info("Updating OPERATIONAL tree.");
-			savePreloadList(preloadVnfListBuilder.build(), false, LogicalDatastoreType.OPERATIONAL);
-		} catch (Exception e) {
-			log.error("Caught Exception updating MD-SAL for " + SVC_OPERATION + " [" + preload_name + "," + preload_type
-					+ "] \n", e);
-			responseBuilder.setResponseCode("500");
-			responseBuilder.setResponseMessage(e.toString());
-			responseBuilder.setAckFinalIndicator("Y");
-			log.error("Returned FAILED for {} [{},{}] {}", SVC_OPERATION, preload_name, preload_type,
-					responseBuilder.build());
-			RpcResult<PreloadNetworkTopologyOperationOutput> rpcResult = RpcResultBuilder
-					.<PreloadNetworkTopologyOperationOutput>status(false).withResult(responseBuilder.build()).build();
-			return Futures.immediateFuture(rpcResult);
-		}
-
-		// Update succeeded
-		responseBuilder.setResponseCode(errorCode);
-		responseBuilder.setAckFinalIndicator(ackFinal);
-		if (errorMessage != null) {
-			responseBuilder.setResponseMessage(errorMessage);
-		}
-		log.info("Updated MD-SAL for {} [{},{}]", SVC_OPERATION, preload_name, preload_type);
-		log.info("Returned SUCCESS for {} [{},{}] {}", SVC_OPERATION, preload_name, preload_type,
-				responseBuilder.build());
-
-		RpcResult<PreloadNetworkTopologyOperationOutput> rpcResult = RpcResultBuilder
-				.<PreloadNetworkTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
-		return Futures.immediateFuture(rpcResult);
-	}
-
+    protected static final String APP_NAME = "generic-resource-api";
+    private static final String CALLED_STR = "{} called.";
+    private static final String NULL_OR_EMPTY_ERROR_MESSAGE = "exiting {} because of null or empty service-instance-id";
+    protected static final String NULL_OR_EMPTY_ERROR_PARAM = "invalid input, null or empty service-instance-id";
+    private static final String ADDING_INPUT_DATA_LOG = "Adding INPUT data for {} [{}] input: {}";
+    private static final String ADDING_OPERATIONAL_DATA_LOG = "Adding OPERATIONAL data for {} [{}] operational-data: {}";
+    private static final String OPERATIONAL_DATA_PARAM = "operational-data";
+    protected static final String NO_SERVICE_LOGIC_ACTIVE = "No service logic active for ";
+    private static final String SERVICE_LOGIC_SEARCH_ERROR_MESSAGE = "Caught exception looking for service logic";
+    private static final String ERROR_CODE_PARAM = "error-code";
+    private static final String ERROR_MESSAGE_PARAM = "error-message";
+    private static final String ACK_FINAL_PARAM = "ack-final";
+    private static final String SERVICE_OBJECT_PATH_PARAM = "service-object-path";
+    private static final String NETWORK_OBJECT_PATH_PARAM = "network-object-path";
+    private static final String VNF_OBJECT_PATH_PARAM = "vnf-object-path";
+    private static final String PNF_OBJECT_PATH_PARAM = "pnf-object-path";
+    private static final String VF_MODULE_OBJECT_PATH_PARAM = "vf-module-object-path";
+    private static final String VF_MODULE_ID_PARAM = "vf-module-id";
+    private static final String UPDATING_MDSAL_ERROR_MESSAGE = "Caught Exception updating MD-SAL for {} [{}] \n";
+    private static final String UPDATING_MDSAL_ERROR_MESSAGE_2 = "Caught Exception updating MD-SAL for {} [{},{}] \n";
+    private static final String RETURNED_FAILED_MESSAGE = "Returned FAILED for {} [{}] {}";
+    private static final String UPDATING_MDSAL_INFO_MESSAGE = "Updating MD-SAL for {} [{}] ServiceData: {}";
+    private static final String UPDATED_MDSAL_INFO_MESSAGE = "Updated MD-SAL for {} [{}]";
+    private static final String RETURNED_SUCCESS_MESSAGE = "Returned SUCCESS for {} [{}] {}";
+    private static final String NON_NULL_PARAM = "non-null";
+    private static final String NULL_PARAM = "null";
+    private static final String SERVICE_LOGIC_EXECUTION_ERROR_MESSAGE = "Caught exception executing service logic for {} ";
+    private static final String UPDATING_TREE_INFO_MESSAGE = "Updating OPERATIONAL tree.";
+    private static final String EMPTY_SERVICE_INSTANCE_MESSAGE = "exiting {} because the service-instance does not have any service data in SDNC";
+    protected static final String INVALID_INPUT_ERROR_MESSAGE = "invalid input: the service-instance does not have any service data in SDNC";
+    private static final String ALLOTTED_RESOURCE_ID_PARAM = "allotted-resource-id";
+    private static final String ERROR_NETWORK_ID = "error";
+    private static final String BACKGROUND_THREAD_STARTED_MESSAGE = "Start background thread";
+    private static final String BACKGROUND_THREAD_INFO = "Background thread: input conf_id is {}";
+
+    private final Logger log = LoggerFactory.getLogger(GenericResourceApiProvider.class);
+    private final ExecutorService executor;
+    private final GenericResourceApiSvcLogicServiceClient svcLogicClient;
+
+    protected DataBroker dataBroker;
+    protected NotificationPublishService notificationService;
+    protected RpcProviderRegistry rpcRegistry;
+    protected BindingAwareBroker.RpcRegistration<GENERICRESOURCEAPIService> rpcRegistration;
+
+    public GenericResourceApiProvider(DataBroker dataBroker, NotificationPublishService notificationPublishService,
+        RpcProviderRegistry rpcProviderRegistry, GenericResourceApiSvcLogicServiceClient client) {
+        log.info("Creating provider for {}", APP_NAME);
+        executor = Executors.newFixedThreadPool(1);
+        setDataBroker(dataBroker);
+        setNotificationService(notificationPublishService);
+        setRpcRegistry(rpcProviderRegistry);
+        svcLogicClient = client;
+        initialize();
+
+    }
+
+    public void initialize() {
+        log.info("Initializing provider for {}", APP_NAME);
+        // Create the top level containers
+        createContainers();
+        try {
+            GenericResourceApiUtil.loadProperties();
+        } catch (Exception e) {
+            log.error("Caught Exception while trying to load properties file", e);
+        }
+
+        log.info("Initialization complete for {}", APP_NAME);
+    }
+
+    protected void initializeChild() {
+        // Override if you have custom initialization intelligence
+    }
+
+    @Override
+    public void close() throws Exception {
+        log.info("Closing provider for {}", APP_NAME);
+        executor.shutdown();
+        rpcRegistration.close();
+        log.info("Successfully closed provider for {}", APP_NAME);
+    }
+
+    private static class Iso8601Util {
+
+        private static TimeZone timeZone = TimeZone.getTimeZone("UTC");
+        private static DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
+
+        private Iso8601Util() {
+        }
+
+        static {
+            dateFormat.setTimeZone(timeZone);
+        }
+
+        private static String now() {
+            return dateFormat.format(new Date());
+        }
+    }
+
+    public void setDataBroker(DataBroker dataBroker) {
+        this.dataBroker = dataBroker;
+        if (log.isDebugEnabled()) {
+            log.debug("DataBroker set to {}", dataBroker == null ? NULL_PARAM : NON_NULL_PARAM);
+        }
+    }
+
+    public void setNotificationService(NotificationPublishService notificationService) {
+        this.notificationService = notificationService;
+        if (log.isDebugEnabled()) {
+            log.debug("Notification Service set to {}", notificationService == null ? NULL_PARAM : NON_NULL_PARAM);
+        }
+    }
+
+    public void setRpcRegistry(RpcProviderRegistry rpcRegistry) {
+        this.rpcRegistry = rpcRegistry;
+        if (log.isDebugEnabled()) {
+            log.debug("RpcRegistry set to {}", rpcRegistry == null ? NULL_PARAM : NON_NULL_PARAM);
+        }
+    }
+
+    private void createContainers() {
+
+        final WriteTransaction t = dataBroker.newReadWriteTransaction();
+
+        // Create the service-instance container
+        t.merge(LogicalDatastoreType.CONFIGURATION, InstanceIdentifier.create(Services.class),
+            new ServicesBuilder().build());
+        t.merge(LogicalDatastoreType.OPERATIONAL, InstanceIdentifier.create(Services.class),
+            new ServicesBuilder().build());
+
+        // Create the PreloadInformation container
+        t.merge(LogicalDatastoreType.CONFIGURATION, InstanceIdentifier.create(PreloadInformation.class),
+            new PreloadInformationBuilder().build());
+        t.merge(LogicalDatastoreType.OPERATIONAL, InstanceIdentifier.create(PreloadInformation.class),
+            new PreloadInformationBuilder().build());
+
+        try {
+            CheckedFuture<Void, TransactionCommitFailedException> checkedFuture = t.submit();
+            checkedFuture.get();
+            log.info("Create containers succeeded!");
+
+        } catch (InterruptedException | ExecutionException e) {
+            log.error("Create containers failed: ", e);
+        }
+    }
+
+    private void setServiceStatus(ServiceStatusBuilder serviceStatusBuilder, String errorCode, String errorMessage,
+        String ackFinal) {
+        serviceStatusBuilder.setResponseCode(errorCode);
+        serviceStatusBuilder.setResponseMessage(errorMessage);
+        serviceStatusBuilder.setFinalIndicator(ackFinal);
+        serviceStatusBuilder.setResponseTimestamp(Iso8601Util.now());
+    }
+
+    private void setServiceStatus(ServiceStatusBuilder serviceStatusBuilder, RequestInformation requestInformation) {
+        if (requestInformation != null && requestInformation.getRequestAction() != null) {
+            serviceStatusBuilder.setAction(requestInformation.getRequestAction().toString());
+        }
+    }
+
+    private void setServiceStatus(ServiceStatusBuilder serviceStatusBuilder, SdncRequestHeader requestHeader) {
+        if (requestHeader != null && requestHeader.getSvcAction() != null) {
+            switch (requestHeader.getSvcAction()) {
+                case Assign:
+                    serviceStatusBuilder.setRpcAction(RpcAction.Assign);
+                    break;
+                case Unassign:
+                    serviceStatusBuilder.setRpcAction(RpcAction.Unassign);
+                    break;
+                case Activate:
+                    serviceStatusBuilder.setRpcAction(RpcAction.Activate);
+                    break;
+                case Deactivate:
+                    serviceStatusBuilder.setRpcAction(RpcAction.Deactivate);
+                    break;
+                case Delete:
+                    serviceStatusBuilder.setRpcAction(RpcAction.Delete);
+                    break;
+                case Create:
+                    serviceStatusBuilder.setRpcAction(RpcAction.Create);
+                    break;
+                default:
+                    log.error("Unknown SvcAction: {}", requestHeader.getSvcAction());
+                    break;
+            }
+        }
+    }
+
+    private void getServiceData(String siid, ServiceDataBuilder serviceDataBuilder) {
+        // default to config
+        getServiceData(siid, serviceDataBuilder, LogicalDatastoreType.CONFIGURATION);
+    }
+
+    private void getServiceData(String siid, ServiceDataBuilder serviceDataBuilder, LogicalDatastoreType type) {
+        // See if any data exists yet for this siid, if so grab it.
+        InstanceIdentifier<Service> serviceInstanceIdentifier = InstanceIdentifier.builder(Services.class)
+            .child(Service.class, new ServiceKey(siid)).build();
+
+        Optional<Service> data = Optional.absent();
+        try (final ReadOnlyTransaction readTx = dataBroker.newReadOnlyTransaction()) {
+            data = readTx.read(type, serviceInstanceIdentifier).get();
+        } catch (final InterruptedException | ExecutionException e) {
+            log.error("Caught Exception reading MD-SAL ({}) data for [{}] ", type, siid, e);
+        }
+
+        if (data != null && data.isPresent()) {
+            ServiceData serviceData = data.get().getServiceData();
+            if (serviceData != null) {
+                log.info("Read MD-SAL ({}) data for [{}] ServiceData: {}", type, siid, serviceData);
+                serviceDataBuilder.setSdncRequestHeader(serviceData.getSdncRequestHeader());
+                serviceDataBuilder.setRequestInformation(serviceData.getRequestInformation());
+                serviceDataBuilder.setServiceInformation(serviceData.getServiceInformation());
+                serviceDataBuilder.setServiceRequestInput(serviceData.getServiceRequestInput());
+                serviceDataBuilder.setServiceTopology(serviceData.getServiceTopology());
+                serviceDataBuilder.setServiceLevelOperStatus(serviceData.getServiceLevelOperStatus());
+                serviceDataBuilder.setNetworks(serviceData.getNetworks());
+                serviceDataBuilder.setVnfs(serviceData.getVnfs());
+                serviceDataBuilder.setProvidedAllottedResources(serviceData.getProvidedAllottedResources());
+                serviceDataBuilder.setConsumedAllottedResources(serviceData.getConsumedAllottedResources());
+                serviceDataBuilder.setNetworkInstanceGroups(serviceData.getNetworkInstanceGroups());
+                serviceDataBuilder.setVnfcInstanceGroups(serviceData.getVnfcInstanceGroups());
+                serviceDataBuilder.setForwardingPaths(serviceData.getForwardingPaths());
+                serviceDataBuilder.setProvidedConfigurations(serviceData.getProvidedConfigurations());
+                // service-instance-id needs to be set
+            } else {
+                log.info("No service-data found in MD-SAL ({}) for [{}]", type, siid);
+            }
+        } else {
+            log.info("No data found in MD-SAL ({}) for [{}]", type, siid);
+        }
+    }
+
+    private void saveService(final Service entry, boolean merge, LogicalDatastoreType storeType) {
+        // Each entry will be identifiable by a unique key, we have to create that
+        // identifier
+        InstanceIdentifier<Service> path = InstanceIdentifier.builder(Services.class)
+            .child(Service.class, entry.key()).build();
+
+        trySaveEntry(entry, merge, storeType, path);
+    }
+
+    private <T extends DataObject> void trySaveEntry(T entry, boolean merge, LogicalDatastoreType storeType,
+        InstanceIdentifier<T> path) {
+        int tries = 2;
+        while (true) {
+            try {
+                save(entry, merge, storeType, path);
+                break;
+            } catch (OptimisticLockFailedException e) {
+                if (--tries <= 0) {
+                    log.debug("Got OptimisticLockFailedException on last try - failing ");
+                    throw new IllegalStateException(e);
+                }
+                log.debug("Got OptimisticLockFailedException - trying again ");
+            } catch (TransactionCommitFailedException ex) {
+                log.debug("Update DataStore failed");
+                throw new IllegalStateException(ex);
+            }
+        }
+    }
+
+    private <T extends DataObject> void save(T entry, boolean merge, LogicalDatastoreType storeType,
+        InstanceIdentifier<T> path) throws TransactionCommitFailedException {
+        WriteTransaction tx = dataBroker.newWriteOnlyTransaction();
+        if (merge) {
+            tx.merge(storeType, path, entry);
+        } else {
+            tx.put(storeType, path, entry);
+        }
+        tx.submit().checkedGet();
+        log.debug("Update DataStore succeeded");
+    }
+
+    private void deleteService(final Service entry, LogicalDatastoreType storeType) {
+        // Each entry will be identifiable by a unique key, we have to create
+        // that identifier
+        InstanceIdentifier<Service> path = InstanceIdentifier.builder(Services.class)
+            .child(Service.class, entry.key()).build();
+
+        tryDeleteEntry(storeType, path);
+    }
+
+    private void tryDeleteEntry(LogicalDatastoreType storeType, InstanceIdentifier<Service> path) {
+        int tries = 2;
+        while (true) {
+            try {
+                delete(storeType, path);
+                break;
+            } catch (OptimisticLockFailedException e) {
+                if (--tries <= 0) {
+                    log.debug("Got OptimisticLockFailedException on last try - failing ");
+                    throw new IllegalStateException(e);
+                }
+                log.debug("Got OptimisticLockFailedException - trying again ");
+            } catch (TransactionCommitFailedException ex) {
+                log.debug("Update DataStore failed");
+                throw new IllegalStateException(ex);
+            }
+        }
+    }
+
+    private void delete(LogicalDatastoreType storeType, InstanceIdentifier<Service> path)
+        throws TransactionCommitFailedException {
+        WriteTransaction tx = dataBroker.newWriteOnlyTransaction();
+        tx.delete(storeType, path);
+        tx.submit().checkedGet();
+        log.debug("DataStore delete succeeded");
+    }
+
+    private void getPreloadData(String vnf_name, String vnf_type, PreloadDataBuilder preloadDataBuilder) {
+        // default to config
+        getPreloadData(vnf_name, vnf_type, preloadDataBuilder, LogicalDatastoreType.CONFIGURATION);
+    }
+
+    private void getPreloadData(String preloadName, String preloadType, PreloadDataBuilder preloadDataBuilder,
+        LogicalDatastoreType type) {
+        // See if any data exists yet for this name/type, if so grab it.
+        InstanceIdentifier preloadInstanceIdentifier = InstanceIdentifier
+            .<PreloadInformation>builder(PreloadInformation.class)
+            .child(PreloadList.class, new PreloadListKey(preloadName, preloadType)).build();
+
+        Optional<PreloadList> data = null;
+        try (final ReadOnlyTransaction readTx = dataBroker.newReadOnlyTransaction()) {
+            data = (Optional<PreloadList>) readTx.read(type, preloadInstanceIdentifier).get();
+        } catch (final InterruptedException | ExecutionException e) {
+            log.error("Caught Exception reading MD-SAL ({}) for [{},{}] ", type, preloadName, preloadType, e);
+        }
+
+        if (data != null && data.isPresent()) {
+            PreloadData preloadData = data.get().getPreloadData();
+            if (preloadData != null) {
+                log.info("Read MD-SAL ({}) data for [{},{}] PreloadData: {}", type, preloadName, preloadType,
+                    preloadData);
+                preloadDataBuilder
+                    .setPreloadVfModuleTopologyInformation(preloadData.getPreloadVfModuleTopologyInformation());
+                preloadDataBuilder
+                    .setPreloadNetworkTopologyInformation(preloadData.getPreloadNetworkTopologyInformation());
+                preloadDataBuilder.setPreloadOperStatus(preloadData.getPreloadOperStatus());
+            } else {
+                log.info("No preload-data found in MD-SAL ({}) for [{},{}] ", type, preloadName, preloadType);
+            }
+        } else {
+            log.info("No data found in MD-SAL ({}) for [{},{}] ", type, preloadName, preloadType);
+        }
+    }
+
+    private void savePreloadList(final PreloadList entry, boolean merge, LogicalDatastoreType storeType)
+        throws IllegalStateException {
+
+        // Each entry will be identifiable by a unique key, we have to create that
+        // identifier
+        InstanceIdentifier.InstanceIdentifierBuilder<PreloadList> preloadListBuilder = InstanceIdentifier
+            .<PreloadInformation>builder(PreloadInformation.class).child(PreloadList.class, entry.key());
+        InstanceIdentifier<PreloadList> path = preloadListBuilder.build();
+        int tries = 2;
+        while (true) {
+            try {
+                WriteTransaction tx = dataBroker.newWriteOnlyTransaction();
+                if (merge) {
+                    tx.merge(storeType, path, entry);
+                } else {
+                    tx.put(storeType, path, entry);
+                }
+                tx.submit().checkedGet();
+                log.debug("Update DataStore succeeded");
+                break;
+            } catch (final TransactionCommitFailedException e) {
+                if (e instanceof OptimisticLockFailedException) {
+                    if (--tries <= 0) {
+                        log.debug("Got OptimisticLockFailedException on last try - failing ");
+                        throw new IllegalStateException(e);
+                    }
+                    log.debug("Got OptimisticLockFailedException - trying again ");
+                } else {
+                    log.debug("Update DataStore failed");
+                    throw new IllegalStateException(e);
+                }
+            }
+        }
+    }
+
+    private void deletePreloadList(final PreloadList entry, LogicalDatastoreType storeType) {
+        // Each entry will be identifiable by a unique key, we have to create
+        // that identifier
+        InstanceIdentifier<PreloadList> path = InstanceIdentifier.builder(PreloadInformation.class)
+            .child(PreloadList.class, entry.key()).build();
+
+        tryDeletePreloadListEntry(storeType, path);
+    }
+
+    private void tryDeletePreloadListEntry(LogicalDatastoreType storeType, InstanceIdentifier<PreloadList> path) {
+        int tries = 2;
+        while (true) {
+            try {
+                deletePreloadList(storeType, path);
+                break;
+            } catch (OptimisticLockFailedException e) {
+                if (--tries <= 0) {
+                    log.debug("Got OptimisticLockFailedException on last try - failing ");
+                    throw new IllegalStateException(e);
+                }
+                log.debug("Got OptimisticLockFailedException - trying again ");
+            } catch (TransactionCommitFailedException ex) {
+                log.debug("Update DataStore failed");
+                throw new IllegalStateException(ex);
+            }
+        }
+    }
+
+    private void deletePreloadList(LogicalDatastoreType storeType, InstanceIdentifier<PreloadList> path)
+        throws TransactionCommitFailedException {
+        WriteTransaction tx = dataBroker.newWriteOnlyTransaction();
+        tx.delete(storeType, path);
+        tx.submit().checkedGet();
+        log.debug("DataStore delete succeeded");
+    }
+
+    @Override
+    public ListenableFuture<RpcResult<ServiceTopologyOperationOutput>> serviceTopologyOperation(
+        ServiceTopologyOperationInput input) {
+
+        final String svcOperation = "service-topology-operation";
+        ServiceData serviceData;
+        ServiceStatusBuilder serviceStatusBuilder = new ServiceStatusBuilder();
+        Properties parms = new Properties();
+
+        log.info(CALLED_STR, svcOperation);
+        // create a new response object
+        ServiceTopologyOperationOutputBuilder responseBuilder = new ServiceTopologyOperationOutputBuilder();
+
+        if (hasInvalidServiceId(input)) {
+            log.debug(NULL_OR_EMPTY_ERROR_MESSAGE, svcOperation);
+            responseBuilder.setResponseCode("404");
+            responseBuilder.setResponseMessage(NULL_OR_EMPTY_ERROR_PARAM);
+            responseBuilder.setAckFinalIndicator("Y");
+
+            RpcResult<ServiceTopologyOperationOutput> rpcResult = RpcResultBuilder
+                .<ServiceTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
+
+            return Futures.immediateFuture(rpcResult);
+        }
+
+        // Grab the service instance ID from the input buffer
+        String siid = input.getServiceInformation().getServiceInstanceId();
+
+        trySetSvcRequestId(input, responseBuilder);
+
+        ServiceDataBuilder serviceDataBuilder = new ServiceDataBuilder();
+        getServiceData(siid, serviceDataBuilder);
+
+        ServiceDataBuilder operDataBuilder = new ServiceDataBuilder();
+        getServiceData(siid, operDataBuilder, LogicalDatastoreType.OPERATIONAL);
+
+        // Set the serviceStatus based on input
+        setServiceStatus(serviceStatusBuilder, input.getSdncRequestHeader());
+        setServiceStatus(serviceStatusBuilder, input.getRequestInformation());
+
+        /*
+         * // setup a service-data object builder // ACTION service-topology-operation
+         * // INPUT: // USES uses service-operation-information // OUTPUT: // uses
+         * topology-response-common; // uses service-response-information;
+         */
+
+        log.info(ADDING_INPUT_DATA_LOG, svcOperation, siid, input);
+        ServiceTopologyOperationInputBuilder inputBuilder = new ServiceTopologyOperationInputBuilder(input);
+        GenericResourceApiUtil.toProperties(parms, inputBuilder.build());
+
+        log.info(ADDING_OPERATIONAL_DATA_LOG, svcOperation, siid, operDataBuilder.build());
+        GenericResourceApiUtil.toProperties(parms, OPERATIONAL_DATA_PARAM, operDataBuilder);
+
+        // Call SLI sync method
+        ResponseObject responseObject = new ResponseObject("200", "");
+        String ackFinal = "Y";
+        String serviceObjectPath = null;
+        Properties respProps = tryGetProperties(svcOperation, parms, serviceDataBuilder, responseObject);
+
+        if (respProps != null) {
+            responseObject.setStatusCode(respProps.getProperty(ERROR_CODE_PARAM));
+            responseObject.setMessage(respProps.getProperty(ERROR_MESSAGE_PARAM));
+            ackFinal = respProps.getProperty(ACK_FINAL_PARAM, "Y");
+            serviceObjectPath = respProps.getProperty(SERVICE_OBJECT_PATH_PARAM);
+        }
+
+        setServiceStatus(serviceStatusBuilder, responseObject.getStatusCode(), responseObject.getMessage(), ackFinal);
+        serviceStatusBuilder.setRequestStatus(RequestStatus.Synccomplete);
+        serviceStatusBuilder.setRpcName(svcOperation);
+
+        if (failed(responseObject)) {
+            responseBuilder.setResponseCode(responseObject.getStatusCode());
+            responseBuilder.setResponseMessage(responseObject.getMessage());
+            responseBuilder.setAckFinalIndicator(ackFinal);
+
+            ServiceBuilder serviceBuilder = new ServiceBuilder();
+            serviceBuilder.setServiceInstanceId(siid);
+            serviceBuilder.setServiceStatus(serviceStatusBuilder.build());
+            try {
+                saveService(serviceBuilder.build(), true, LogicalDatastoreType.CONFIGURATION);
+            } catch (Exception e) {
+                log.error(UPDATING_MDSAL_ERROR_MESSAGE, svcOperation, siid, e);
+            }
+            log.error(RETURNED_FAILED_MESSAGE, svcOperation, siid, responseBuilder.build());
+
+            RpcResult<ServiceTopologyOperationOutput> rpcResult = RpcResultBuilder
+                .<ServiceTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
+
+            return Futures.immediateFuture(rpcResult);
+        }
+
+        // Got success from SLI
+        try {
+            serviceData = serviceDataBuilder.build();
+            log.info(UPDATING_MDSAL_INFO_MESSAGE, svcOperation, siid, serviceData);
+
+            // service object
+            ServiceBuilder serviceBuilder = new ServiceBuilder();
+            serviceBuilder.setServiceData(serviceData);
+            serviceBuilder.setServiceInstanceId(siid);
+            serviceBuilder.setServiceStatus(serviceStatusBuilder.build());
+            saveService(serviceBuilder.build(), false, LogicalDatastoreType.CONFIGURATION);
+
+            tryDeleteService(input, serviceBuilder);
+
+            ServiceResponseInformationBuilder serviceResponseInformationBuilder = new ServiceResponseInformationBuilder();
+            serviceResponseInformationBuilder.setInstanceId(siid);
+            serviceResponseInformationBuilder.setObjectPath(serviceObjectPath);
+            responseBuilder.setServiceResponseInformation(serviceResponseInformationBuilder.build());
+
+        } catch (Exception e) {
+            log.error(UPDATING_MDSAL_ERROR_MESSAGE, svcOperation, siid, e);
+            responseBuilder.setResponseCode("500");
+            responseBuilder.setResponseMessage(e.getMessage());
+            responseBuilder.setAckFinalIndicator("Y");
+            log.error(RETURNED_FAILED_MESSAGE, svcOperation, siid, responseBuilder.build());
+
+            RpcResult<ServiceTopologyOperationOutput> rpcResult = RpcResultBuilder
+                .<ServiceTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
+
+            return Futures.immediateFuture(rpcResult);
+        }
+
+        // Update succeeded
+        responseBuilder.setResponseCode(responseObject.getStatusCode());
+        responseBuilder.setAckFinalIndicator(ackFinal);
+        trySetResponseMessage(responseBuilder, responseObject);
+        log.info(UPDATED_MDSAL_INFO_MESSAGE, svcOperation, siid);
+        log.info(RETURNED_SUCCESS_MESSAGE, svcOperation, siid, responseBuilder.build());
+
+        RpcResult<ServiceTopologyOperationOutput> rpcResult = RpcResultBuilder
+            .<ServiceTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
+
+        return Futures.immediateFuture(rpcResult);
+    }
+
+    private void trySetResponseMessage(ServiceTopologyOperationOutputBuilder responseBuilder,
+        ResponseObject responseObject) {
+        if (responseObject.getMessage() != null) {
+            responseBuilder.setResponseMessage(responseObject.getMessage());
+        }
+    }
+
+    private boolean hasInvalidServiceId(ServiceTopologyOperationInput input) {
+        return input == null || input.getServiceInformation() == null
+            || input.getServiceInformation().getServiceInstanceId() == null
+            || input.getServiceInformation().getServiceInstanceId().length() == 0;
+    }
+
+    private void trySetSvcRequestId(ServiceTopologyOperationInput input,
+        ServiceTopologyOperationOutputBuilder responseBuilder) {
+        if (input.getSdncRequestHeader() != null) {
+            responseBuilder.setSvcRequestId(input.getSdncRequestHeader().getSvcRequestId());
+        }
+    }
+
+    private void tryDeleteService(ServiceTopologyOperationInput input, ServiceBuilder serviceBuilder) {
+        if (isValidRequest(input) && input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Delete)) {
+            // Only update operational tree on delete
+            log.info("Delete from both CONFIGURATION and OPERATIONAL tree.");
+            deleteService(serviceBuilder.build(), LogicalDatastoreType.OPERATIONAL);
+            deleteService(serviceBuilder.build(), LogicalDatastoreType.CONFIGURATION);
+        }
+    }
+
+    private Properties tryGetProperties(String svcOperation, Properties parms, ServiceDataBuilder serviceDataBuilder,
+        ResponseObject responseObject) {
+        try {
+            if (svcLogicClient.hasGraph(APP_NAME, svcOperation, null, "sync")) {
+                try {
+                    return svcLogicClient.execute(APP_NAME, svcOperation, null, "sync", serviceDataBuilder, parms);
+                } catch (Exception e) {
+                    log.error(SERVICE_LOGIC_EXECUTION_ERROR_MESSAGE, svcOperation, e);
+                    responseObject.setMessage(e.getMessage());
+                    responseObject.setStatusCode("500");
+                }
+            } else {
+                responseObject.setMessage(NO_SERVICE_LOGIC_ACTIVE + APP_NAME + ": '" + svcOperation + "'");
+                responseObject.setStatusCode("503");
+            }
+        } catch (Exception e) {
+            responseObject.setMessage(e.getMessage());
+            responseObject.setStatusCode("500");
+            log.error(SERVICE_LOGIC_SEARCH_ERROR_MESSAGE, e);
+        }
+
+        return null;
+    }
+
+    private boolean failed(ResponseObject error) {
+        return !error.getStatusCode().isEmpty()
+            && !("0".equals(error.getStatusCode()) || "200".equals(error.getStatusCode()));
+    }
+
+    private boolean isValidRequest(ServiceTopologyOperationInput input) {
+        return input.getSdncRequestHeader() != null && input.getSdncRequestHeader().getSvcAction() != null;
+    }
+
+
+    @Override
+    public ListenableFuture<RpcResult<PnfTopologyOperationOutput>> pnfTopologyOperation(
+        PnfTopologyOperationInput input) {
+
+        final String svcOperation = "pnf-topology-operation";
+        ServiceData serviceData;
+        ServiceStatusBuilder serviceStatusBuilder = new ServiceStatusBuilder();
+        Properties properties = new Properties();
+
+        log.info(CALLED_STR, svcOperation);
+        // create a new response object
+        PnfTopologyOperationOutputBuilder responseBuilder = new PnfTopologyOperationOutputBuilder();
+
+        if (hasInvalidServiceId(input)) {
+            log.debug(NULL_OR_EMPTY_ERROR_MESSAGE, svcOperation);
+            responseBuilder.setResponseCode("404");
+            responseBuilder.setResponseMessage(NULL_OR_EMPTY_ERROR_PARAM);
+            responseBuilder.setAckFinalIndicator("Y");
+            RpcResult<PnfTopologyOperationOutput> rpcResult = RpcResultBuilder.<PnfTopologyOperationOutput>status(true)
+                .withResult(responseBuilder.build()).build();
+            // return error
+            return Futures.immediateFuture(rpcResult);
+        }
+
+        // Grab the service instance ID from the input buffer
+        String siid = input.getServiceInformation().getServiceInstanceId();
+
+        trySetSvcRequestId(input, responseBuilder);
+
+        /* Comment out mandatory check for pnf id for scenario wherein for assign/create request pnf-id is generated by
+        SDNC itself.
+        if (hasInvalidPnfId(input)) {
+            log.debug("exiting {} because of null or empty pnf-id", svcOperation);
+            responseBuilder.setResponseCode("404");
+            responseBuilder.setResponseMessage("invalid input, null or empty pnf-id");
+            responseBuilder.setAckFinalIndicator("Y");
+
+            RpcResult<PnfTopologyOperationOutput> rpcResult = RpcResultBuilder.<PnfTopologyOperationOutput>status(true)
+                    .withResult(responseBuilder.build()).build();
+
+            return Futures.immediateFuture(rpcResult);
+        }
+        */
+
+        String pnfId = input.getPnfDetails().getPnfId();
+        ServiceDataBuilder serviceDataBuilder = new ServiceDataBuilder();
+        getServiceData(siid, serviceDataBuilder);
+
+        ServiceDataBuilder operDataBuilder = new ServiceDataBuilder();
+        getServiceData(siid, operDataBuilder, LogicalDatastoreType.OPERATIONAL);
+
+        // Set the serviceStatus based on input
+        setServiceStatus(serviceStatusBuilder, input.getSdncRequestHeader());
+        setServiceStatus(serviceStatusBuilder, input.getRequestInformation());
+
+        //
+        // setup a service-data object builder
+        // ACTION pnf-topology-operation
+        // INPUT:
+        // USES sdnc-request-header;
+        // USES request-information;
+        // USES service-information;
+        // USES pnf-details
+        // OUTPUT:
+        // USES pnf-topology-response-body;
+        // USES pnf-details
+        // USES service-information
+        //
+        // uses oper-status;
+
+        log.info(ADDING_INPUT_DATA_LOG, svcOperation, siid, input);
+        PnfTopologyOperationInputBuilder inputBuilder = new PnfTopologyOperationInputBuilder(input);
+        GenericResourceApiUtil.toProperties(properties, inputBuilder.build());
+
+        log.info(ADDING_OPERATIONAL_DATA_LOG, svcOperation, siid, operDataBuilder.build());
+        GenericResourceApiUtil.toProperties(properties, OPERATIONAL_DATA_PARAM, operDataBuilder);
+
+        // Call SLI sync method
+
+        ResponseObject responseObject = new ResponseObject("200", "");
+        String ackFinal = "Y";
+        String serviceObjectPath = null;
+        String pnfObjectPath = null;
+        Properties respProps = tryGetProperties(svcOperation, properties, serviceDataBuilder, responseObject);
+
+        if (respProps != null) {
+            responseObject.setMessage(respProps.getProperty(ERROR_MESSAGE_PARAM));
+            responseObject.setStatusCode(respProps.getProperty(ERROR_CODE_PARAM));
+            ackFinal = respProps.getProperty(ACK_FINAL_PARAM, "Y");
+            if (pnfId == null) {
+                pnfId = respProps.getProperty("pnfId");
+            }
+            serviceObjectPath = respProps.getProperty(SERVICE_OBJECT_PATH_PARAM);
+            pnfObjectPath = respProps.getProperty(PNF_OBJECT_PATH_PARAM);
+        }
+
+        setServiceStatus(serviceStatusBuilder, responseObject.getStatusCode(), responseObject.getMessage(), ackFinal);
+        serviceStatusBuilder.setRequestStatus(RequestStatus.Synccomplete);
+        serviceStatusBuilder.setRpcName(svcOperation);
+
+        if (failed(responseObject)) {
+            responseBuilder.setResponseCode(responseObject.getStatusCode());
+            responseBuilder.setResponseMessage(responseObject.getMessage());
+            responseBuilder.setAckFinalIndicator(ackFinal);
+
+            ServiceBuilder serviceBuilder = new ServiceBuilder();
+            serviceBuilder.setServiceInstanceId(siid);
+            serviceBuilder.setServiceStatus(serviceStatusBuilder.build());
+            try {
+                saveService(serviceBuilder.build(), true, LogicalDatastoreType.CONFIGURATION);
+                trySaveService(input, serviceBuilder);
+            } catch (Exception e) {
+                log.error(UPDATING_MDSAL_ERROR_MESSAGE, svcOperation, siid, e);
+            }
+            log.error(RETURNED_FAILED_MESSAGE, svcOperation, siid, responseBuilder.build());
+
+            RpcResult<PnfTopologyOperationOutput> rpcResult = RpcResultBuilder.<PnfTopologyOperationOutput>status(true)
+                .withResult(responseBuilder.build()).build();
+
+            // return error
+            return Futures.immediateFuture(rpcResult);
+        }
+
+        // Got success from SLI
+        try {
+            serviceData = serviceDataBuilder.build();
+            log.info(UPDATING_MDSAL_INFO_MESSAGE, svcOperation, siid, serviceData);
+
+            // service object
+            ServiceBuilder serviceBuilder = new ServiceBuilder();
+            serviceBuilder.setServiceData(serviceData);
+            serviceBuilder.setServiceInstanceId(siid);
+            serviceBuilder.setServiceStatus(serviceStatusBuilder.build());
+            saveService(serviceBuilder.build(), false, LogicalDatastoreType.CONFIGURATION);
+
+            if (isValidRequest(input) && input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Activate)) {
+                // Only update operational tree on Assign
+                log.info(UPDATING_TREE_INFO_MESSAGE);
+                saveService(serviceBuilder.build(), false, LogicalDatastoreType.OPERATIONAL);
+            }
+
+            ServiceResponseInformationBuilder serviceResponseInformationBuilder = new ServiceResponseInformationBuilder();
+            serviceResponseInformationBuilder.setInstanceId(siid);
+            serviceResponseInformationBuilder.setObjectPath(serviceObjectPath);
+            responseBuilder.setServiceResponseInformation(serviceResponseInformationBuilder.build());
+
+            PnfResponseInformationBuilder pnfResponseInformationBuilder = new PnfResponseInformationBuilder();
+            pnfResponseInformationBuilder.setInstanceId(pnfId);
+            pnfResponseInformationBuilder.setObjectPath(pnfObjectPath);
+            responseBuilder.setPnfResponseInformation(pnfResponseInformationBuilder.build());
+
+        } catch (Exception e) {
+            log.error(UPDATING_MDSAL_ERROR_MESSAGE, svcOperation, siid, e);
+            responseBuilder.setResponseCode("500");
+            responseBuilder.setResponseMessage(e.getMessage());
+            responseBuilder.setAckFinalIndicator("Y");
+            log.error(RETURNED_FAILED_MESSAGE, svcOperation, siid, responseBuilder.build());
+
+            RpcResult<PnfTopologyOperationOutput> rpcResult = RpcResultBuilder.<PnfTopologyOperationOutput>status(true)
+                .withResult(responseBuilder.build()).build();
+
+            return Futures.immediateFuture(rpcResult);
+        }
+
+        // Update succeeded
+        responseBuilder.setResponseCode(responseObject.getStatusCode());
+        responseBuilder.setAckFinalIndicator(ackFinal);
+        trySetResponseMessage(responseBuilder, responseObject);
+        log.info(UPDATED_MDSAL_INFO_MESSAGE, svcOperation, siid);
+        log.info(RETURNED_SUCCESS_MESSAGE, svcOperation, siid, responseBuilder.build());
+
+        RpcResult<PnfTopologyOperationOutput> rpcResult = RpcResultBuilder.<PnfTopologyOperationOutput>status(true)
+            .withResult(responseBuilder.build()).build();
+
+        // return success
+        return Futures.immediateFuture(rpcResult);
+    }
+
+    private void trySetResponseMessage(PnfTopologyOperationOutputBuilder responseBuilder,
+        ResponseObject responseObject) {
+        if (responseObject.getMessage() != null) {
+            responseBuilder.setResponseMessage(responseObject.getMessage());
+        }
+    }
+
+    private void trySaveService(PnfTopologyOperationInput input, ServiceBuilder serviceBuilder) {
+        if (isValidRequest(input) && (input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Delete)
+            || input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Activate))) {
+
+            // Only update operational tree on activate or delete
+            log.info(UPDATING_TREE_INFO_MESSAGE);
+            saveService(serviceBuilder.build(), false, LogicalDatastoreType.OPERATIONAL);
+        }
+    }
+
+    private boolean hasInvalidPnfId(PnfTopologyOperationInput input) {
+        return input.getPnfDetails() == null || input.getPnfDetails().getPnfId() == null
+            || input.getPnfDetails().getPnfId().length() == 0;
+    }
+
+    private boolean hasInvalidServiceId(PnfTopologyOperationInput input) {
+        return input == null || input.getServiceInformation() == null
+            || input.getServiceInformation().getServiceInstanceId() == null
+            || input.getServiceInformation().getServiceInstanceId().length() == 0;
+    }
+
+    private void trySetSvcRequestId(PnfTopologyOperationInput input,
+        PnfTopologyOperationOutputBuilder responseBuilder) {
+        if (input.getSdncRequestHeader() != null) {
+            responseBuilder.setSvcRequestId(input.getSdncRequestHeader().getSvcRequestId());
+        }
+    }
+
+    private boolean isValidRequest(PnfTopologyOperationInput input) {
+        return input.getSdncRequestHeader() != null && input.getSdncRequestHeader().getSvcAction() != null;
+    }
+
+
+    @Override
+    public ListenableFuture<RpcResult<VnfTopologyOperationOutput>> vnfTopologyOperation(
+        VnfTopologyOperationInput input) {
+
+        final String svcOperation = "vnf-topology-operation";
+        ServiceData serviceData;
+        ServiceStatusBuilder serviceStatusBuilder = new ServiceStatusBuilder();
+        Properties properties = new Properties();
+
+        log.info(CALLED_STR, svcOperation);
+        // create a new response object
+        VnfTopologyOperationOutputBuilder responseBuilder = new VnfTopologyOperationOutputBuilder();
+
+        if (hasInvalidServiceId(input)) {
+            log.debug(NULL_OR_EMPTY_ERROR_MESSAGE, svcOperation);
+            responseBuilder.setResponseCode("404");
+            responseBuilder.setResponseMessage(NULL_OR_EMPTY_ERROR_PARAM);
+            responseBuilder.setAckFinalIndicator("Y");
+            RpcResult<VnfTopologyOperationOutput> rpcResult = RpcResultBuilder.<VnfTopologyOperationOutput>status(true)
+                .withResult(responseBuilder.build()).build();
+            // return error
+            return Futures.immediateFuture(rpcResult);
+        }
+
+        // Grab the service instance ID from the input buffer
+        String siid = input.getServiceInformation().getServiceInstanceId();
+
+        trySetSvcRequestId(input, responseBuilder);
+
+        /* Comment out mandatory check for vnf id for scenario wherein for assign/create request vnf-id is generated by
+        SDNC itself.
+        if (hasInvalidVnfId(input)) {
+            log.debug("exiting {} because of null or empty vnf-id", svcOperation);
+            responseBuilder.setResponseCode("404");
+            responseBuilder.setResponseMessage("invalid input, null or empty vnf-id");
+            responseBuilder.setAckFinalIndicator("Y");
+
+            RpcResult<VnfTopologyOperationOutput> rpcResult = RpcResultBuilder.<VnfTopologyOperationOutput>status(true)
+                    .withResult(responseBuilder.build()).build();
+
+            return Futures.immediateFuture(rpcResult);
+        }
+        */
+
+        String vnfId = input.getVnfInformation().getVnfId();
+        ServiceDataBuilder serviceDataBuilder = new ServiceDataBuilder();
+        getServiceData(siid, serviceDataBuilder);
+
+        ServiceDataBuilder operDataBuilder = new ServiceDataBuilder();
+        getServiceData(siid, operDataBuilder, LogicalDatastoreType.OPERATIONAL);
+
+        // Set the serviceStatus based on input
+        setServiceStatus(serviceStatusBuilder, input.getSdncRequestHeader());
+        setServiceStatus(serviceStatusBuilder, input.getRequestInformation());
+
+        //
+        // setup a service-data object builder
+        // ACTION vnf-topology-operation
+        // INPUT:
+        // USES sdnc-request-header;
+        // USES request-information;
+        // USES service-information;
+        // USES vnf-request-information
+        // OUTPUT:
+        // USES vnf-topology-response-body;
+        // USES vnf-information
+        // USES service-information
+        //
+        // container service-data
+        // uses vnf-configuration-information;
+        // uses oper-status;
+
+        log.info(ADDING_INPUT_DATA_LOG, svcOperation, siid, input);
+        VnfTopologyOperationInputBuilder inputBuilder = new VnfTopologyOperationInputBuilder(input);
+        GenericResourceApiUtil.toProperties(properties, inputBuilder.build());
+
+        log.info(ADDING_OPERATIONAL_DATA_LOG, svcOperation, siid, operDataBuilder.build());
+        GenericResourceApiUtil.toProperties(properties, OPERATIONAL_DATA_PARAM, operDataBuilder);
+
+        // Call SLI sync method
+
+        ResponseObject responseObject = new ResponseObject("200", "");
+        String ackFinal = "Y";
+        String serviceObjectPath = null;
+        String vnfObjectPath = null;
+        Properties respProps = tryGetProperties(svcOperation, properties, serviceDataBuilder, responseObject);
+
+        if (respProps != null) {
+            responseObject.setMessage(respProps.getProperty(ERROR_MESSAGE_PARAM));
+            responseObject.setStatusCode(respProps.getProperty(ERROR_CODE_PARAM));
+            ackFinal = respProps.getProperty(ACK_FINAL_PARAM, "Y");
+            if (vnfId == null) {
+                vnfId = respProps.getProperty("vnfId");
+            }
+            serviceObjectPath = respProps.getProperty(SERVICE_OBJECT_PATH_PARAM);
+            vnfObjectPath = respProps.getProperty(VNF_OBJECT_PATH_PARAM);
+        }
+
+        setServiceStatus(serviceStatusBuilder, responseObject.getStatusCode(), responseObject.getMessage(), ackFinal);
+        serviceStatusBuilder.setRequestStatus(RequestStatus.Synccomplete);
+        serviceStatusBuilder.setRpcName(svcOperation);
+
+        if (failed(responseObject)) {
+            responseBuilder.setResponseCode(responseObject.getStatusCode());
+            responseBuilder.setResponseMessage(responseObject.getMessage());
+            responseBuilder.setAckFinalIndicator(ackFinal);
+
+            ServiceBuilder serviceBuilder = new ServiceBuilder();
+            serviceBuilder.setServiceInstanceId(siid);
+            serviceBuilder.setServiceStatus(serviceStatusBuilder.build());
+            try {
+                saveService(serviceBuilder.build(), true, LogicalDatastoreType.CONFIGURATION);
+                trySaveService(input, serviceBuilder);
+            } catch (Exception e) {
+                log.error(UPDATING_MDSAL_ERROR_MESSAGE, svcOperation, siid, e);
+            }
+            log.error(RETURNED_FAILED_MESSAGE, svcOperation, siid, responseBuilder.build());
+
+            RpcResult<VnfTopologyOperationOutput> rpcResult = RpcResultBuilder.<VnfTopologyOperationOutput>status(true)
+                .withResult(responseBuilder.build()).build();
+
+            // return error
+            return Futures.immediateFuture(rpcResult);
+        }
+
+        // Got success from SLI
+        try {
+            serviceData = serviceDataBuilder.build();
+            log.info(UPDATING_MDSAL_INFO_MESSAGE, svcOperation, siid, serviceData);
+
+            // service object
+            ServiceBuilder serviceBuilder = new ServiceBuilder();
+            serviceBuilder.setServiceData(serviceData);
+            serviceBuilder.setServiceInstanceId(siid);
+            serviceBuilder.setServiceStatus(serviceStatusBuilder.build());
+            saveService(serviceBuilder.build(), false, LogicalDatastoreType.CONFIGURATION);
+
+            if (isValidRequest(input) && input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Activate)) {
+                // Only update operational tree on Assign
+                log.info(UPDATING_TREE_INFO_MESSAGE);
+                saveService(serviceBuilder.build(), false, LogicalDatastoreType.OPERATIONAL);
+            }
+
+            ServiceResponseInformationBuilder serviceResponseInformationBuilder = new ServiceResponseInformationBuilder();
+            serviceResponseInformationBuilder.setInstanceId(siid);
+            serviceResponseInformationBuilder.setObjectPath(serviceObjectPath);
+            responseBuilder.setServiceResponseInformation(serviceResponseInformationBuilder.build());
+
+            VnfResponseInformationBuilder vnfResponseInformationBuilder = new VnfResponseInformationBuilder();
+            vnfResponseInformationBuilder.setInstanceId(vnfId);
+            vnfResponseInformationBuilder.setObjectPath(vnfObjectPath);
+            responseBuilder.setVnfResponseInformation(vnfResponseInformationBuilder.build());
+
+        } catch (Exception e) {
+            log.error(UPDATING_MDSAL_ERROR_MESSAGE, svcOperation, siid, e);
+            responseBuilder.setResponseCode("500");
+            responseBuilder.setResponseMessage(e.getMessage());
+            responseBuilder.setAckFinalIndicator("Y");
+            log.error(RETURNED_FAILED_MESSAGE, svcOperation, siid, responseBuilder.build());
+
+            RpcResult<VnfTopologyOperationOutput> rpcResult = RpcResultBuilder.<VnfTopologyOperationOutput>status(true)
+                .withResult(responseBuilder.build()).build();
+
+            return Futures.immediateFuture(rpcResult);
+        }
+
+        // Update succeeded
+        responseBuilder.setResponseCode(responseObject.getStatusCode());
+        responseBuilder.setAckFinalIndicator(ackFinal);
+        trySetResponseMessage(responseBuilder, responseObject);
+        log.info(UPDATED_MDSAL_INFO_MESSAGE, svcOperation, siid);
+        log.info(RETURNED_SUCCESS_MESSAGE, svcOperation, siid, responseBuilder.build());
+
+        RpcResult<VnfTopologyOperationOutput> rpcResult = RpcResultBuilder.<VnfTopologyOperationOutput>status(true)
+            .withResult(responseBuilder.build()).build();
+
+        // return success
+        return Futures.immediateFuture(rpcResult);
+    }
+
+    private void trySetResponseMessage(VnfTopologyOperationOutputBuilder responseBuilder,
+        ResponseObject responseObject) {
+        if (responseObject.getMessage() != null) {
+            responseBuilder.setResponseMessage(responseObject.getMessage());
+        }
+    }
+
+    private void trySaveService(VnfTopologyOperationInput input, ServiceBuilder serviceBuilder) {
+        if (isValidRequest(input) && (input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Delete)
+            || input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Activate))) {
+
+            // Only update operational tree on activate or delete
+            log.info(UPDATING_TREE_INFO_MESSAGE);
+            saveService(serviceBuilder.build(), false, LogicalDatastoreType.OPERATIONAL);
+        }
+    }
+
+    private boolean hasInvalidVnfId(VnfTopologyOperationInput input) {
+        return input.getVnfInformation() == null || input.getVnfInformation().getVnfId() == null
+            || input.getVnfInformation().getVnfId().length() == 0;
+    }
+
+    private boolean hasInvalidServiceId(VnfTopologyOperationInput input) {
+        return input == null || input.getServiceInformation() == null
+            || input.getServiceInformation().getServiceInstanceId() == null
+            || input.getServiceInformation().getServiceInstanceId().length() == 0;
+    }
+
+    private void trySetSvcRequestId(VnfTopologyOperationInput input,
+        VnfTopologyOperationOutputBuilder responseBuilder) {
+        if (input.getSdncRequestHeader() != null) {
+            responseBuilder.setSvcRequestId(input.getSdncRequestHeader().getSvcRequestId());
+        }
+    }
+
+    private boolean isValidRequest(VnfTopologyOperationInput input) {
+        return input.getSdncRequestHeader() != null && input.getSdncRequestHeader().getSvcAction() != null;
+    }
+
+    @Override
+    public ListenableFuture<RpcResult<VfModuleTopologyOperationOutput>> vfModuleTopologyOperation(
+        VfModuleTopologyOperationInput input) {
+
+        final String svcOperation = "vf-module-topology-operation";
+        ServiceData serviceData;
+        ServiceStatusBuilder serviceStatusBuilder = new ServiceStatusBuilder();
+        Properties parms = new Properties();
+
+        log.info(CALLED_STR, svcOperation);
+        // create a new response object
+        VfModuleTopologyOperationOutputBuilder responseBuilder = new VfModuleTopologyOperationOutputBuilder();
+
+        if (hasInvalidServiceId(input)) {
+            log.debug(NULL_OR_EMPTY_ERROR_MESSAGE, svcOperation);
+            responseBuilder.setResponseCode("403");
+            responseBuilder.setResponseMessage(NULL_OR_EMPTY_ERROR_PARAM);
+            responseBuilder.setAckFinalIndicator("Y");
+
+            RpcResult<VfModuleTopologyOperationOutput> rpcResult = RpcResultBuilder
+                .<VfModuleTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
+
+            // return error
+            return Futures.immediateFuture(rpcResult);
+        }
+
+        if (hasInvalidVnfId(input)) {
+            log.debug("exiting {} because of null or empty vnf-id", svcOperation);
+            responseBuilder.setResponseCode("403");
+            responseBuilder.setResponseMessage("invalid input, null or empty vnf-id");
+            responseBuilder.setAckFinalIndicator("Y");
+            RpcResult<VfModuleTopologyOperationOutput> rpcResult = RpcResultBuilder
+                .<VfModuleTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
+            return Futures.immediateFuture(rpcResult);
+        }
+
+        /*if (hasInvalidVfModuleId(input)) {
+            log.debug("exiting {} because of null or empty vf-module-id", svcOperation);
+            responseBuilder.setResponseCode("403");
+            responseBuilder.setResponseMessage("invalid input, vf-module-id is null or empty");
+            responseBuilder.setAckFinalIndicator("Y");
+
+            RpcResult<VfModuleTopologyOperationOutput> rpcResult = RpcResultBuilder
+                    .<VfModuleTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
+
+            return Futures.immediateFuture(rpcResult);
+        }*/
+
+        // Grab the service instance ID from the input buffer
+        String siid = input.getServiceInformation().getServiceInstanceId();
+        String vnfId = input.getVnfInformation().getVnfId();
+        String vfModuleId = input.getVfModuleInformation().getVfModuleId();
+
+        trySetSvcRequestId(input, responseBuilder);
+
+        ServiceDataBuilder serviceDataBuilder = new ServiceDataBuilder();
+        getServiceData(siid, serviceDataBuilder);
+
+        ServiceDataBuilder operDataBuilder = new ServiceDataBuilder();
+        getServiceData(siid, operDataBuilder, LogicalDatastoreType.OPERATIONAL);
+
+        // Set the serviceStatus based on input
+        setServiceStatus(serviceStatusBuilder, input.getSdncRequestHeader());
+        setServiceStatus(serviceStatusBuilder, input.getRequestInformation());
+
+        //
+        // setup a service-data object builder
+        // ACTION vnf-topology-operation
+        // INPUT:
+        // USES sdnc-request-header;
+        // USES request-information;
+        // USES service-information;
+        // USES vnf-request-information
+        // OUTPUT:
+        // USES vnf-topology-response-body;
+        // USES vnf-information
+        // USES service-information
+        //
+        // container service-data
+        // uses vnf-configuration-information;
+        // uses oper-status;
+
+        log.info(ADDING_INPUT_DATA_LOG, svcOperation, siid, input);
+        VfModuleTopologyOperationInputBuilder inputBuilder = new VfModuleTopologyOperationInputBuilder(input);
+        GenericResourceApiUtil.toProperties(parms, inputBuilder.build());
+
+        log.info(ADDING_OPERATIONAL_DATA_LOG, svcOperation, siid, operDataBuilder.build());
+        GenericResourceApiUtil.toProperties(parms, OPERATIONAL_DATA_PARAM, operDataBuilder);
+
+        // Call SLI sync method
+
+        ResponseObject responseObject = new ResponseObject("200", "");
+        String ackFinal = "Y";
+        String serviceObjectPath = null;
+        String vnfObjectPath = null;
+        String vfModuleObjectPath = null;
+        Properties respProps = tryGetProperties(svcOperation, parms, serviceDataBuilder, responseObject);
+
+        if (respProps != null) {
+            responseObject.setStatusCode(respProps.getProperty(ERROR_CODE_PARAM));
+            responseObject.setMessage(respProps.getProperty(ERROR_MESSAGE_PARAM));
+            ackFinal = respProps.getProperty(ACK_FINAL_PARAM, "Y");
+            if (vfModuleId == null) {
+                vfModuleId = respProps.getProperty(VF_MODULE_ID_PARAM);
+                if (vfModuleId == null) {
+                    log.debug("exiting {} because vf-module-id not found in response", svcOperation);
+                    responseBuilder.setResponseCode("403");
+                    responseBuilder.setResponseMessage("failed to generate vf-module-id");
+                    responseBuilder.setAckFinalIndicator("Y");
+
+                    RpcResult<VfModuleTopologyOperationOutput> rpcResult = RpcResultBuilder
+                        .<VfModuleTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
+
+                    return Futures.immediateFuture(rpcResult);
+                }
+            }
+            serviceObjectPath = respProps.getProperty(SERVICE_OBJECT_PATH_PARAM);
+            vnfObjectPath = respProps.getProperty(VNF_OBJECT_PATH_PARAM);
+            vfModuleObjectPath = respProps.getProperty(VF_MODULE_OBJECT_PATH_PARAM);
+        }
+
+        setServiceStatus(serviceStatusBuilder, responseObject.getStatusCode(), responseObject.getMessage(), ackFinal);
+        serviceStatusBuilder.setRequestStatus(RequestStatus.Synccomplete);
+        serviceStatusBuilder.setRpcName(svcOperation);
+
+        if (failed(responseObject)) {
+            responseBuilder.setResponseCode(responseObject.getStatusCode());
+            responseBuilder.setResponseMessage(responseObject.getMessage());
+            responseBuilder.setAckFinalIndicator(ackFinal);
+
+            ServiceBuilder serviceBuilder = new ServiceBuilder();
+            serviceBuilder.setServiceInstanceId(siid);
+            serviceBuilder.setServiceStatus(serviceStatusBuilder.build());
+            try {
+                saveService(serviceBuilder.build(), true, LogicalDatastoreType.CONFIGURATION);
+            } catch (Exception e) {
+                log.error(UPDATING_MDSAL_ERROR_MESSAGE, svcOperation, siid, e);
+            }
+            log.error(RETURNED_FAILED_MESSAGE, svcOperation, siid, responseBuilder.build());
+
+            RpcResult<VfModuleTopologyOperationOutput> rpcResult = RpcResultBuilder
+                .<VfModuleTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
+
+            // return error
+            return Futures.immediateFuture(rpcResult);
+        }
+
+        // Got success from SLI
+        try {
+            serviceData = serviceDataBuilder.build();
+            log.info(UPDATING_MDSAL_INFO_MESSAGE, svcOperation, siid, serviceData);
+
+            // service object
+            ServiceBuilder serviceBuilder = new ServiceBuilder();
+            serviceBuilder.setServiceData(serviceData);
+            serviceBuilder.setServiceInstanceId(siid);
+            serviceBuilder.setServiceStatus(serviceStatusBuilder.build());
+            saveService(serviceBuilder.build(), false, LogicalDatastoreType.CONFIGURATION);
+
+            trySaveService(input, serviceBuilder);
+
+            ServiceResponseInformationBuilder serviceResponseInformationBuilder = new ServiceResponseInformationBuilder();
+            serviceResponseInformationBuilder.setInstanceId(siid);
+            serviceResponseInformationBuilder.setObjectPath(serviceObjectPath);
+            responseBuilder.setServiceResponseInformation(serviceResponseInformationBuilder.build());
+
+            VnfResponseInformationBuilder vnfResponseInformationBuilder = new VnfResponseInformationBuilder();
+            vnfResponseInformationBuilder.setInstanceId(vnfId);
+            vnfResponseInformationBuilder.setObjectPath(vnfObjectPath);
+            responseBuilder.setVnfResponseInformation(vnfResponseInformationBuilder.build());
+
+            VfModuleResponseInformationBuilder vfModuleResponseInformationBuilder = new VfModuleResponseInformationBuilder();
+            vfModuleResponseInformationBuilder.setInstanceId(vfModuleId);
+            vfModuleResponseInformationBuilder.setObjectPath(vfModuleObjectPath);
+            responseBuilder.setVfModuleResponseInformation(vfModuleResponseInformationBuilder.build());
+
+        } catch (Exception e) {
+            log.error(UPDATING_MDSAL_ERROR_MESSAGE, svcOperation, siid, e);
+            responseBuilder.setResponseCode("500");
+            responseBuilder.setResponseMessage(e.getMessage());
+            responseBuilder.setAckFinalIndicator("Y");
+            log.error(RETURNED_FAILED_MESSAGE, svcOperation, siid, responseBuilder.build());
+
+            RpcResult<VfModuleTopologyOperationOutput> rpcResult = RpcResultBuilder
+                .<VfModuleTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
+
+            return Futures.immediateFuture(rpcResult);
+        }
+
+        // Update succeeded
+        responseBuilder.setResponseCode(responseObject.getStatusCode());
+        responseBuilder.setAckFinalIndicator(ackFinal);
+        trySetResponseMessage(responseBuilder, responseObject);
+        log.info(UPDATED_MDSAL_INFO_MESSAGE, svcOperation, siid);
+        log.info(RETURNED_SUCCESS_MESSAGE, svcOperation, siid, responseBuilder.build());
+
+        RpcResult<VfModuleTopologyOperationOutput> rpcResult = RpcResultBuilder
+            .<VfModuleTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
+
+        // return success
+        return Futures.immediateFuture(rpcResult);
+    }
+
+    private void trySetResponseMessage(VfModuleTopologyOperationOutputBuilder responseBuilder,
+        ResponseObject responseObject) {
+        if (responseObject.getMessage() != null) {
+            responseBuilder.setResponseMessage(responseObject.getMessage());
+        }
+    }
+
+    private void trySaveService(VfModuleTopologyOperationInput input, ServiceBuilder serviceBuilder) {
+        if (isValidRequest(input) && (input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Unassign)
+            || input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Activate))) {
+            // Only update operational tree on activate or delete
+
+            log.info(UPDATING_TREE_INFO_MESSAGE);
+            saveService(serviceBuilder.build(), false, LogicalDatastoreType.OPERATIONAL);
+        }
+    }
+
+    private void trySetSvcRequestId(VfModuleTopologyOperationInput input,
+        VfModuleTopologyOperationOutputBuilder responseBuilder) {
+        if (input.getSdncRequestHeader() != null) {
+            responseBuilder.setSvcRequestId(input.getSdncRequestHeader().getSvcRequestId());
+        }
+    }
+
+    private boolean hasInvalidVfModuleId(VfModuleTopologyOperationInput input) {
+        return input.getVfModuleInformation() == null || input.getVfModuleInformation().getVfModuleId() == null
+            || input.getVfModuleInformation().getVfModuleId().length() == 0;
+    }
+
+    private boolean hasInvalidVnfId(VfModuleTopologyOperationInput input) {
+        return input.getVnfInformation() == null || input.getVnfInformation().getVnfId() == null
+            || input.getVnfInformation().getVnfId().length() == 0;
+    }
+
+    private boolean hasInvalidServiceId(VfModuleTopologyOperationInput input) {
+        return input == null || input.getServiceInformation() == null
+            || input.getServiceInformation().getServiceInstanceId() == null
+            || input.getServiceInformation().getServiceInstanceId().length() == 0;
+    }
+
+    private boolean isValidRequest(VfModuleTopologyOperationInput input) {
+        return input.getSdncRequestHeader() != null && input.getSdncRequestHeader().getSvcAction() != null;
+    }
+
+    @Override
+    public ListenableFuture<RpcResult<NetworkTopologyOperationOutput>> networkTopologyOperation(
+        NetworkTopologyOperationInput input) {
+
+        final String svcOperation = "network-topology-operation";
+        ServiceData serviceData;
+        ServiceStatusBuilder serviceStatusBuilder = new ServiceStatusBuilder();
+        Properties parms = new Properties();
+
+        log.info(CALLED_STR, svcOperation);
+        // create a new response object
+        NetworkTopologyOperationOutputBuilder responseBuilder = new NetworkTopologyOperationOutputBuilder();
+
+        if (hasInvalidServiceId(input)) {
+            log.debug(NULL_OR_EMPTY_ERROR_MESSAGE, svcOperation);
+            return buildRpcResultFuture(responseBuilder, NULL_OR_EMPTY_ERROR_PARAM);
+        }
+
+        String siid = input.getServiceInformation().getServiceInstanceId();
+
+        // Get the service-instance service data from MD-SAL
+        ServiceDataBuilder serviceDataBuilder = new ServiceDataBuilder();
+        getServiceData(siid, serviceDataBuilder);
+
+        this.trySetSvcRequestId(input, responseBuilder);
+
+        ServiceData sd = serviceDataBuilder.build();
+        if (isInvalidServiceData(sd)) {
+            log.debug(EMPTY_SERVICE_INSTANCE_MESSAGE, svcOperation);
+            return buildRpcResultFuture(responseBuilder, INVALID_INPUT_ERROR_MESSAGE);
+        }
+
+        log.info(ADDING_INPUT_DATA_LOG, svcOperation, siid, input);
+        NetworkTopologyOperationInputBuilder inputBuilder = new NetworkTopologyOperationInputBuilder(input);
+        GenericResourceApiUtil.toProperties(parms, inputBuilder.build());
+
+        // Call SLI sync method
+
+        ResponseObject responseObject = new ResponseObject("200", "");
+        String ackFinal = "Y";
+        String networkId = ERROR_NETWORK_ID;
+        String serviceObjectPath = null;
+        String networkObjectPath = null;
+        Properties respProps = tryGetProperties(svcOperation, parms, serviceDataBuilder, responseObject);
+
+        if (respProps != null) {
+            responseObject.setStatusCode(respProps.getProperty(ERROR_CODE_PARAM));
+            responseObject.setMessage(respProps.getProperty(ERROR_MESSAGE_PARAM));
+            ackFinal = respProps.getProperty(ACK_FINAL_PARAM, "Y");
+            networkId = respProps.getProperty("networkId");
+            serviceObjectPath = respProps.getProperty(SERVICE_OBJECT_PATH_PARAM);
+            networkObjectPath = respProps.getProperty(NETWORK_OBJECT_PATH_PARAM);
+        }
+
+        if (failed(responseObject)) {
+            responseBuilder.setResponseCode(responseObject.getStatusCode());
+            responseBuilder.setResponseMessage(responseObject.getMessage());
+            responseBuilder.setAckFinalIndicator(ackFinal);
+
+            log.error(RETURNED_FAILED_MESSAGE, svcOperation, siid, responseBuilder.build());
+
+            RpcResult<NetworkTopologyOperationOutput> rpcResult = RpcResultBuilder
+                .<NetworkTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
+
+            return Futures.immediateFuture(rpcResult);
+        }
+
+        // Got success from SLI
+        try {
+
+            serviceData = serviceDataBuilder.build();
+            log.info(UPDATING_MDSAL_INFO_MESSAGE, svcOperation, siid, serviceData);
+
+            // service object
+            ServiceBuilder serviceBuilder = new ServiceBuilder();
+            serviceBuilder.setServiceData(serviceData);
+            serviceBuilder.setServiceInstanceId(siid);
+            serviceBuilder.setServiceStatus(serviceStatusBuilder.build());
+            saveService(serviceBuilder.build(), false, LogicalDatastoreType.CONFIGURATION);
+
+            trySaveService(input, serviceBuilder);
+
+            NetworkResponseInformationBuilder networkResponseInformationBuilder = new NetworkResponseInformationBuilder();
+            networkResponseInformationBuilder.setInstanceId(networkId);
+            networkResponseInformationBuilder.setObjectPath(networkObjectPath);
+            responseBuilder.setNetworkResponseInformation(networkResponseInformationBuilder.build());
+
+            ServiceResponseInformationBuilder serviceResponseInformationBuilder = new ServiceResponseInformationBuilder();
+            serviceResponseInformationBuilder.setInstanceId(siid);
+            serviceResponseInformationBuilder.setObjectPath(serviceObjectPath);
+            responseBuilder.setServiceResponseInformation(serviceResponseInformationBuilder.build());
+
+        } catch (IllegalStateException e) {
+            log.error(UPDATING_MDSAL_ERROR_MESSAGE, svcOperation, siid, e);
+            responseBuilder.setResponseCode("500");
+            responseBuilder.setResponseMessage(e.getMessage());
+            responseBuilder.setAckFinalIndicator("Y");
+            log.error(RETURNED_FAILED_MESSAGE, svcOperation, siid, responseBuilder.build());
+
+            RpcResult<NetworkTopologyOperationOutput> rpcResult = RpcResultBuilder
+                .<NetworkTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
+
+            return Futures.immediateFuture(rpcResult);
+        }
+
+        // Update succeeded
+        responseBuilder.setResponseCode(responseObject.getStatusCode());
+        responseBuilder.setAckFinalIndicator(ackFinal);
+        trySetResponseMessage(responseBuilder, responseObject);
+        log.info(UPDATED_MDSAL_INFO_MESSAGE, svcOperation, siid);
+        log.info(RETURNED_SUCCESS_MESSAGE, svcOperation, siid, responseBuilder.build());
+
+        RpcResult<NetworkTopologyOperationOutput> rpcResult = RpcResultBuilder
+            .<NetworkTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
+
+        return Futures.immediateFuture(rpcResult);
+    }
+
+    private void trySetResponseMessage(NetworkTopologyOperationOutputBuilder responseBuilder,
+        ResponseObject responseObject) {
+        if (responseObject.getMessage() != null) {
+            responseBuilder.setResponseMessage(responseObject.getMessage());
+        }
+    }
+
+    private void trySetSvcRequestId(NetworkTopologyOperationInput input,
+        NetworkTopologyOperationOutputBuilder responseBuilder) {
+        if (input.getSdncRequestHeader() != null) {
+            responseBuilder.setSvcRequestId(input.getSdncRequestHeader().getSvcRequestId());
+        }
+    }
+
+    private void trySaveService(NetworkTopologyOperationInput input, ServiceBuilder serviceBuilder) {
+        if (isValidRequest(input) && (input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Activate)
+            || input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Create))) {
+            // Only update operational tree on Activate
+            log.info(UPDATING_TREE_INFO_MESSAGE);
+            saveService(serviceBuilder.build(), false, LogicalDatastoreType.OPERATIONAL);
+        }
+    }
+
+    private boolean hasInvalidServiceId(NetworkTopologyOperationInput input) {
+        return input == null || input.getServiceInformation() == null
+            || input.getServiceInformation().getServiceInstanceId() == null
+            || input.getServiceInformation().getServiceInstanceId().length() == 0;
+    }
+
+    private ListenableFuture<RpcResult<NetworkTopologyOperationOutput>> buildRpcResultFuture(
+        NetworkTopologyOperationOutputBuilder responseBuilder, String responseMessage) {
+
+        responseBuilder.setResponseCode("404");
+        responseBuilder.setResponseMessage(responseMessage);
+        responseBuilder.setAckFinalIndicator("Y");
+
+        RpcResult<NetworkTopologyOperationOutput> rpcResult = RpcResultBuilder
+            .<NetworkTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
+
+        return Futures.immediateFuture(rpcResult);
+    }
+
+    private boolean isValidRequest(NetworkTopologyOperationInput input) {
+        return input.getSdncRequestHeader() != null && input.getSdncRequestHeader().getSvcAction() != null;
+    }
+
+    @Override
+    public ListenableFuture<RpcResult<ContrailRouteTopologyOperationOutput>> contrailRouteTopologyOperation(
+        ContrailRouteTopologyOperationInput input) {
+
+        final String svcOperation = "contrail-route-topology-operation";
+        ServiceData serviceData;
+        ServiceStatusBuilder serviceStatusBuilder = new ServiceStatusBuilder();
+        Properties properties = new Properties();
+
+        log.info(CALLED_STR, svcOperation);
+        // create a new response object
+        ContrailRouteTopologyOperationOutputBuilder responseBuilder = new ContrailRouteTopologyOperationOutputBuilder();
+
+        if (hasInvalidServiceId(input)) {
+            log.debug(NULL_OR_EMPTY_ERROR_MESSAGE, svcOperation);
+            return buildRpcResultFuture(responseBuilder, NULL_OR_EMPTY_ERROR_PARAM);
+        }
+
+        String siid = input.getServiceInformation().getServiceInstanceId();
+
+        // Get the service-instance service data from MD-SAL
+        ServiceDataBuilder serviceDataBuilder = new ServiceDataBuilder();
+        getServiceData(siid, serviceDataBuilder);
+
+        trySetSvcRequestId(input, responseBuilder);
+
+        ServiceData sd = serviceDataBuilder.build();
+        if (isInvalidServiceData(sd)) {
+            log.debug(EMPTY_SERVICE_INSTANCE_MESSAGE, svcOperation);
+            return buildRpcResultFuture(responseBuilder, INVALID_INPUT_ERROR_MESSAGE);
+        }
+
+        log.info("Adding INPUT data for " + svcOperation + " [" + siid + "] input: " + input);
+        ContrailRouteTopologyOperationInputBuilder inputBuilder = new ContrailRouteTopologyOperationInputBuilder(input);
+        GenericResourceApiUtil.toProperties(properties, inputBuilder.build());
+
+        // Call SLI sync method
+
+        ResponseObject responseObject = new ResponseObject("200", "");
+        String ackFinal = "Y";
+        String allottedResourceId = ERROR_NETWORK_ID;
+        String serviceObjectPath = null;
+        String contrailRouteObjectPath = null;
+        Properties respProps = tryGetProperties(svcOperation, properties, serviceDataBuilder, responseObject);
+
+        if (respProps != null) {
+            responseObject.setStatusCode(respProps.getProperty(ERROR_CODE_PARAM));
+            responseObject.setMessage(respProps.getProperty(ERROR_MESSAGE_PARAM));
+            ackFinal = respProps.getProperty(ACK_FINAL_PARAM, "Y");
+            allottedResourceId = respProps.getProperty(ALLOTTED_RESOURCE_ID_PARAM);
+            serviceObjectPath = respProps.getProperty(SERVICE_OBJECT_PATH_PARAM);
+            contrailRouteObjectPath = respProps.getProperty("contrail-route-object-path");
+        }
+
+        if (failed(responseObject)) {
+            responseBuilder.setResponseCode(responseObject.getStatusCode());
+            responseBuilder.setResponseMessage(responseObject.getMessage());
+            responseBuilder.setAckFinalIndicator(ackFinal);
+            log.error(RETURNED_FAILED_MESSAGE, svcOperation, siid, responseBuilder.build());
+
+            RpcResult<ContrailRouteTopologyOperationOutput> rpcResult = RpcResultBuilder
+                .<ContrailRouteTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
+
+            return Futures.immediateFuture(rpcResult);
+        }
+
+        // Got success from SLI
+        try {
+            serviceData = serviceDataBuilder.build();
+            log.info(UPDATING_MDSAL_INFO_MESSAGE, svcOperation, siid, serviceData);
+
+            // service object
+            ServiceBuilder serviceBuilder = new ServiceBuilder();
+            serviceBuilder.setServiceData(serviceData);
+            serviceBuilder.setServiceInstanceId(siid);
+            serviceBuilder.setServiceStatus(serviceStatusBuilder.build());
+            saveService(serviceBuilder.build(), false, LogicalDatastoreType.CONFIGURATION);
+
+            trySaveService(input, serviceBuilder);
+
+            ContrailRouteResponseInformationBuilder contrailRouteResponseInformationBuilder = new ContrailRouteResponseInformationBuilder();
+            contrailRouteResponseInformationBuilder.setInstanceId(allottedResourceId);
+            contrailRouteResponseInformationBuilder.setObjectPath(contrailRouteObjectPath);
+            responseBuilder.setContrailRouteResponseInformation(contrailRouteResponseInformationBuilder.build());
+
+            ServiceResponseInformationBuilder serviceResponseInformationBuilder = new ServiceResponseInformationBuilder();
+            serviceResponseInformationBuilder.setInstanceId(siid);
+            serviceResponseInformationBuilder.setObjectPath(serviceObjectPath);
+            responseBuilder.setServiceResponseInformation(serviceResponseInformationBuilder.build());
+
+        } catch (IllegalStateException e) {
+            log.error(UPDATING_MDSAL_ERROR_MESSAGE, svcOperation, siid, e);
+            responseBuilder.setResponseCode("500");
+            responseBuilder.setResponseMessage(e.getMessage());
+            responseBuilder.setAckFinalIndicator("Y");
+            log.error(RETURNED_FAILED_MESSAGE, svcOperation, siid, responseBuilder.build());
+
+            RpcResult<ContrailRouteTopologyOperationOutput> rpcResult = RpcResultBuilder
+                .<ContrailRouteTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
+
+            return Futures.immediateFuture(rpcResult);
+        }
+
+        // Update succeeded
+        responseBuilder.setResponseCode(responseObject.getStatusCode());
+        responseBuilder.setAckFinalIndicator(ackFinal);
+        trySetResponseMessage(responseBuilder, responseObject);
+        log.info(UPDATED_MDSAL_INFO_MESSAGE, svcOperation, siid);
+        log.info(RETURNED_SUCCESS_MESSAGE, svcOperation, siid, responseBuilder.build());
+
+        RpcResult<ContrailRouteTopologyOperationOutput> rpcResult = RpcResultBuilder
+            .<ContrailRouteTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
+
+        return Futures.immediateFuture(rpcResult);
+    }
+
+    private void trySetResponseMessage(ContrailRouteTopologyOperationOutputBuilder responseBuilder,
+        ResponseObject responseObject) {
+        if (responseObject.getMessage() != null) {
+            responseBuilder.setResponseMessage(responseObject.getMessage());
+        }
+    }
+
+    private void trySaveService(ContrailRouteTopologyOperationInput input, ServiceBuilder serviceBuilder) {
+        if (isValidRequest(input) && (input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Unassign)
+            || input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Activate))) {
+            // Only update operational tree on activate or delete
+            log.info(UPDATING_TREE_INFO_MESSAGE);
+            saveService(serviceBuilder.build(), false, LogicalDatastoreType.OPERATIONAL);
+        }
+    }
+
+    private void trySetSvcRequestId(ContrailRouteTopologyOperationInput input,
+        ContrailRouteTopologyOperationOutputBuilder responseBuilder) {
+        if (input.getSdncRequestHeader() != null) {
+            responseBuilder.setSvcRequestId(input.getSdncRequestHeader().getSvcRequestId());
+        }
+    }
+
+    private boolean hasInvalidServiceId(ContrailRouteTopologyOperationInput input) {
+        return input == null || input.getServiceInformation() == null
+            || input.getServiceInformation().getServiceInstanceId() == null
+            || input.getServiceInformation().getServiceInstanceId().length() == 0;
+    }
+
+    private ListenableFuture<RpcResult<ContrailRouteTopologyOperationOutput>> buildRpcResultFuture(
+        ContrailRouteTopologyOperationOutputBuilder responseBuilder, String responseMessage) {
+        responseBuilder.setResponseCode("404");
+        responseBuilder.setResponseMessage(responseMessage);
+        responseBuilder.setAckFinalIndicator("Y");
+
+        RpcResult<ContrailRouteTopologyOperationOutput> rpcResult = RpcResultBuilder
+            .<ContrailRouteTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
+
+        return Futures.immediateFuture(rpcResult);
+    }
+
+    private boolean isValidRequest(ContrailRouteTopologyOperationInput input) {
+        return input.getSdncRequestHeader() != null && input.getSdncRequestHeader().getSvcAction() != null;
+    }
+
+    @Override
+    public ListenableFuture<RpcResult<SecurityZoneTopologyOperationOutput>> securityZoneTopologyOperation(
+        SecurityZoneTopologyOperationInput input) {
+
+        final String svcOperation = "security-zone-topology-operation";
+        ServiceData serviceData;
+        ServiceStatusBuilder serviceStatusBuilder = new ServiceStatusBuilder();
+        Properties parms = new Properties();
+
+        log.info(CALLED_STR, svcOperation);
+        // create a new response object
+        SecurityZoneTopologyOperationOutputBuilder responseBuilder = new SecurityZoneTopologyOperationOutputBuilder();
+
+        if (this.hasInvalidServiceId(input)) {
+            log.debug(NULL_OR_EMPTY_ERROR_MESSAGE, svcOperation);
+            return buildRpcResultFuture(responseBuilder, NULL_OR_EMPTY_ERROR_PARAM);
+        }
+
+        String siid = input.getServiceInformation().getServiceInstanceId();
+
+        // Get the service-instance service data from MD-SAL
+        ServiceDataBuilder serviceDataBuilder = new ServiceDataBuilder();
+        getServiceData(siid, serviceDataBuilder);
+        trySetSvcRequestId(input, responseBuilder);
+
+        ServiceData sd = serviceDataBuilder.build();
+        if (isInvalidServiceData(sd)) {
+            log.debug(EMPTY_SERVICE_INSTANCE_MESSAGE, svcOperation);
+            return buildRpcResultFuture(responseBuilder, INVALID_INPUT_ERROR_MESSAGE);
+        }
+
+        log.info(ADDING_INPUT_DATA_LOG, svcOperation, siid, input);
+        SecurityZoneTopologyOperationInputBuilder inputBuilder = new SecurityZoneTopologyOperationInputBuilder(input);
+        GenericResourceApiUtil.toProperties(parms, inputBuilder.build());
+
+        // Call SLI sync method
+
+        Properties respProps = null;
+
+        ResponseObject responseObject = new ResponseObject("200", "");
+        String ackFinal = "Y";
+        String allottedResourceId = ERROR_NETWORK_ID;
+        String serviceObjectPath = null;
+        String securityZoneObjectPath = null;
+
+        try {
+            if (svcLogicClient.hasGraph(APP_NAME, svcOperation, null, "sync")) {
+
+                try {
+                    respProps = svcLogicClient.execute(APP_NAME, svcOperation, null, "sync", serviceDataBuilder, parms);
+                } catch (Exception e) {
+                    log.error(SERVICE_LOGIC_EXECUTION_ERROR_MESSAGE, svcOperation, e);
+                    responseObject.setMessage(e.getMessage());
+                    responseObject.setStatusCode("500");
+                }
+            } else {
+                responseObject.setMessage(NO_SERVICE_LOGIC_ACTIVE + APP_NAME + ": '" + svcOperation + "'");
+                responseObject.setStatusCode("503");
+            }
+        } catch (Exception e) {
+            responseObject.setStatusCode("500");
+            responseObject.setMessage(e.getMessage());
+            log.error(SERVICE_LOGIC_SEARCH_ERROR_MESSAGE, e);
+        }
+
+        if (respProps != null) {
+            responseObject.setStatusCode(respProps.getProperty(ERROR_CODE_PARAM));
+            responseObject.setMessage(respProps.getProperty(ERROR_MESSAGE_PARAM));
+            ackFinal = respProps.getProperty(ACK_FINAL_PARAM, "Y");
+            allottedResourceId = respProps.getProperty(ALLOTTED_RESOURCE_ID_PARAM);
+            serviceObjectPath = respProps.getProperty(SERVICE_OBJECT_PATH_PARAM);
+            securityZoneObjectPath = respProps.getProperty("security-zone-object-path");
+        }
+
+        if (failed(responseObject)) {
+            responseBuilder.setResponseCode(responseObject.getStatusCode());
+            responseBuilder.setResponseMessage(responseObject.getMessage());
+            responseBuilder.setAckFinalIndicator(ackFinal);
+            log.error(RETURNED_FAILED_MESSAGE, svcOperation, siid, responseBuilder.build());
+
+            RpcResult<SecurityZoneTopologyOperationOutput> rpcResult = RpcResultBuilder
+                .<SecurityZoneTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
+
+            return Futures.immediateFuture(rpcResult);
+        }
+
+        // Got success from SLI
+        try {
+
+            serviceData = serviceDataBuilder.build();
+            log.info(UPDATING_MDSAL_INFO_MESSAGE, svcOperation, siid, serviceData);
+
+            // service object
+            ServiceBuilder serviceBuilder = new ServiceBuilder();
+            serviceBuilder.setServiceData(serviceData);
+            serviceBuilder.setServiceInstanceId(siid);
+            serviceBuilder.setServiceStatus(serviceStatusBuilder.build());
+            saveService(serviceBuilder.build(), false, LogicalDatastoreType.CONFIGURATION);
+
+            trySaveService(input, serviceBuilder);
+
+            SecurityZoneResponseInformationBuilder securityZoneResponseInformationBuilder = new SecurityZoneResponseInformationBuilder();
+            securityZoneResponseInformationBuilder.setInstanceId(allottedResourceId);
+            securityZoneResponseInformationBuilder.setObjectPath(securityZoneObjectPath);
+            responseBuilder.setSecurityZoneResponseInformation(securityZoneResponseInformationBuilder.build());
+
+            ServiceResponseInformationBuilder serviceResponseInformationBuilder = new ServiceResponseInformationBuilder();
+            serviceResponseInformationBuilder.setInstanceId(siid);
+            serviceResponseInformationBuilder.setObjectPath(serviceObjectPath);
+            responseBuilder.setServiceResponseInformation(serviceResponseInformationBuilder.build());
+
+        } catch (IllegalStateException e) {
+            log.error(UPDATING_MDSAL_ERROR_MESSAGE, svcOperation, siid, e);
+            responseBuilder.setResponseCode("500");
+            responseBuilder.setResponseMessage(e.getMessage());
+            responseBuilder.setAckFinalIndicator("Y");
+            log.error(RETURNED_FAILED_MESSAGE, svcOperation, siid, responseBuilder.build());
+
+            RpcResult<SecurityZoneTopologyOperationOutput> rpcResult = RpcResultBuilder
+                .<SecurityZoneTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
+
+            return Futures.immediateFuture(rpcResult);
+        }
+
+        // Update succeeded
+        responseBuilder.setResponseCode(responseObject.getStatusCode());
+        responseBuilder.setAckFinalIndicator(ackFinal);
+        trySetResponseMessage(responseBuilder, responseObject);
+        log.info(UPDATED_MDSAL_INFO_MESSAGE, svcOperation, siid);
+        log.info(RETURNED_SUCCESS_MESSAGE, svcOperation, siid, responseBuilder.build());
+
+        RpcResult<SecurityZoneTopologyOperationOutput> rpcResult = RpcResultBuilder
+            .<SecurityZoneTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
+
+        return Futures.immediateFuture(rpcResult);
+    }
+
+    private void trySetResponseMessage(SecurityZoneTopologyOperationOutputBuilder responseBuilder,
+        ResponseObject responseObject) {
+        if (responseObject.getMessage() != null) {
+            responseBuilder.setResponseMessage(responseObject.getMessage());
+        }
+    }
+
+    private void trySaveService(SecurityZoneTopologyOperationInput input, ServiceBuilder serviceBuilder) {
+        if (isValidRequest(input) && (input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Unassign)
+            || input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Activate))) {
+            // Only update operational tree on activate or delete
+            log.info(UPDATING_TREE_INFO_MESSAGE);
+            saveService(serviceBuilder.build(), false, LogicalDatastoreType.OPERATIONAL);
+        }
+    }
+
+    private void trySetSvcRequestId(SecurityZoneTopologyOperationInput input,
+        SecurityZoneTopologyOperationOutputBuilder responseBuilder) {
+        if (input.getSdncRequestHeader() != null) {
+            responseBuilder.setSvcRequestId(input.getSdncRequestHeader().getSvcRequestId());
+        }
+    }
+
+    private boolean isInvalidServiceData(ServiceData sd) {
+        return sd == null || sd.getServiceLevelOperStatus() == null;
+    }
+
+    private boolean hasInvalidServiceId(SecurityZoneTopologyOperationInput input) {
+        return input == null || input.getServiceInformation() == null
+            || input.getServiceInformation().getServiceInstanceId() == null
+            || input.getServiceInformation().getServiceInstanceId().length() == 0;
+    }
+
+    private ListenableFuture<RpcResult<SecurityZoneTopologyOperationOutput>> buildRpcResultFuture(
+        SecurityZoneTopologyOperationOutputBuilder responseBuilder, String responseMessage) {
+
+        responseBuilder.setResponseCode("404");
+        responseBuilder.setResponseMessage(responseMessage);
+        responseBuilder.setAckFinalIndicator("Y");
+
+        RpcResult<SecurityZoneTopologyOperationOutput> rpcResult = RpcResultBuilder
+            .<SecurityZoneTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
+
+        return Futures.immediateFuture(rpcResult);
+    }
+
+    private boolean isValidRequest(SecurityZoneTopologyOperationInput input) {
+        return input.getSdncRequestHeader() != null && input.getSdncRequestHeader().getSvcAction() != null;
+    }
+
+
+    private boolean hasInvalidServiceId(ConnectionAttachmentTopologyOperationInput input) {
+        return input == null || input.getServiceInformation() == null
+            || input.getServiceInformation().getServiceInstanceId() == null
+            || input.getServiceInformation().getServiceInstanceId().length() == 0;
+    }
+
+    private void trySetResponseMessage(ConnectionAttachmentTopologyOperationOutputBuilder responseBuilder,
+        ResponseObject error) {
+        if (!error.getMessage().isEmpty()) {
+            responseBuilder.setResponseMessage(error.getMessage());
+        }
+    }
+
+    private void trySetSvcRequestId(ConnectionAttachmentTopologyOperationInput input,
+        ConnectionAttachmentTopologyOperationOutputBuilder responseBuilder) {
+        if (input.getSdncRequestHeader() != null) {
+            responseBuilder.setSvcRequestId(input.getSdncRequestHeader().getSvcRequestId());
+        }
+    }
+
+    private ListenableFuture<RpcResult<ConnectionAttachmentTopologyOperationOutput>>
+    buildRpcResultFuture(ConnectionAttachmentTopologyOperationOutputBuilder responseBuilder, String responseMessage) {
+
+        responseBuilder.setResponseCode("404");
+        responseBuilder.setResponseMessage(responseMessage);
+        responseBuilder.setAckFinalIndicator("Y");
+
+        RpcResult<ConnectionAttachmentTopologyOperationOutput> rpcResult = RpcResultBuilder
+            .<ConnectionAttachmentTopologyOperationOutput>status(true)
+            .withResult(responseBuilder.build())
+            .build();
+
+        return Futures.immediateFuture(rpcResult);
+    }
+
+    private void trySaveService(ConnectionAttachmentTopologyOperationInput input, ServiceBuilder serviceBuilder) {
+        if (isValidRequest(input) &&
+            (input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Unassign) ||
+                input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Activate))) {
+            // Only update operational tree on activate or delete
+            log.info(UPDATING_TREE_INFO_MESSAGE);
+            saveService(serviceBuilder.build(), false, LogicalDatastoreType.OPERATIONAL);
+        }
+    }
+
+    private boolean isValidRequest(ConnectionAttachmentTopologyOperationInput input) {
+        return input.getSdncRequestHeader() != null && input.getSdncRequestHeader().getSvcAction() != null;
+    }
+
+    @Override
+    public ListenableFuture<RpcResult<ConnectionAttachmentTopologyOperationOutput>> connectionAttachmentTopologyOperation(
+        ConnectionAttachmentTopologyOperationInput input) {
+        final String svcOperation = "connection-attachment-topology-operation";
+        Properties parms = new Properties();
+        log.info(CALLED_STR, svcOperation);
+
+        // create a new response object
+        ConnectionAttachmentTopologyOperationOutputBuilder responseBuilder = new ConnectionAttachmentTopologyOperationOutputBuilder();
+        if (hasInvalidServiceId(input)) {
+            log.debug(NULL_OR_EMPTY_ERROR_MESSAGE, svcOperation);
+            responseBuilder.setResponseCode("404");
+            responseBuilder.setResponseMessage(NULL_OR_EMPTY_ERROR_PARAM);
+            responseBuilder.setAckFinalIndicator("Y");
+
+            RpcResult<ConnectionAttachmentTopologyOperationOutput> rpcResult = RpcResultBuilder
+                .<ConnectionAttachmentTopologyOperationOutput>status(true)
+                .withResult(responseBuilder.build())
+                .build();
+
+            return Futures.immediateFuture(rpcResult);
+        }
+
+        ServiceData serviceData;
+        ServiceStatusBuilder serviceStatusBuilder = new ServiceStatusBuilder();
+
+        String siid = input.getServiceInformation().getServiceInstanceId();
+        log.info(ADDING_INPUT_DATA_LOG, svcOperation, siid, input);
+
+        // Get the service-instance service data from MD-SAL
+        ServiceDataBuilder serviceDataBuilder = new ServiceDataBuilder();
+        getServiceData(siid, serviceDataBuilder);
+
+        trySetSvcRequestId(input, responseBuilder);
+
+        ServiceData sd = serviceDataBuilder.build();
+        if (isInvalidServiceData(sd)) {
+            log.debug(EMPTY_SERVICE_INSTANCE_MESSAGE, svcOperation);
+            return buildRpcResultFuture(responseBuilder, INVALID_INPUT_ERROR_MESSAGE);
+        }
+
+        ConnectionAttachmentTopologyOperationInputBuilder inputBuilder = new ConnectionAttachmentTopologyOperationInputBuilder(
+            input);
+        GenericResourceApiUtil.toProperties(parms, inputBuilder.build());
+
+        // Call SLI sync method
+        // Get SvcLogicService reference
+        ResponseObject responseObject = new ResponseObject("200", "");
+        String ackFinal = "Y";
+        String allottedResourceId = ERROR_NETWORK_ID;
+        String serviceObjectPath = null;
+        String connectionAttachmentObjectPath = null;
+
+        Properties respProps = tryGetProperties(svcOperation, parms, serviceDataBuilder, responseObject);
+
+        if (respProps != null) {
+            responseObject.setStatusCode(respProps.getProperty(ERROR_CODE_PARAM));
+            responseObject.setMessage(respProps.getProperty(ERROR_MESSAGE_PARAM));
+            ackFinal = respProps.getProperty(ACK_FINAL_PARAM, "Y");
+            allottedResourceId = respProps.getProperty(ALLOTTED_RESOURCE_ID_PARAM);
+            serviceObjectPath = respProps.getProperty(SERVICE_OBJECT_PATH_PARAM);
+            connectionAttachmentObjectPath = respProps.getProperty("connection-attachment-object-path");
+        }
+
+        if (failed(responseObject)) {
+            responseBuilder.setResponseCode(responseObject.getStatusCode());
+            responseBuilder.setResponseMessage(responseObject.getMessage());
+            responseBuilder.setAckFinalIndicator(ackFinal);
+
+            log.error(RETURNED_FAILED_MESSAGE, svcOperation, siid, responseBuilder.build());
+
+            RpcResult<ConnectionAttachmentTopologyOperationOutput> rpcResult = RpcResultBuilder
+                .<ConnectionAttachmentTopologyOperationOutput>status(true)
+                .withResult(responseBuilder.build())
+                .build();
+
+            return Futures.immediateFuture(rpcResult);
+        }
+
+        // Got success from SLI
+        try {
+
+            serviceData = serviceDataBuilder.build();
+            log.info(UPDATING_MDSAL_INFO_MESSAGE, svcOperation, siid, serviceData);
+
+            // service object
+            ServiceBuilder serviceBuilder = new ServiceBuilder();
+            serviceBuilder.setServiceData(serviceData);
+            serviceBuilder.setServiceInstanceId(siid);
+            serviceBuilder.setServiceStatus(serviceStatusBuilder.build());
+            saveService(serviceBuilder.build(), false, LogicalDatastoreType.CONFIGURATION);
+
+            trySaveService(input, serviceBuilder);
+
+            ConnectionAttachmentResponseInformationBuilder connectionAttachmentResponseInformationBuilder = new ConnectionAttachmentResponseInformationBuilder();
+            connectionAttachmentResponseInformationBuilder.setInstanceId(allottedResourceId);
+            connectionAttachmentResponseInformationBuilder.setObjectPath(connectionAttachmentObjectPath);
+            responseBuilder
+                .setConnectionAttachmentResponseInformation(connectionAttachmentResponseInformationBuilder.build());
+
+            ServiceResponseInformationBuilder serviceResponseInformationBuilder = new ServiceResponseInformationBuilder();
+            serviceResponseInformationBuilder.setInstanceId(siid);
+            serviceResponseInformationBuilder.setObjectPath(serviceObjectPath);
+            responseBuilder.setServiceResponseInformation(serviceResponseInformationBuilder.build());
+
+        } catch (IllegalStateException e) {
+            log.error(UPDATING_MDSAL_ERROR_MESSAGE, svcOperation, siid, e);
+            responseBuilder.setResponseCode("500");
+            responseBuilder.setResponseMessage(e.getMessage());
+            responseBuilder.setAckFinalIndicator("Y");
+            log.error(RETURNED_FAILED_MESSAGE, svcOperation, siid, responseBuilder.build());
+
+            RpcResult<ConnectionAttachmentTopologyOperationOutput> rpcResult = RpcResultBuilder
+                .<ConnectionAttachmentTopologyOperationOutput>status(true)
+                .withResult(responseBuilder.build())
+                .build();
+
+            return Futures.immediateFuture(rpcResult);
+        }
+
+        // Update succeeded
+        responseBuilder.setResponseCode(responseObject.getStatusCode());
+        responseBuilder.setAckFinalIndicator(ackFinal);
+        trySetResponseMessage(responseBuilder, responseObject);
+        log.info(UPDATED_MDSAL_INFO_MESSAGE, svcOperation, siid);
+        log.info(RETURNED_SUCCESS_MESSAGE, svcOperation, siid, responseBuilder.build());
+
+        RpcResult<ConnectionAttachmentTopologyOperationOutput> rpcResult = RpcResultBuilder
+            .<ConnectionAttachmentTopologyOperationOutput>status(true)
+            .withResult(responseBuilder.build())
+            .build();
+
+        return Futures.immediateFuture(rpcResult);
+    }
+
+    @Override
+    public ListenableFuture<RpcResult<TunnelxconnTopologyOperationOutput>> tunnelxconnTopologyOperation(
+        TunnelxconnTopologyOperationInput input) {
+
+        final String svcOperation = "tunnelxconn-topology-operation";
+        Properties parms = new Properties();
+        log.info(CALLED_STR, svcOperation);
+
+        // create a new response object
+        TunnelxconnTopologyOperationOutputBuilder responseBuilder = new TunnelxconnTopologyOperationOutputBuilder();
+        if (hasInvalidServiceId(input)) {
+            log.debug(NULL_OR_EMPTY_ERROR_MESSAGE, svcOperation);
+            responseBuilder.setResponseCode("404");
+            responseBuilder.setResponseMessage(NULL_OR_EMPTY_ERROR_PARAM);
+            responseBuilder.setAckFinalIndicator("Y");
+
+            RpcResult<TunnelxconnTopologyOperationOutput> rpcResult = RpcResultBuilder
+                .<TunnelxconnTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
+
+            return Futures.immediateFuture(rpcResult);
+        }
+        String siid = input.getServiceInformation().getServiceInstanceId();
+        log.info(ADDING_INPUT_DATA_LOG, svcOperation, siid, input);
+        TunnelxconnTopologyOperationInputBuilder inputBuilder = new TunnelxconnTopologyOperationInputBuilder(input);
+        GenericResourceApiUtil.toProperties(parms, inputBuilder.build());
+
+        // Call SLI sync method
+
+        ResponseObject responseObject = new ResponseObject("200", "");
+        String ackFinal = "Y";
+        String allottedResourceId = ERROR_NETWORK_ID;
+        String serviceObjectPath = null;
+        String tunnelxconnObjectPath = null;
+        Properties respProps = tryGetProperties(svcOperation, parms, responseObject);
+
+        if (respProps != null) {
+            responseObject.setStatusCode(respProps.getProperty(ERROR_CODE_PARAM));
+            responseObject.setMessage(respProps.getProperty(ERROR_MESSAGE_PARAM));
+            ackFinal = respProps.getProperty(ACK_FINAL_PARAM, "Y");
+            allottedResourceId = respProps.getProperty(ALLOTTED_RESOURCE_ID_PARAM);
+            serviceObjectPath = respProps.getProperty(SERVICE_OBJECT_PATH_PARAM);
+            tunnelxconnObjectPath = respProps.getProperty("tunnelxconn-object-path");
+        }
+
+        if (failed(responseObject)) {
+            responseBuilder.setResponseCode(responseObject.getStatusCode());
+            responseBuilder.setResponseMessage(responseObject.getMessage());
+            responseBuilder.setAckFinalIndicator(ackFinal);
+
+            log.error(RETURNED_FAILED_MESSAGE, svcOperation, siid, responseBuilder.build());
+
+            RpcResult<TunnelxconnTopologyOperationOutput> rpcResult = RpcResultBuilder
+                .<TunnelxconnTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
+
+            return Futures.immediateFuture(rpcResult);
+        }
+
+        // Got success from SLI
+        try {
+            TunnelxconnResponseInformationBuilder tunnelxconnResponseInformationBuilder = new TunnelxconnResponseInformationBuilder();
+            tunnelxconnResponseInformationBuilder.setInstanceId(allottedResourceId);
+            tunnelxconnResponseInformationBuilder.setObjectPath(tunnelxconnObjectPath);
+            responseBuilder.setTunnelxconnResponseInformation(tunnelxconnResponseInformationBuilder.build());
+
+            ServiceResponseInformationBuilder serviceResponseInformationBuilder = new ServiceResponseInformationBuilder();
+            serviceResponseInformationBuilder.setInstanceId(siid);
+            serviceResponseInformationBuilder.setObjectPath(serviceObjectPath);
+            responseBuilder.setServiceResponseInformation(serviceResponseInformationBuilder.build());
+
+        } catch (IllegalStateException e) {
+            log.error(UPDATING_MDSAL_ERROR_MESSAGE, svcOperation, siid, e);
+            responseBuilder.setResponseCode("500");
+            responseBuilder.setResponseMessage(e.getMessage());
+            responseBuilder.setAckFinalIndicator("Y");
+            log.error(RETURNED_FAILED_MESSAGE, svcOperation, siid, responseBuilder.build());
+
+            RpcResult<TunnelxconnTopologyOperationOutput> rpcResult = RpcResultBuilder
+                .<TunnelxconnTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
+
+            return Futures.immediateFuture(rpcResult);
+        }
+
+        // Update succeeded
+        responseBuilder.setResponseCode(responseObject.getStatusCode());
+        responseBuilder.setAckFinalIndicator(ackFinal);
+        trySetResponseMessage(responseBuilder, responseObject);
+        log.info(UPDATED_MDSAL_INFO_MESSAGE, svcOperation, siid);
+        log.info(RETURNED_SUCCESS_MESSAGE, svcOperation, siid, responseBuilder.build());
+
+        RpcResult<TunnelxconnTopologyOperationOutput> rpcResult = RpcResultBuilder
+            .<TunnelxconnTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
+
+        return Futures.immediateFuture(rpcResult);
+    }
+
+    private void trySetResponseMessage(TunnelxconnTopologyOperationOutputBuilder responseBuilder,
+        ResponseObject responseObject) {
+        if (responseObject.getMessage() != null) {
+            responseBuilder.setResponseMessage(responseObject.getMessage());
+        }
+    }
+
+    private boolean hasInvalidServiceId(TunnelxconnTopologyOperationInput input) {
+        return input == null || input.getServiceInformation() == null
+            || input.getServiceInformation().getServiceInstanceId() == null
+            || input.getServiceInformation().getServiceInstanceId().length() == 0;
+    }
+
+    private Properties tryGetProperties(String svcOperation, Properties parms, ResponseObject responseObject) {
+        try {
+            if (svcLogicClient.hasGraph(APP_NAME, svcOperation, null, "sync")) {
+
+                try {
+                    return svcLogicClient.execute(APP_NAME, svcOperation, null, "sync", parms);
+                } catch (Exception e) {
+                    log.error(SERVICE_LOGIC_EXECUTION_ERROR_MESSAGE, svcOperation, e);
+                    responseObject.setMessage(e.getMessage());
+                    responseObject.setStatusCode("500");
+                }
+            } else {
+                responseObject.setMessage(NO_SERVICE_LOGIC_ACTIVE + APP_NAME + ": '" + svcOperation + "'");
+                responseObject.setStatusCode("503");
+            }
+        } catch (Exception e) {
+            responseObject.setMessage(e.getMessage());
+            responseObject.setStatusCode("500");
+            log.error(SERVICE_LOGIC_SEARCH_ERROR_MESSAGE, e);
+        }
+        return null;
+    }
+
+    @Override
+    public ListenableFuture<RpcResult<BrgTopologyOperationOutput>> brgTopologyOperation(
+        BrgTopologyOperationInput input) {
+        final String svcOperation = "brg-topology-operation";
+        Properties parms = new Properties();
+
+        log.info(CALLED_STR, svcOperation);
+        // create a new response object
+        BrgTopologyOperationOutputBuilder responseBuilder = new BrgTopologyOperationOutputBuilder();
+
+        if (this.hasInvalidServiceId(input)) {
+
+            log.debug(NULL_OR_EMPTY_ERROR_MESSAGE, svcOperation);
+            responseBuilder.setResponseCode("404");
+            responseBuilder.setResponseMessage(NULL_OR_EMPTY_ERROR_PARAM);
+            responseBuilder.setAckFinalIndicator("Y");
+
+            RpcResult<BrgTopologyOperationOutput> rpcResult = RpcResultBuilder.<BrgTopologyOperationOutput>status(true)
+                .withResult(responseBuilder.build()).build();
+
+            return Futures.immediateFuture(rpcResult);
+        }
+
+        String siid = input.getServiceInformation().getServiceInstanceId();
+
+        log.info(ADDING_INPUT_DATA_LOG, svcOperation, siid, input);
+        BrgTopologyOperationInputBuilder inputBuilder = new BrgTopologyOperationInputBuilder(input);
+        GenericResourceApiUtil.toProperties(parms, inputBuilder.build());
+
+        // Call SLI sync method
+
+        ResponseObject responseObject = new ResponseObject("200", "");
+        String ackFinal = "Y";
+        String allottedResourceId = ERROR_NETWORK_ID;
+        String serviceObjectPath = null;
+        String brgObjectPath = null;
+        Properties respProps = tryGetProperties(svcOperation, parms, responseObject);
+
+        if (respProps != null) {
+            responseObject.setStatusCode(respProps.getProperty(ERROR_CODE_PARAM));
+            responseObject.setMessage(respProps.getProperty(ERROR_MESSAGE_PARAM));
+            ackFinal = respProps.getProperty(ACK_FINAL_PARAM, "Y");
+            allottedResourceId = respProps.getProperty(ALLOTTED_RESOURCE_ID_PARAM);
+            serviceObjectPath = respProps.getProperty(SERVICE_OBJECT_PATH_PARAM);
+            brgObjectPath = respProps.getProperty("brg-object-path");
+        }
+
+        if (failed(responseObject)) {
+            responseBuilder.setResponseCode(responseObject.getStatusCode());
+            responseBuilder.setResponseMessage(responseObject.getMessage());
+            responseBuilder.setAckFinalIndicator(ackFinal);
+
+            log.error(RETURNED_FAILED_MESSAGE, svcOperation, siid, responseBuilder.build());
+            RpcResult<BrgTopologyOperationOutput> rpcResult = RpcResultBuilder.<BrgTopologyOperationOutput>status(true)
+                .withResult(responseBuilder.build()).build();
+
+            return Futures.immediateFuture(rpcResult);
+        }
+
+        // Got success from SLI
+        try {
+
+            BrgResponseInformationBuilder brgResponseInformationBuilder = new BrgResponseInformationBuilder();
+            brgResponseInformationBuilder.setInstanceId(allottedResourceId);
+            brgResponseInformationBuilder.setObjectPath(brgObjectPath);
+            responseBuilder.setBrgResponseInformation(brgResponseInformationBuilder.build());
+
+            ServiceResponseInformationBuilder serviceResponseInformationBuilder = new ServiceResponseInformationBuilder();
+            serviceResponseInformationBuilder.setInstanceId(siid);
+            serviceResponseInformationBuilder.setObjectPath(serviceObjectPath);
+            responseBuilder.setServiceResponseInformation(serviceResponseInformationBuilder.build());
+
+        } catch (IllegalStateException e) {
+            log.error(UPDATING_MDSAL_ERROR_MESSAGE, svcOperation, siid, e);
+            responseBuilder.setResponseCode("500");
+            responseBuilder.setResponseMessage(e.getMessage());
+            responseBuilder.setAckFinalIndicator("Y");
+            log.error(RETURNED_FAILED_MESSAGE, svcOperation, siid, responseBuilder.build());
+
+            RpcResult<BrgTopologyOperationOutput> rpcResult = RpcResultBuilder.<BrgTopologyOperationOutput>status(true)
+                .withResult(responseBuilder.build()).build();
+
+            return Futures.immediateFuture(rpcResult);
+        }
+
+        // Update succeeded
+        responseBuilder.setResponseCode(responseObject.getStatusCode());
+        responseBuilder.setAckFinalIndicator(ackFinal);
+        trySetResponseMessage(responseBuilder, responseObject);
+        log.info(UPDATED_MDSAL_INFO_MESSAGE, svcOperation, siid);
+        log.info(RETURNED_SUCCESS_MESSAGE, svcOperation, siid, responseBuilder.build());
+
+        RpcResult<BrgTopologyOperationOutput> rpcResult = RpcResultBuilder.<BrgTopologyOperationOutput>status(true)
+            .withResult(responseBuilder.build()).build();
+
+        return Futures.immediateFuture(rpcResult);
+    }
+
+    private void trySetResponseMessage(BrgTopologyOperationOutputBuilder responseBuilder,
+        ResponseObject responseObject) {
+        if (responseObject.getMessage() != null) {
+            responseBuilder.setResponseMessage(responseObject.getMessage());
+        }
+    }
+
+    private boolean hasInvalidServiceId(BrgTopologyOperationInput input) {
+        return input == null || input.getServiceInformation() == null
+            || input.getServiceInformation().getServiceInstanceId() == null
+            || input.getServiceInformation().getServiceInstanceId().length() == 0;
+    }
+
+    private String resolveAckFinal(ResponseObject responseObject, Properties respProps) {
+        if (respProps != null) {
+            responseObject.setStatusCode(respProps.getProperty(ERROR_CODE_PARAM));
+            responseObject.setMessage(respProps.getProperty(ERROR_MESSAGE_PARAM));
+            return respProps.getProperty(ACK_FINAL_PARAM, "Y");
+        }
+        return "Y";
+    }
+
+    @Override
+    public ListenableFuture<RpcResult<PreloadNetworkTopologyOperationOutput>> preloadNetworkTopologyOperation(
+        PreloadNetworkTopologyOperationInput input) {
+
+        final String svcOperation = "preload-network-topology-operation";
+        PreloadData preloadData;
+        Properties properties = new Properties();
+
+        log.info(CALLED_STR, svcOperation);
+        // create a new response object
+        PreloadNetworkTopologyOperationOutputBuilder responseBuilder = new PreloadNetworkTopologyOperationOutputBuilder();
+
+        if (hasInvalidPreloadNetwork(input)) {
+            log.debug("exiting {} because of null or empty preload-network-topology-information", svcOperation);
+            responseBuilder.setResponseCode("403");
+            responseBuilder.setResponseMessage("invalid input, null or empty preload-network-topology-information");
+            responseBuilder.setAckFinalIndicator("Y");
+
+            RpcResult<PreloadNetworkTopologyOperationOutput> rpcResult = RpcResultBuilder
+                .<PreloadNetworkTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
+
+            return Futures.immediateFuture(rpcResult);
+        }
+
+        // Grab the preload ID from the input buffer
+        String preloadId = input.getPreloadNetworkTopologyInformation().getNetworkTopologyIdentifierStructure()
+            .getNetworkName();
+        String preloadType = "network";
+
+        trySetSvcRequestId(input, responseBuilder);
+
+        PreloadDataBuilder preloadDataBuilder = new PreloadDataBuilder();
+        getPreloadData(preloadId, preloadType, preloadDataBuilder);
+
+        PreloadDataBuilder operDataBuilder = new PreloadDataBuilder();
+        getPreloadData(preloadId, preloadType, operDataBuilder, LogicalDatastoreType.OPERATIONAL);
+
+        //
+        // setup a preload-data object builder
+        // ACTION preload-network-topology-operation
+        // INPUT:
+        // uses sdnc-request-header;
+        // uses request-information;
+        // uses preload-network-topology-information;
+        // OUTPUT:
+        // uses preload-topology-response-body;
+        //
+        // container preload-data
+        // uses preload-network-topology-information;
+        // uses preload-oper-status;
+
+        log.info(ADDING_INPUT_DATA_LOG, svcOperation, preloadId, input);
+        PreloadNetworkTopologyOperationInputBuilder inputBuilder = new PreloadNetworkTopologyOperationInputBuilder(
+            input);
+        GenericResourceApiUtil.toProperties(properties, inputBuilder.build());
+        log.info(ADDING_OPERATIONAL_DATA_LOG, svcOperation, preloadId, input);
+        GenericResourceApiUtil.toProperties(properties, OPERATIONAL_DATA_PARAM, operDataBuilder);
+
+        // Call SLI sync method
+        ResponseObject responseObject = new ResponseObject("200", "");
+        String ackFinal = "Y";
+        Properties respProps = tryGetProperties(svcOperation, properties, preloadDataBuilder, responseObject);
+
+        if (respProps != null) {
+            responseObject.setStatusCode(respProps.getProperty(ERROR_CODE_PARAM));
+            responseObject.setMessage(respProps.getProperty(ERROR_MESSAGE_PARAM));
+            ackFinal = respProps.getProperty(ACK_FINAL_PARAM, "Y");
+        }
+
+        if (failed(responseObject)) {
+            responseBuilder.setResponseCode(responseObject.getStatusCode());
+            responseBuilder.setResponseMessage(responseObject.getMessage());
+            responseBuilder.setAckFinalIndicator(ackFinal);
+            log.error(RETURNED_FAILED_MESSAGE, svcOperation, preloadId, responseBuilder.build());
+            RpcResult<PreloadNetworkTopologyOperationOutput> rpcResult = RpcResultBuilder
+                .<PreloadNetworkTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
+            return Futures.immediateFuture(rpcResult);
+        }
+
+        // Got success from SLI
+        try {
+            preloadData = preloadDataBuilder.build();
+            log.info(UPDATING_MDSAL_INFO_MESSAGE, svcOperation, preloadId, preloadData);
+
+            // preload-list object
+            PreloadListBuilder preloadListBuilder = new PreloadListBuilder();
+            preloadListBuilder.setPreloadId(preloadId);
+            preloadListBuilder.setPreloadType(preloadType);
+            preloadListBuilder.setPreloadData(preloadData);
+
+            savePreloadList(preloadListBuilder.build(), false, LogicalDatastoreType.CONFIGURATION);
+            log.info(UPDATING_TREE_INFO_MESSAGE);
+            savePreloadList(preloadListBuilder.build(), false, LogicalDatastoreType.OPERATIONAL);
+
+            tryDeletePreload(input, preloadListBuilder);
+        } catch (Exception e) {
+            log.error(UPDATING_MDSAL_ERROR_MESSAGE, svcOperation, preloadId, e);
+            responseBuilder.setResponseCode("500");
+            responseBuilder.setResponseMessage(e.getMessage());
+            responseBuilder.setAckFinalIndicator("Y");
+            log.error(RETURNED_FAILED_MESSAGE, svcOperation, preloadId, responseBuilder.build());
+            RpcResult<PreloadNetworkTopologyOperationOutput> rpcResult = RpcResultBuilder
+                .<PreloadNetworkTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
+            return Futures.immediateFuture(rpcResult);
+        }
+
+        // Update succeeded
+        responseBuilder.setResponseCode(responseObject.getStatusCode());
+        responseBuilder.setAckFinalIndicator(ackFinal);
+        trySetResponseMessage(responseBuilder, responseObject);
+        log.info(UPDATED_MDSAL_INFO_MESSAGE, svcOperation, preloadId);
+        log.info(RETURNED_SUCCESS_MESSAGE, svcOperation, preloadId, responseBuilder.build());
+
+        RpcResult<PreloadNetworkTopologyOperationOutput> rpcResult = RpcResultBuilder
+            .<PreloadNetworkTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
+        return Futures.immediateFuture(rpcResult);
+    }
+
+    private boolean hasInvalidPreloadNetwork(PreloadNetworkTopologyOperationInput input) {
+        return input == null || input.getPreloadNetworkTopologyInformation() == null
+            || input.getPreloadNetworkTopologyInformation().getNetworkTopologyIdentifierStructure() == null;
+    }
+
+    private boolean hasInvalidPreloadId(String preloadId) {
+        return preloadId == null || preloadId.length() == 0;
+    }
+
+    private void trySetSvcRequestId(PreloadNetworkTopologyOperationInput input,
+        PreloadNetworkTopologyOperationOutputBuilder responseBuilder) {
+        if (input.getSdncRequestHeader() != null) {
+            responseBuilder.setSvcRequestId(input.getSdncRequestHeader().getSvcRequestId());
+        }
+    }
+
+    private Properties tryGetProperties(String svcOperation, Properties parms, PreloadDataBuilder preloadDataBuilder,
+        ResponseObject responseObject) {
+        try {
+            if (svcLogicClient.hasGraph(APP_NAME, svcOperation, null, "sync")) {
+                try {
+                    return svcLogicClient.execute(APP_NAME, svcOperation, null, "sync", preloadDataBuilder, parms);
+                } catch (Exception e) {
+                    log.error(SERVICE_LOGIC_EXECUTION_ERROR_MESSAGE, svcOperation, e);
+                    responseObject.setMessage(e.getMessage());
+                    responseObject.setStatusCode("500");
+                }
+            } else {
+                responseObject.setMessage(NO_SERVICE_LOGIC_ACTIVE + APP_NAME + ": '" + svcOperation + "'");
+                responseObject.setStatusCode("503");
+            }
+        } catch (Exception e) {
+            responseObject.setMessage(e.getMessage());
+            responseObject.setStatusCode("500");
+            log.error(SERVICE_LOGIC_SEARCH_ERROR_MESSAGE, e);
+        }
+
+        return null;
+    }
+
+    private void trySetResponseMessage(PreloadNetworkTopologyOperationOutputBuilder responseBuilder,
+        ResponseObject responseObject) {
+        if (responseObject.getMessage() != null) {
+            if (!responseObject.getMessage().isEmpty()) {
+                responseBuilder.setResponseMessage(responseObject.getMessage());
+            }
+        }
+    }
+
+    private void tryDeletePreload(PreloadNetworkTopologyOperationInput input, PreloadListBuilder preloadListBuilder) {
+        if (input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Delete)) {
+            log.info("Delete from both CONFIGURATION and OPERATIONAL tree.");
+            deletePreloadList(preloadListBuilder.build(), LogicalDatastoreType.OPERATIONAL);
+            deletePreloadList(preloadListBuilder.build(), LogicalDatastoreType.CONFIGURATION);
+        }
+    }
+
+    @Override
+    public ListenableFuture<RpcResult<PreloadVfModuleTopologyOperationOutput>> preloadVfModuleTopologyOperation(
+        PreloadVfModuleTopologyOperationInput input) {
+
+        final String svcOperation = "preload-vf-module-topology-operation";
+        PreloadData preloadData;
+        Properties properties = new Properties();
+
+        log.info(CALLED_STR, svcOperation);
+        // create a new response object
+        PreloadVfModuleTopologyOperationOutputBuilder responseBuilder = new PreloadVfModuleTopologyOperationOutputBuilder();
+
+        if (hasInvalidPreloadVfModule(input)) {
+            log.debug(
+                "exiting {} because of null or empty preload-vf-module-topology-information.vf-module-topology.vf-module-topology-identifier.vf-module-name",
+                svcOperation);
+            responseBuilder.setResponseCode("403");
+            responseBuilder.setResponseMessage(
+                "invalid input, null or empty preload-vf-module-topology-information.vf-module-topology.vf-module-topology-identifier.vf-module-name");
+            responseBuilder.setAckFinalIndicator("Y");
+
+            RpcResult<PreloadVfModuleTopologyOperationOutput> rpcResult = RpcResultBuilder
+                .<PreloadVfModuleTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
+
+            return Futures.immediateFuture(rpcResult);
+        }
+
+        // Grab the preload ID from the input buffer
+        String preloadId = input.getPreloadVfModuleTopologyInformation().getVfModuleTopology()
+            .getVfModuleTopologyIdentifier().getVfModuleName();
+        String preloadType = "vf-module";
+
+        trySetSvcRequestId(input, responseBuilder);
+
+        PreloadDataBuilder preloadDataBuilder = new PreloadDataBuilder();
+        getPreloadData(preloadId, preloadType, preloadDataBuilder);
+
+        PreloadDataBuilder operDataBuilder = new PreloadDataBuilder();
+        getPreloadData(preloadId, preloadType, operDataBuilder, LogicalDatastoreType.OPERATIONAL);
+
+        //
+        // setup a preload-data object builder
+        // ACTION preload-vf-module-topology-operation
+        // INPUT:
+        // uses sdnc-request-header;
+        // uses request-information;
+        // uses preload-vnf-topology-information;
+        // OUTPUT:
+        // uses preload-topology-response-body;
+        //
+        // container preload-data
+        // uses preload-vf-module-topology-information;
+        // uses preload-oper-status;
+
+        log.info(ADDING_INPUT_DATA_LOG, svcOperation, preloadId, input);
+        PreloadVfModuleTopologyOperationInputBuilder inputBuilder = new PreloadVfModuleTopologyOperationInputBuilder(
+            input);
+        GenericResourceApiUtil.toProperties(properties, inputBuilder.build());
+        log.info(ADDING_OPERATIONAL_DATA_LOG, svcOperation, preloadId, input);
+        GenericResourceApiUtil.toProperties(properties, OPERATIONAL_DATA_PARAM, operDataBuilder);
+
+        // Call SLI sync method
+        ResponseObject responseObject = new ResponseObject("200", "");
+        String ackFinal = "Y";
+        Properties respProps = tryGetProperties(svcOperation, properties, preloadDataBuilder, responseObject);
+
+        if (respProps != null) {
+            responseObject.setStatusCode(respProps.getProperty(ERROR_CODE_PARAM));
+            responseObject.setMessage(respProps.getProperty(ERROR_MESSAGE_PARAM));
+            ackFinal = respProps.getProperty(ACK_FINAL_PARAM, "Y");
+        }
+
+        if (failed(responseObject)) {
+            responseBuilder.setResponseCode(responseObject.getStatusCode());
+            responseBuilder.setResponseMessage(responseObject.getMessage());
+            responseBuilder.setAckFinalIndicator(ackFinal);
+            log.error(RETURNED_FAILED_MESSAGE, svcOperation, preloadId, responseBuilder.build());
+            RpcResult<PreloadVfModuleTopologyOperationOutput> rpcResult = RpcResultBuilder
+                .<PreloadVfModuleTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
+            return Futures.immediateFuture(rpcResult);
+        }
+
+        // Got success from SLI
+        try {
+            preloadData = preloadDataBuilder.build();
+            log.info(UPDATING_MDSAL_INFO_MESSAGE, svcOperation, preloadId, preloadData);
+
+            // preload-list object
+            PreloadListBuilder preloadListBuilder = new PreloadListBuilder();
+            preloadListBuilder.setPreloadId(preloadId);
+            preloadListBuilder.setPreloadType(preloadType);
+            preloadListBuilder.setPreloadData(preloadData);
+
+            savePreloadList(preloadListBuilder.build(), false, LogicalDatastoreType.CONFIGURATION);
+            log.info(UPDATING_TREE_INFO_MESSAGE);
+            savePreloadList(preloadListBuilder.build(), false, LogicalDatastoreType.OPERATIONAL);
+
+            tryDeletePreload(input, preloadListBuilder);
+
+        } catch (Exception e) {
+            log.error(UPDATING_MDSAL_ERROR_MESSAGE, svcOperation, preloadId, e);
+            responseBuilder.setResponseCode("500");
+            responseBuilder.setResponseMessage(e.getMessage());
+            responseBuilder.setAckFinalIndicator("Y");
+            log.error(RETURNED_FAILED_MESSAGE, svcOperation, preloadId, responseBuilder.build());
+            RpcResult<PreloadVfModuleTopologyOperationOutput> rpcResult = RpcResultBuilder
+                .<PreloadVfModuleTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
+            return Futures.immediateFuture(rpcResult);
+        }
+
+        // Update succeeded
+        responseBuilder.setResponseCode(responseObject.getStatusCode());
+        responseBuilder.setAckFinalIndicator(ackFinal);
+        trySetResponseMessage(responseBuilder, responseObject);
+        log.info(UPDATED_MDSAL_INFO_MESSAGE, svcOperation, preloadId);
+        log.info(RETURNED_SUCCESS_MESSAGE, svcOperation, preloadId, responseBuilder.build());
+
+        RpcResult<PreloadVfModuleTopologyOperationOutput> rpcResult = RpcResultBuilder
+            .<PreloadVfModuleTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
+        return Futures.immediateFuture(rpcResult);
+    }
+
+    private boolean hasInvalidPreloadVfModule(PreloadVfModuleTopologyOperationInput input) {
+        return input == null || input.getPreloadVfModuleTopologyInformation() == null
+            || input.getPreloadVfModuleTopologyInformation().getVfModuleTopology() == null
+            || input.getPreloadVfModuleTopologyInformation().getVfModuleTopology()
+            .getVfModuleTopologyIdentifier() == null
+            || input.getPreloadVfModuleTopologyInformation().getVfModuleTopology().getVfModuleTopologyIdentifier()
+            .getVfModuleName() == null;
+    }
+
+    private void trySetSvcRequestId(PreloadVfModuleTopologyOperationInput input,
+        PreloadVfModuleTopologyOperationOutputBuilder responseBuilder) {
+        if (input.getSdncRequestHeader() != null) {
+            responseBuilder.setSvcRequestId(input.getSdncRequestHeader().getSvcRequestId());
+        }
+    }
+
+    private void trySetResponseMessage(PreloadVfModuleTopologyOperationOutputBuilder responseBuilder,
+        ResponseObject responseObject) {
+        if (responseObject.getMessage() != null) {
+            if (!responseObject.getMessage().isEmpty()) {
+                responseBuilder.setResponseMessage(responseObject.getMessage());
+            }
+        }
+    }
+
+    private void tryDeletePreload(PreloadVfModuleTopologyOperationInput input, PreloadListBuilder preloadListBuilder) {
+        if (input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Delete)) {
+            log.info("Delete from both CONFIGURATION and OPERATIONAL tree.");
+            deletePreloadList(preloadListBuilder.build(), LogicalDatastoreType.OPERATIONAL);
+            deletePreloadList(preloadListBuilder.build(), LogicalDatastoreType.CONFIGURATION);
+        }
+    }
+
+    @Override
+    public ListenableFuture<RpcResult<GenericConfigurationTopologyOperationOutput>> genericConfigurationTopologyOperation(
+        GenericConfigurationTopologyOperationInput input) {
+
+        final String svcOperation = "generic-configuration-topology-operation";
+        ServiceData serviceData;
+        ServiceStatusBuilder serviceStatusBuilder = new ServiceStatusBuilder();
+        Properties parms = new Properties();
+
+        log.info(CALLED_STR, svcOperation);
+        // create a new response object
+        GenericConfigurationTopologyOperationOutputBuilder responseBuilder = new GenericConfigurationTopologyOperationOutputBuilder();
+
+        if (hasInvalidService(input)) {
+            log.debug(NULL_OR_EMPTY_ERROR_MESSAGE, svcOperation);
+            responseBuilder.setResponseCode("404");
+            responseBuilder.setResponseMessage(NULL_OR_EMPTY_ERROR_PARAM);
+            responseBuilder.setAckFinalIndicator("Y");
+
+            RpcResult<GenericConfigurationTopologyOperationOutput> rpcResult = RpcResultBuilder
+                .<GenericConfigurationTopologyOperationOutput>status(true).withResult(responseBuilder.build())
+                .build();
+
+            return Futures.immediateFuture(rpcResult);
+        }
+
+        // Grab the service instance ID from the input buffer
+        String siid = input.getServiceInformation().getServiceInstanceId();
+
+        trySetSvcRequestId(input, responseBuilder);
+
+        if (hasInvalidConfigurationIdOrType(input)) {
+            log.debug("exiting {} because of null or empty configuration-id or configuration-type", svcOperation);
+            responseBuilder.setResponseCode("404");
+            responseBuilder.setResponseMessage("invalid input, null or empty configuration-id or configuration-type");
+            responseBuilder.setAckFinalIndicator("Y");
+            RpcResult<GenericConfigurationTopologyOperationOutput> rpcResult = RpcResultBuilder
+                .<GenericConfigurationTopologyOperationOutput>status(true).withResult(responseBuilder.build())
+                .build();
+            return Futures.immediateFuture(rpcResult);
+        }
+
+        // Grab the configuration ID from the input buffer
+        String configId = input.getConfigurationInformation().getConfigurationId();
+
+        ServiceDataBuilder serviceDataBuilder = new ServiceDataBuilder();
+        getServiceData(siid, serviceDataBuilder);
+
+        ServiceDataBuilder operDataBuilder = new ServiceDataBuilder();
+        getServiceData(siid, operDataBuilder, LogicalDatastoreType.OPERATIONAL);
+
+        // Set the serviceStatus based on input
+        setServiceStatus(serviceStatusBuilder, input.getSdncRequestHeader());
+        setServiceStatus(serviceStatusBuilder, input.getRequestInformation());
+
+        log.info(ADDING_INPUT_DATA_LOG, svcOperation, siid, input);
+        GenericConfigurationTopologyOperationInputBuilder inputBuilder = new GenericConfigurationTopologyOperationInputBuilder(
+            input);
+        GenericResourceApiUtil.toProperties(parms, inputBuilder.build());
+
+        log.info(ADDING_OPERATIONAL_DATA_LOG, svcOperation, siid, operDataBuilder.build());
+        GenericResourceApiUtil.toProperties(parms, OPERATIONAL_DATA_PARAM, operDataBuilder);
+
+        // Call SLI sync method
+
+        ResponseObject responseObject = new ResponseObject("200", "");
+        String ackFinal = "Y";
+        String serviceObjectPath = "";
+        Properties respProps = tryGetProperties(svcOperation, parms, serviceDataBuilder, responseObject);
+
+        if (respProps != null) {
+            responseObject.setStatusCode(respProps.getProperty(ERROR_CODE_PARAM));
+            responseObject.setMessage(respProps.getProperty(ERROR_MESSAGE_PARAM));
+            ackFinal = respProps.getProperty(ACK_FINAL_PARAM, "Y");
+            serviceObjectPath = respProps.getProperty(SERVICE_OBJECT_PATH_PARAM);
+        }
+
+        setServiceStatus(serviceStatusBuilder, responseObject.getStatusCode(), responseObject.getMessage(), ackFinal);
+        serviceStatusBuilder.setRequestStatus(RequestStatus.Synccomplete);
+        serviceStatusBuilder.setRpcName(svcOperation);
+
+        if (failed(responseObject)) {
+            responseBuilder.setResponseCode(responseObject.getStatusCode());
+            responseBuilder.setResponseMessage(responseObject.getMessage());
+            responseBuilder.setAckFinalIndicator(ackFinal);
+
+            ServiceBuilder serviceBuilder = new ServiceBuilder();
+            serviceBuilder.setServiceInstanceId(siid);
+            serviceBuilder.setServiceStatus(serviceStatusBuilder.build());
+            try {
+                saveService(serviceBuilder.build(), true, LogicalDatastoreType.CONFIGURATION);
+            } catch (Exception e) {
+                log.error(UPDATING_MDSAL_ERROR_MESSAGE, svcOperation, siid, e);
+            }
+            log.error(RETURNED_FAILED_MESSAGE, svcOperation, siid, responseBuilder.build());
+
+            RpcResult<GenericConfigurationTopologyOperationOutput> rpcResult = RpcResultBuilder
+                .<GenericConfigurationTopologyOperationOutput>status(true).withResult(responseBuilder.build())
+                .build();
+
+            return Futures.immediateFuture(rpcResult);
+        }
+
+        // Got success from SLI
+        try {
+            serviceData = serviceDataBuilder.build();
+
+            // service object
+            ServiceBuilder serviceBuilder = new ServiceBuilder();
+            serviceBuilder.setServiceData(serviceData);
+            serviceBuilder.setServiceInstanceId(siid);
+            serviceBuilder.setServiceStatus(serviceStatusBuilder.build());
+            saveService(serviceBuilder.build(), false, LogicalDatastoreType.CONFIGURATION);
+
+            ServiceResponseInformationBuilder serviceResponseInformationBuilder = new ServiceResponseInformationBuilder();
+            serviceResponseInformationBuilder.setInstanceId(siid);
+            serviceResponseInformationBuilder.setObjectPath(serviceObjectPath);
+            responseBuilder.setServiceResponseInformation(serviceResponseInformationBuilder.build());
+            GcResponseInformationBuilder gcResponseInformationBuilder = new GcResponseInformationBuilder();
+            gcResponseInformationBuilder.setInstanceId(configId);
+            responseBuilder.setGcResponseInformation(gcResponseInformationBuilder.build());
+
+        } catch (Exception e) {
+            log.error(UPDATING_MDSAL_ERROR_MESSAGE, svcOperation, siid, e);
+            responseBuilder.setResponseCode("500");
+            responseBuilder.setResponseMessage(e.getMessage());
+            responseBuilder.setAckFinalIndicator("Y");
+            RpcResult<GenericConfigurationTopologyOperationOutput> rpcResult = RpcResultBuilder
+                .<GenericConfigurationTopologyOperationOutput>status(true).withResult(responseBuilder.build())
+                .build();
+
+            return Futures.immediateFuture(rpcResult);
+        }
+
+        // Update succeeded
+        responseBuilder.setResponseCode(responseObject.getStatusCode());
+        responseBuilder.setAckFinalIndicator(ackFinal);
+        trySetResponseMessage(responseBuilder, responseObject);
+        log.info(UPDATED_MDSAL_INFO_MESSAGE, svcOperation, siid);
+        log.info(RETURNED_SUCCESS_MESSAGE, svcOperation, siid, responseBuilder.build());
+
+        RpcResult<GenericConfigurationTopologyOperationOutput> rpcResult = RpcResultBuilder
+            .<GenericConfigurationTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
+
+        return Futures.immediateFuture(rpcResult);
+    }
+
+    private boolean hasInvalidService(GenericConfigurationTopologyOperationInput input) {
+        return input == null || input.getServiceInformation() == null
+            || input.getServiceInformation().getServiceInstanceId() == null
+            || input.getServiceInformation().getServiceInstanceId().length() == 0;
+    }
+
+    private void trySetSvcRequestId(GenericConfigurationTopologyOperationInput input,
+        GenericConfigurationTopologyOperationOutputBuilder responseBuilder) {
+        if (input.getSdncRequestHeader() != null) {
+            responseBuilder.setSvcRequestId(input.getSdncRequestHeader().getSvcRequestId());
+        }
+    }
+
+    private boolean hasInvalidConfigurationIdOrType(GenericConfigurationTopologyOperationInput input) {
+        return input.getConfigurationInformation() == null
+            || input.getConfigurationInformation().getConfigurationId() == null
+            || input.getConfigurationInformation().getConfigurationType() == null;
+    }
+
+    private void trySetResponseMessage(GenericConfigurationTopologyOperationOutputBuilder responseBuilder,
+        ResponseObject responseObject) {
+        if (responseObject.getMessage() != null) {
+            if (!responseObject.getMessage().isEmpty()) {
+                responseBuilder.setResponseMessage(responseObject.getMessage());
+            }
+        }
+    }
+
+    @Override
+    public ListenableFuture<RpcResult<GenericConfigurationNotificationOutput>> genericConfigurationNotification(
+        GenericConfigurationNotificationInput input) {
+
+        final String svcOperation = "generic-configuration-notification";
+        ServiceData serviceData;
+        ServiceStatusBuilder serviceStatusBuilder = new ServiceStatusBuilder();
+        Properties parms = new Properties();
+
+        log.info(CALLED_STR, svcOperation);
+
+        // Grab the service instance ID from the input buffer
+        String siid = input.getServiceInformation().getServiceInstanceId();
+
+        ServiceDataBuilder serviceDataBuilder = new ServiceDataBuilder();
+        getServiceData(siid, serviceDataBuilder);
+
+        ServiceDataBuilder operDataBuilder = new ServiceDataBuilder();
+        getServiceData(siid, operDataBuilder, LogicalDatastoreType.OPERATIONAL);
+
+        // Set the serviceStatus based on input
+        setServiceStatus(serviceStatusBuilder, input.getSdncRequestHeader());
+        setServiceStatus(serviceStatusBuilder, input.getRequestInformation());
+
+        log.info(ADDING_INPUT_DATA_LOG, svcOperation, siid, input);
+        GenericConfigurationNotificationInputBuilder inputBuilder = new GenericConfigurationNotificationInputBuilder(
+            input);
+        GenericResourceApiUtil.toProperties(parms, inputBuilder.build());
+
+        log.info(ADDING_OPERATIONAL_DATA_LOG, svcOperation, siid, operDataBuilder.build());
+        GenericResourceApiUtil.toProperties(parms, OPERATIONAL_DATA_PARAM, operDataBuilder);
+
+        // Call SLI sync method
+
+        ResponseObject responseObject = new ResponseObject("200", "");
+        String ackFinal = "Y";
+        Properties respProps = tryGetProperties(svcOperation, parms, serviceDataBuilder, responseObject);
+
+        if (respProps != null) {
+            responseObject.setStatusCode(respProps.getProperty(ERROR_CODE_PARAM));
+            responseObject.setMessage(respProps.getProperty(ERROR_MESSAGE_PARAM));
+            ackFinal = respProps.getProperty(ACK_FINAL_PARAM, "Y");
+        }
+
+        setServiceStatus(serviceStatusBuilder, responseObject.getStatusCode(), responseObject.getMessage(), ackFinal);
+        serviceStatusBuilder.setRequestStatus(RequestStatus.Synccomplete);
+        serviceStatusBuilder.setRpcName(svcOperation);
+
+        if (failed(responseObject)) {
+            ServiceBuilder serviceBuilder = new ServiceBuilder();
+            serviceBuilder.setServiceInstanceId(siid);
+            serviceBuilder.setServiceStatus(serviceStatusBuilder.build());
+            try {
+                saveService(serviceBuilder.build(), true, LogicalDatastoreType.CONFIGURATION);
+            } catch (Exception e) {
+                log.error(UPDATING_MDSAL_ERROR_MESSAGE, svcOperation, siid, e);
+            }
+
+            RpcResult<GenericConfigurationNotificationOutput> rpcResult = RpcResultBuilder.<GenericConfigurationNotificationOutput>status(
+                true).build();
+
+            return Futures.immediateFuture(rpcResult);
+        }
+
+        // Got success from SLI
+        try {
+            serviceData = serviceDataBuilder.build();
+
+            // service object
+            ServiceBuilder serviceBuilder = new ServiceBuilder();
+            serviceBuilder.setServiceData(serviceData);
+            serviceBuilder.setServiceInstanceId(siid);
+            serviceBuilder.setServiceStatus(serviceStatusBuilder.build());
+            saveService(serviceBuilder.build(), false, LogicalDatastoreType.CONFIGURATION);
+
+            ServiceResponseInformationBuilder serviceResponseInformationBuilder = new ServiceResponseInformationBuilder();
+            serviceResponseInformationBuilder.setInstanceId(siid);
+
+        } catch (Exception e) {
+            log.error(UPDATING_MDSAL_ERROR_MESSAGE, svcOperation, siid, e);
+            RpcResult<GenericConfigurationNotificationOutput> rpcResult = RpcResultBuilder.<GenericConfigurationNotificationOutput>status(
+                true).build();
+
+            return Futures.immediateFuture(rpcResult);
+        }
+
+        // Update succeeded
+        log.info(UPDATED_MDSAL_INFO_MESSAGE, svcOperation, siid);
+
+        RpcResult<GenericConfigurationNotificationOutput> rpcResult = RpcResultBuilder.<GenericConfigurationNotificationOutput>status(
+            true).build();
+
+        return Futures.immediateFuture(rpcResult);
+    }
+
+    @Override
+    public ListenableFuture<RpcResult<GetpathsegmentTopologyOperationOutput>> getpathsegmentTopologyOperation(
+        GetpathsegmentTopologyOperationInput input) {
+
+        final String svcOperation = "getpathsegment-topology-operation";
+        ServiceData serviceData;
+        ServiceStatusBuilder serviceStatusBuilder = new ServiceStatusBuilder();
+        Properties parms = new Properties();
+
+        log.info(CALLED_STR, svcOperation);
+        // create a new response object
+        GetpathsegmentTopologyOperationOutputBuilder responseBuilder = new GetpathsegmentTopologyOperationOutputBuilder();
+
+        if (hasInvalidService(input)) {
+            log.debug(NULL_OR_EMPTY_ERROR_MESSAGE, svcOperation);
+            responseBuilder.setResponseCode("404");
+            responseBuilder.setResponseMessage(NULL_OR_EMPTY_ERROR_PARAM);
+            responseBuilder.setAckFinalIndicator("Y");
+
+            RpcResult<GetpathsegmentTopologyOperationOutput> rpcResult = RpcResultBuilder
+                .<GetpathsegmentTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
+
+            return Futures.immediateFuture(rpcResult);
+        }
+
+        // Grab the service instance ID from the input buffer
+        String siid = input.getServiceInformation().getServiceInstanceId();
+
+        trySetSvcRequestId(input, responseBuilder);
+
+        if (hasInvalidOnapModelInformation(input)) {
+            log.debug("exiting {} because no model-uuid provided", svcOperation);
+            responseBuilder.setResponseCode("404");
+            responseBuilder.setResponseMessage("invalid input, no model-uuid provided");
+            responseBuilder.setAckFinalIndicator("Y");
+            RpcResult<GetpathsegmentTopologyOperationOutput> rpcResult = RpcResultBuilder
+                .<GetpathsegmentTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
+            return Futures.immediateFuture(rpcResult);
+        }
+
+        ServiceDataBuilder serviceDataBuilder = new ServiceDataBuilder();
+        getServiceData(siid, serviceDataBuilder);
+
+        ServiceDataBuilder operDataBuilder = new ServiceDataBuilder();
+        getServiceData(siid, operDataBuilder, LogicalDatastoreType.OPERATIONAL);
+
+        // Set the serviceStatus based on input
+        setServiceStatus(serviceStatusBuilder, input.getSdncRequestHeader());
+        setServiceStatus(serviceStatusBuilder, input.getRequestInformation());
+
+        log.info(ADDING_INPUT_DATA_LOG, svcOperation, siid, input);
+        GetpathsegmentTopologyOperationInputBuilder inputBuilder = new GetpathsegmentTopologyOperationInputBuilder(
+            input);
+        GenericResourceApiUtil.toProperties(parms, inputBuilder.build());
+
+        log.info(ADDING_OPERATIONAL_DATA_LOG, svcOperation, siid, operDataBuilder.build());
+        GenericResourceApiUtil.toProperties(parms, OPERATIONAL_DATA_PARAM, operDataBuilder);
+
+        // Call SLI sync method
+
+        ResponseObject responseObject = new ResponseObject("200", "");
+        String ackFinal = "Y";
+        String serviceObjectPath = null;
+        Properties respProps = tryGetProperties(svcOperation, parms, serviceDataBuilder, responseObject);
+
+        if (respProps != null) {
+            responseObject.setStatusCode(respProps.getProperty(ERROR_CODE_PARAM));
+            responseObject.setMessage(respProps.getProperty(ERROR_MESSAGE_PARAM));
+            ackFinal = respProps.getProperty(ACK_FINAL_PARAM, "Y");
+            serviceObjectPath = respProps.getProperty(SERVICE_OBJECT_PATH_PARAM);
+        }
+
+        setServiceStatus(serviceStatusBuilder, responseObject.getStatusCode(), responseObject.getMessage(), ackFinal);
+        serviceStatusBuilder.setRequestStatus(RequestStatus.Synccomplete);
+        serviceStatusBuilder.setRpcName(svcOperation);
+
+        if (failed(responseObject)) {
+            responseBuilder.setResponseCode(responseObject.getStatusCode());
+            responseBuilder.setResponseMessage(responseObject.getMessage());
+            responseBuilder.setAckFinalIndicator(ackFinal);
+
+            ServiceBuilder serviceBuilder = new ServiceBuilder();
+            serviceBuilder.setServiceInstanceId(siid);
+            serviceBuilder.setServiceStatus(serviceStatusBuilder.build());
+            try {
+                saveService(serviceBuilder.build(), true, LogicalDatastoreType.CONFIGURATION);
+            } catch (Exception e) {
+                log.error(UPDATING_MDSAL_ERROR_MESSAGE, svcOperation, siid, e);
+            }
+            log.error(RETURNED_FAILED_MESSAGE, svcOperation, siid, responseBuilder.build());
+
+            RpcResult<GetpathsegmentTopologyOperationOutput> rpcResult = RpcResultBuilder
+                .<GetpathsegmentTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
+
+            return Futures.immediateFuture(rpcResult);
+        }
+
+        // Got success from SLI
+        try {
+            serviceData = serviceDataBuilder.build();
+            log.info(UPDATING_MDSAL_INFO_MESSAGE, svcOperation, siid, serviceData);
+
+            // service object
+            ServiceBuilder serviceBuilder = new ServiceBuilder();
+            serviceBuilder.setServiceData(serviceData);
+            serviceBuilder.setServiceInstanceId(siid);
+            serviceBuilder.setServiceStatus(serviceStatusBuilder.build());
+            saveService(serviceBuilder.build(), false, LogicalDatastoreType.CONFIGURATION);
+
+            ServiceResponseInformationBuilder serviceResponseInformationBuilder = new ServiceResponseInformationBuilder();
+            serviceResponseInformationBuilder.setInstanceId(siid);
+            serviceResponseInformationBuilder.setObjectPath(serviceObjectPath);
+            responseBuilder.setServiceResponseInformation(serviceResponseInformationBuilder.build());
+
+        } catch (Exception e) {
+            log.error(UPDATING_MDSAL_ERROR_MESSAGE, svcOperation, siid, e);
+            responseBuilder.setResponseCode("500");
+            responseBuilder.setResponseMessage(e.getMessage());
+            responseBuilder.setAckFinalIndicator("Y");
+            RpcResult<GetpathsegmentTopologyOperationOutput> rpcResult = RpcResultBuilder
+                .<GetpathsegmentTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
+
+            return Futures.immediateFuture(rpcResult);
+        }
+
+        // Update succeeded
+        responseBuilder.setResponseCode(responseObject.getStatusCode());
+        responseBuilder.setAckFinalIndicator(ackFinal);
+        trySetResponseMessage(responseBuilder, responseObject);
+        log.info(UPDATED_MDSAL_INFO_MESSAGE, svcOperation, siid);
+        log.info(RETURNED_SUCCESS_MESSAGE, svcOperation, siid, responseBuilder.build());
+
+        RpcResult<GetpathsegmentTopologyOperationOutput> rpcResult = RpcResultBuilder
+            .<GetpathsegmentTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
+
+        return Futures.immediateFuture(rpcResult);
+    }
+
+    private boolean hasInvalidService(GetpathsegmentTopologyOperationInput input) {
+        return input == null || input.getServiceInformation() == null
+            || input.getServiceInformation().getServiceInstanceId() == null
+            || input.getServiceInformation().getServiceInstanceId().length() == 0;
+    }
+
+    private void trySetSvcRequestId(GetpathsegmentTopologyOperationInput input,
+        GetpathsegmentTopologyOperationOutputBuilder responseBuilder) {
+        if (input.getSdncRequestHeader() != null) {
+            responseBuilder.setSvcRequestId(input.getSdncRequestHeader().getSvcRequestId());
+        }
+    }
+
+    private boolean hasInvalidOnapModelInformation(GetpathsegmentTopologyOperationInput input) {
+        return input.getServiceInformation() == null || input.getServiceInformation().getOnapModelInformation() == null
+            || input.getServiceInformation().getOnapModelInformation().getModelUuid() == null;
+    }
+
+    private void trySetResponseMessage(GetpathsegmentTopologyOperationOutputBuilder responseBuilder,
+        ResponseObject responseObject) {
+        if (responseObject.getMessage() != null) {
+            if (!responseObject.getMessage().isEmpty()) {
+                responseBuilder.setResponseMessage(responseObject.getMessage());
+            }
+        }
+    }
+
+    @Override
+    public ListenableFuture<RpcResult<PolicyUpdateNotifyOperationOutput>> policyUpdateNotifyOperation(
+        PolicyUpdateNotifyOperationInput input) {
+
+        final String svcOperation = "policy-update-notify-operation";
+        Properties parms = new Properties();
+
+        log.info(CALLED_STR, svcOperation);
+
+        // create a new response object
+        PolicyUpdateNotifyOperationOutputBuilder responseBuilder = new PolicyUpdateNotifyOperationOutputBuilder();
+
+        // Make sure we have a valid input
+        if (hasInvalidInput(input)) {
+            log.debug("exiting {} because policy name, update type, or version id was not provided", svcOperation);
+            responseBuilder.setErrorCode("404");
+            responseBuilder.setErrorMsg("Invalid input, missing input data");
+            RpcResult<PolicyUpdateNotifyOperationOutput> rpcResult = RpcResultBuilder
+                .<PolicyUpdateNotifyOperationOutput>status(true).withResult(responseBuilder.build()).build();
+            return Futures.immediateFuture(rpcResult);
+        }
+
+        log.info("Adding INPUT data for {} input: {}", svcOperation, input);
+        PolicyUpdateNotifyOperationInputBuilder inputBuilder = new PolicyUpdateNotifyOperationInputBuilder(input);
+        GenericResourceApiUtil.toProperties(parms, inputBuilder.build());
+
+        // Call SLI sync method
+        ResponseObject responseObject = new ResponseObject("200", "");
+        String ackFinal = "Y";
+        String serviceObjectPath = null;
+        Properties respProps = tryGetProperties(svcOperation, parms, responseObject);
+
+        if (respProps != null) {
+            responseObject.setStatusCode(respProps.getProperty(ERROR_CODE_PARAM));
+            responseObject.setMessage(respProps.getProperty(ERROR_MESSAGE_PARAM));
+            ackFinal = respProps.getProperty(ACK_FINAL_PARAM, "Y");
+            serviceObjectPath = respProps.getProperty(SERVICE_OBJECT_PATH_PARAM);
+        }
+
+        if (failed(responseObject)) {
+            responseBuilder.setErrorCode(responseObject.getStatusCode());
+            responseBuilder.setErrorMsg(responseObject.getMessage());
+            log.error(RETURNED_FAILED_MESSAGE, svcOperation, "policy update", responseBuilder.build());
+
+            RpcResult<PolicyUpdateNotifyOperationOutput> rpcResult = RpcResultBuilder
+                .<PolicyUpdateNotifyOperationOutput>status(true).withResult(responseBuilder.build()).build();
+
+            return Futures.immediateFuture(rpcResult);
+        }
+
+        // Got success from SLI
+        responseBuilder.setErrorCode(responseObject.getStatusCode());
+        if (responseObject.getMessage() != null) {
+            responseBuilder.setErrorMsg(responseObject.getMessage());
+        }
+        log.info("Returned SUCCESS for " + svcOperation + responseBuilder.build());
+        RpcResult<PolicyUpdateNotifyOperationOutput> rpcResult = RpcResultBuilder
+            .<PolicyUpdateNotifyOperationOutput>status(true).withResult(responseBuilder.build()).build();
+        // return success
+        return Futures.immediateFuture(rpcResult);
+    }
+
+    private boolean hasInvalidInput(PolicyUpdateNotifyOperationInput input) {
+        return (input.getPolicyName() == null) || (input.getUpdateType() == null) || (input.getVersionId() == null);
+    }
+
+    @Override
+    public ListenableFuture<RpcResult<PortMirrorTopologyOperationOutput>> portMirrorTopologyOperation(
+        final PortMirrorTopologyOperationInput input) {
+
+        final String svcOperation = "port-mirror-topology-operation";
+        ServiceData serviceData = null;
+        ServiceStatusBuilder serviceStatusBuilder = new ServiceStatusBuilder();
+        Properties properties = new Properties();
+
+        log.info(CALLED_STR, svcOperation);
+
+        // create a new response object
+        PortMirrorTopologyOperationOutputBuilder responseBuilder = new PortMirrorTopologyOperationOutputBuilder();
+
+        if (hasInvalidService(input)) {
+            log.debug(NULL_OR_EMPTY_ERROR_MESSAGE, svcOperation);
+            responseBuilder.setResponseCode("404");
+            responseBuilder.setResponseMessage(NULL_OR_EMPTY_ERROR_PARAM);
+            responseBuilder.setAckFinalIndicator("Y");
+            RpcResult<PortMirrorTopologyOperationOutput> rpcResult = RpcResultBuilder
+                .<PortMirrorTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
+            // return error
+            return Futures.immediateFuture(rpcResult);
+        }
+
+        if (hasInvalidConfigurationId(input)) {
+            log.debug("exiting {} because of null or empty configuration-id", svcOperation);
+            responseBuilder.setResponseCode("404");
+            responseBuilder.setResponseMessage("invalid input, null or empty configuration-id");
+            responseBuilder.setAckFinalIndicator("Y");
+            RpcResult<PortMirrorTopologyOperationOutput> rpcResult = RpcResultBuilder
+                .<PortMirrorTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
+            return Futures.immediateFuture(rpcResult);
+        }
+
+        // Grab the service instance ID from the input buffer
+        String siid = input.getServiceInformation().getServiceInstanceId();
+
+        trySetSvcRequestId(input, responseBuilder);
+
+        ServiceDataBuilder serviceDataBuilder = new ServiceDataBuilder();
+        getServiceData(siid, serviceDataBuilder);
+
+        ServiceDataBuilder operDataBuilder = new ServiceDataBuilder();
+        getServiceData(siid, operDataBuilder, LogicalDatastoreType.OPERATIONAL);
+
+        // Set the serviceStatus based on input
+        setServiceStatus(serviceStatusBuilder, input.getSdncRequestHeader());
+        setServiceStatus(serviceStatusBuilder, input.getRequestInformation());
+
+        log.info(ADDING_INPUT_DATA_LOG, svcOperation, siid, input);
+        PortMirrorTopologyOperationInputBuilder inputBuilder = new PortMirrorTopologyOperationInputBuilder(input);
+        GenericResourceApiUtil.toProperties(properties, inputBuilder.build());
+
+        log.info(ADDING_OPERATIONAL_DATA_LOG, svcOperation, siid, operDataBuilder.build());
+        GenericResourceApiUtil.toProperties(properties, OPERATIONAL_DATA_PARAM, operDataBuilder);
+
+        // Call SLI sync method
+        ResponseObject responseObject = new ResponseObject("200", "");
+        String ackFinal = "Y";
+        String serviceObjectPath = null;
+        String portMirrorObjectPath = null;
+        Properties respProps = tryGetProperties(svcOperation, properties, serviceDataBuilder, responseObject);
+
+        if (respProps != null) {
+            responseObject.setMessage(respProps.getProperty(ERROR_MESSAGE_PARAM));
+            responseObject.setStatusCode(respProps.getProperty(ERROR_CODE_PARAM));
+            ackFinal = respProps.getProperty(ACK_FINAL_PARAM, "Y");
+            serviceObjectPath = respProps.getProperty("service-object-path");
+            portMirrorObjectPath = respProps.getProperty("port-mirror-object-path");
+        }
+
+        setServiceStatus(serviceStatusBuilder, responseObject.getStatusCode(), responseObject.getMessage(), ackFinal);
+        serviceStatusBuilder.setRequestStatus(RequestStatus.Synccomplete);
+        serviceStatusBuilder.setRpcName(svcOperation);
+
+        if (failed(responseObject)) {
+            responseBuilder.setResponseCode(responseObject.getStatusCode());
+            responseBuilder.setResponseMessage(responseObject.getMessage());
+            responseBuilder.setAckFinalIndicator(ackFinal);
+
+            ServiceBuilder serviceBuilder = new ServiceBuilder();
+            serviceBuilder.setServiceInstanceId(siid);
+            serviceBuilder.setServiceStatus(serviceStatusBuilder.build());
+            try {
+                saveService(serviceBuilder.build(), true, LogicalDatastoreType.CONFIGURATION);
+            } catch (Exception e) {
+                log.error(UPDATING_MDSAL_ERROR_MESSAGE, svcOperation, siid, e);
+            }
+            log.error(RETURNED_FAILED_MESSAGE, svcOperation, siid, responseBuilder.build());
+
+            RpcResult<PortMirrorTopologyOperationOutput> rpcResult = RpcResultBuilder
+                .<PortMirrorTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
+
+            // return error
+            return Futures.immediateFuture(rpcResult);
+        }
+
+        // Got success from SLI
+        try {
+            serviceData = serviceDataBuilder.build();
+            log.info(UPDATING_MDSAL_INFO_MESSAGE, svcOperation, siid, serviceData);
+
+            // service object
+            ServiceBuilder serviceBuilder = new ServiceBuilder();
+            serviceBuilder.setServiceData(serviceData);
+            serviceBuilder.setServiceInstanceId(siid);
+            serviceBuilder.setServiceStatus(serviceStatusBuilder.build());
+            saveService(serviceBuilder.build(), false, LogicalDatastoreType.CONFIGURATION);
+
+            if (input.getSdncRequestHeader() != null && input.getSdncRequestHeader().getSvcAction() != null) {
+                // Only update operational tree on activate or delete
+                if (input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Unassign)
+                    || input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Activate)) {
+                    log.info(UPDATING_TREE_INFO_MESSAGE);
+                    saveService(serviceBuilder.build(), false, LogicalDatastoreType.OPERATIONAL);
+                }
+            }
+
+            ServiceResponseInformationBuilder serviceResponseInformationBuilder = new ServiceResponseInformationBuilder();
+            serviceResponseInformationBuilder.setInstanceId(siid);
+            serviceResponseInformationBuilder.setObjectPath(serviceObjectPath);
+            responseBuilder.setServiceResponseInformation(serviceResponseInformationBuilder.build());
+            PortMirrorResponseInformationBuilder portMirrorResponseInformationBuilder = new PortMirrorResponseInformationBuilder();
+            portMirrorResponseInformationBuilder
+                .setInstanceId(input.getConfigurationInformation().getConfigurationId());
+            portMirrorResponseInformationBuilder.setObjectPath(portMirrorObjectPath);
+            responseBuilder.setPortMirrorResponseInformation(portMirrorResponseInformationBuilder.build());
+
+        } catch (Exception e) {
+            log.error(UPDATING_MDSAL_ERROR_MESSAGE, svcOperation, siid, e);
+            responseBuilder.setResponseCode("500");
+            responseBuilder.setResponseMessage(e.getMessage());
+            responseBuilder.setAckFinalIndicator("Y");
+            log.error(RETURNED_FAILED_MESSAGE, svcOperation, siid, responseBuilder.build());
+            RpcResult<PortMirrorTopologyOperationOutput> rpcResult = RpcResultBuilder
+                .<PortMirrorTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
+            return Futures.immediateFuture(rpcResult);
+        }
+
+        // Update succeeded
+        responseBuilder.setResponseCode(responseObject.getStatusCode());
+        responseBuilder.setAckFinalIndicator(ackFinal);
+        trySetResponseMessage(responseBuilder, responseObject);
+        log.info(UPDATED_MDSAL_INFO_MESSAGE, svcOperation, siid);
+        log.info(RETURNED_SUCCESS_MESSAGE, svcOperation, siid, responseBuilder.build());
+
+        RpcResult<PortMirrorTopologyOperationOutput> rpcResult = RpcResultBuilder
+            .<PortMirrorTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
+
+        if (ackFinal.equals("N")) {
+            // Spawn background thread to invoke the Async DG
+            Runnable backgroundThread = new Runnable() {
+                public void run() {
+                    log.info(BACKGROUND_THREAD_STARTED_MESSAGE);
+                    processAsyncPortMirrorTopologyOperation(input);
+                }
+            };
+            new Thread(backgroundThread).start();
+        }
+
+        // return success
+        return Futures.immediateFuture(rpcResult);
+    }
+
+    private boolean hasInvalidService(PortMirrorTopologyOperationInput input) {
+        return input == null || input.getServiceInformation() == null
+            || input.getServiceInformation().getServiceInstanceId() == null
+            || input.getServiceInformation().getServiceInstanceId().length() == 0;
+    }
+
+    private boolean hasInvalidConfigurationId(PortMirrorTopologyOperationInput input) {
+        return input.getConfigurationInformation() == null
+            || input.getConfigurationInformation().getConfigurationId() == null
+            || input.getConfigurationInformation().getConfigurationId().length() == 0;
+    }
+
+    private void trySetSvcRequestId(PortMirrorTopologyOperationInput input,
+        PortMirrorTopologyOperationOutputBuilder responseBuilder) {
+        if (input.getSdncRequestHeader() != null) {
+            responseBuilder.setSvcRequestId(input.getSdncRequestHeader().getSvcRequestId());
+        }
+    }
+
+    private void trySetResponseMessage(PortMirrorTopologyOperationOutputBuilder responseBuilder,
+        ResponseObject responseObject) {
+        if (responseObject.getMessage() != null) {
+            if (!responseObject.getMessage().isEmpty()) {
+                responseBuilder.setResponseMessage(responseObject.getMessage());
+            }
+        }
+    }
+
+    public void processAsyncPortMirrorTopologyOperation(PortMirrorTopologyOperationInput input) {
+        log.info(BACKGROUND_THREAD_INFO, input.getConfigurationInformation().getConfigurationId());
+
+        final String svcOperation = "port-mirror-topology-operation-async";
+        ServiceData serviceData = null;
+        ServiceStatusBuilder serviceStatusBuilder = new ServiceStatusBuilder();
+        Properties parms = new Properties();
+
+        log.info(CALLED_STR, svcOperation);
+
+        // Grab the service instance ID from the input buffer
+        String siid = input.getServiceInformation().getServiceInstanceId();
+
+        ServiceDataBuilder serviceDataBuilder = new ServiceDataBuilder();
+        getServiceData(siid, serviceDataBuilder);
+
+        ServiceDataBuilder operDataBuilder = new ServiceDataBuilder();
+        getServiceData(siid, operDataBuilder, LogicalDatastoreType.OPERATIONAL);
+
+        // Set the serviceStatus based on input
+        setServiceStatus(serviceStatusBuilder, input.getSdncRequestHeader());
+        setServiceStatus(serviceStatusBuilder, input.getRequestInformation());
+
+        log.info(ADDING_INPUT_DATA_LOG, svcOperation, siid, input);
+        PortMirrorTopologyOperationInputBuilder inputBuilder = new PortMirrorTopologyOperationInputBuilder(input);
+        GenericResourceApiUtil.toProperties(parms, inputBuilder.build());
+
+        log.info(ADDING_OPERATIONAL_DATA_LOG, svcOperation, siid, operDataBuilder.build());
+        GenericResourceApiUtil.toProperties(parms, OPERATIONAL_DATA_PARAM, operDataBuilder);
+
+        // Call SLI sync method
+        ResponseObject responseObject = new ResponseObject("200", "");
+        String ackFinal = "Y";
+        String serviceObjectPath = null;
+        Properties respProps = tryGetProperties(svcOperation, parms, serviceDataBuilder, responseObject);
+
+        if (respProps != null) {
+            responseObject.setMessage(respProps.getProperty(ERROR_MESSAGE_PARAM));
+            responseObject.setStatusCode(respProps.getProperty(ERROR_CODE_PARAM));
+            ackFinal = respProps.getProperty(ACK_FINAL_PARAM, "Y");
+        }
+
+        setServiceStatus(serviceStatusBuilder, responseObject.getStatusCode(), responseObject.getMessage(), ackFinal);
+        serviceStatusBuilder.setRequestStatus(RequestStatus.Synccomplete);
+        serviceStatusBuilder.setRpcName(svcOperation);
+
+        if (failed(responseObject)) {
+            ServiceBuilder serviceBuilder = new ServiceBuilder();
+            serviceBuilder.setServiceInstanceId(siid);
+            serviceBuilder.setServiceStatus(serviceStatusBuilder.build());
+            try {
+                saveService(serviceBuilder.build(), true, LogicalDatastoreType.CONFIGURATION);
+            } catch (Exception e) {
+                log.error(UPDATING_MDSAL_ERROR_MESSAGE, svcOperation, siid, e);
+            }
+
+            // return error
+            return;
+        }
+
+        // Got success from SLI
+        try {
+            serviceData = serviceDataBuilder.build();
+            log.info(UPDATING_MDSAL_INFO_MESSAGE, svcOperation, siid, serviceData);
+
+            // service object
+            ServiceBuilder serviceBuilder = new ServiceBuilder();
+            serviceBuilder.setServiceData(serviceData);
+            serviceBuilder.setServiceInstanceId(siid);
+            serviceBuilder.setServiceStatus(serviceStatusBuilder.build());
+            saveService(serviceBuilder.build(), false, LogicalDatastoreType.CONFIGURATION);
+
+            if (input.getSdncRequestHeader() != null && input.getSdncRequestHeader().getSvcAction() != null) {
+                // Only update operational tree on activate or delete
+                if (input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Unassign)
+                    || input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Activate)) {
+                    log.info(UPDATING_TREE_INFO_MESSAGE);
+                    saveService(serviceBuilder.build(), false, LogicalDatastoreType.OPERATIONAL);
+                }
+            }
+
+            ServiceResponseInformationBuilder serviceResponseInformationBuilder = new ServiceResponseInformationBuilder();
+            serviceResponseInformationBuilder.setInstanceId(siid);
+            serviceResponseInformationBuilder.setObjectPath(serviceObjectPath);
+
+        } catch (Exception e) {
+            log.error(UPDATING_MDSAL_ERROR_MESSAGE, svcOperation, siid, e);
+            return;
+        }
+
+        // Update succeeded
+        log.info(UPDATED_MDSAL_INFO_MESSAGE, svcOperation, siid);
+
+        return;
+    }
+
+    @Override
+    public ListenableFuture<RpcResult<VnfGetResourceRequestOutput>> vnfGetResourceRequest(
+        VnfGetResourceRequestInput input) {
+
+        final String svcOperation = "vnf-get-resource-request";
+        ServiceData serviceData;
+        ServiceStatusBuilder serviceStatusBuilder = new ServiceStatusBuilder();
+        Properties parms = new Properties();
+
+        log.info(CALLED_STR, svcOperation);
+        // create a new response object
+        VnfGetResourceRequestOutputBuilder responseBuilder = new VnfGetResourceRequestOutputBuilder();
+
+        if (hasInvalidService(input)) {
+            log.debug(NULL_OR_EMPTY_ERROR_MESSAGE, svcOperation);
+            RpcResult<VnfGetResourceRequestOutput> rpcResult = RpcResultBuilder
+                .<VnfGetResourceRequestOutput>status(true).withResult(responseBuilder.build()).build();
+            // return error
+            return Futures.immediateFuture(rpcResult);
+        }
+
+        // Grab the service instance ID from the input buffer
+        String siid = input.getServiceInformation().getServiceInstanceId();
+
+        ServiceDataBuilder serviceDataBuilder = new ServiceDataBuilder();
+        getServiceData(siid, serviceDataBuilder);
+
+        ServiceDataBuilder operDataBuilder = new ServiceDataBuilder();
+        getServiceData(siid, operDataBuilder, LogicalDatastoreType.OPERATIONAL);
+
+        // Set the serviceStatus based on input
+        setServiceStatus(serviceStatusBuilder, input.getSdncRequestHeader());
+        setServiceStatus(serviceStatusBuilder, input.getRequestInformation());
+
+        log.info(ADDING_INPUT_DATA_LOG, svcOperation, siid, input);
+        VnfGetResourceRequestInputBuilder inputBuilder = new VnfGetResourceRequestInputBuilder(input);
+        GenericResourceApiUtil.toProperties(parms, inputBuilder.build());
+
+        log.info(ADDING_OPERATIONAL_DATA_LOG, svcOperation, siid, operDataBuilder.build());
+        GenericResourceApiUtil.toProperties(parms, OPERATIONAL_DATA_PARAM, operDataBuilder);
+
+        // Call SLI sync method
+
+        ResponseObject responseObject = new ResponseObject("200", "");
+        String ackFinal = "Y";
+        String serviceObjectPath = null;
+        Properties respProps = tryGetProperties(svcOperation, parms, serviceDataBuilder, responseObject);
+
+        if (respProps != null) {
+            responseObject.setMessage(respProps.getProperty(ERROR_MESSAGE_PARAM));
+            responseObject.setStatusCode(respProps.getProperty(ERROR_CODE_PARAM));
+            ackFinal = respProps.getProperty(ACK_FINAL_PARAM, "Y");
+            serviceObjectPath = respProps.getProperty("service-object-path");
+        }
+
+        setServiceStatus(serviceStatusBuilder, responseObject.getStatusCode(), responseObject.getMessage(), ackFinal);
+        serviceStatusBuilder.setRequestStatus(RequestStatus.Synccomplete);
+        serviceStatusBuilder.setRpcName(svcOperation);
+
+        if (failed(responseObject)) {
+            log.error(RETURNED_FAILED_MESSAGE, svcOperation, siid, responseBuilder.build());
+            RpcResult<VnfGetResourceRequestOutput> rpcResult = RpcResultBuilder
+                .<VnfGetResourceRequestOutput>status(true).withResult(responseBuilder.build()).build();
+            // return error
+            return Futures.immediateFuture(rpcResult);
+        }
+
+        // Got success from SLI
+        log.info(RETURNED_SUCCESS_MESSAGE, svcOperation, siid, responseBuilder.build());
+
+        if (respProps != null) {
+            GenericResourceApiUtil.toBuilder(respProps, responseBuilder);
+        }
+
+        RpcResult<VnfGetResourceRequestOutput> rpcResult = RpcResultBuilder.<VnfGetResourceRequestOutput>status(true)
+            .withResult(responseBuilder.build()).build();
+
+        // return success
+        return Futures.immediateFuture(rpcResult);
+    }
+
+    private boolean hasInvalidService(VnfGetResourceRequestInput input) {
+        return input == null || input.getServiceInformation() == null
+            || input.getServiceInformation().getServiceInstanceId() == null
+            || input.getServiceInformation().getServiceInstanceId().length() == 0;
+    }
 }