diff --git a/Makefile b/Makefile
index 8a1789f..e5f5597 100644
--- a/Makefile
+++ b/Makefile
@@ -35,7 +35,7 @@
 CONFD = XML_ONLY
 
 BUILD_TYPE = Debug
-NOT_DEVELOPER_TYPE = FALSE
+NOT_DEVELOPER_BUILD ?= FALSE
 COVERAGE_BUILD = FALSE
 RIFT_AGENT_BUILD = $(CONFD)
 PROJECT_TOP_DIR = $(TOP_ROOT_PATH)
@@ -46,7 +46,7 @@
 	mkdir -p $(RIFT_BUILD)
 	mkdir -p $(RIFT_ARTIFACTS)
 	mkdir -p $(RIFT_INSTALL)
-	cd $(RIFT_BUILD) && $(RIFT_SHELL_EXE) cmake $(TOP_SRC_PATH) -DCMAKE_INSTALL_PREFIX=$(TOP_ROOT_PATH) -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) -DNOT_DEVELOPER_BUILD=$(NOT_DEVELOPER_TYPE) -DCOVERAGE_BUILD=$(COVERAGE_TYPE) -DRIFT_AGENT_BUILD=$(RIFT_AGENT_BUILD) -DPROJECT_TOP_DIR=$(PROJECT_TOP_DIR) -DCMAKE_MODULE_PATH=${CMAKE_MODULE_PATH} -DRIFT_SUBMODULE_NAME=$(TOP_SRC_PATH) -DRIFT_PACKAGE_GENERATOR=DEB -DRELEASE_NUMBER=$(RELEASE_NUMBER) -DBUILD_NUMBER=$(BUILD_NUMBER)
+	cd $(RIFT_BUILD) && $(RIFT_SHELL_EXE) cmake $(TOP_SRC_PATH) -DCMAKE_INSTALL_PREFIX=$(TOP_ROOT_PATH) -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) -DNOT_DEVELOPER_BUILD=$(NOT_DEVELOPER_BUILD) -DCOVERAGE_BUILD=$(COVERAGE_TYPE) -DRIFT_AGENT_BUILD=$(RIFT_AGENT_BUILD) -DPROJECT_TOP_DIR=$(PROJECT_TOP_DIR) -DCMAKE_MODULE_PATH=${CMAKE_MODULE_PATH} -DRIFT_SUBMODULE_NAME=$(TOP_SRC_PATH) -DRIFT_PACKAGE_GENERATOR=DEB -DRELEASE_NUMBER=$(RELEASE_NUMBER) -DBUILD_NUMBER=$(BUILD_NUMBER)
 
 rw: cmake
 	$(RIFT_SHELL_EXE) $(MAKE) -C $(RIFT_BUILD)
diff --git a/models/openmano/python/rift/openmano/rift2openmano.py b/models/openmano/python/rift/openmano/rift2openmano.py
index e7d2e35..276573c 100755
--- a/models/openmano/python/rift/openmano/rift2openmano.py
+++ b/models/openmano/python/rift/openmano/rift2openmano.py
@@ -74,6 +74,10 @@
         return self._nsd.constituent_vnfd
 
     @property
+    def scaling_group_descriptor(self):
+        return self._nsd.scaling_group_descriptor
+
+    @property
     def vlds(self):
         return self._nsd.vld
 
@@ -221,13 +225,17 @@
     return vnfd_name + "__" + str(member_idx)
 
 
-def rift2openmano_nsd(rift_nsd, rift_vnfds, openmano_vnfd_ids):
-    for vnfd_id in rift_nsd.vnfd_ids:
-        if vnfd_id not in rift_vnfds:
-            raise VNFNotFoundError("VNF id %s not provided" % vnfd_id)
+def rift2openmano_nsd(rift_nsd, rift_vnfds, openmano_vnfd_ids, rift_vnfd_id=None):
+    if rift_vnfd_id is None:
+        for vnfd_id in rift_nsd.vnfd_ids:
+            if vnfd_id not in rift_vnfds:
+                raise VNFNotFoundError("VNF id %s not provided" % vnfd_id)
 
     openmano = {}
     openmano["name"] = rift_nsd.name
+    if rift_vnfd_id is not None:
+        for scaling_groups in rift_nsd.scaling_group_descriptor:
+            openmano["name"] += scaling_groups.name
     openmano["description"] = rift_nsd.description
     topology = {}
     openmano["topology"] = topology
@@ -235,6 +243,8 @@
     topology["nodes"] = {}
     for vnfd in rift_nsd.constituent_vnfds:
         vnfd_id = vnfd.vnfd_id_ref
+        if rift_vnfd_id is not None and rift_vnfd_id != vnfd_id:
+            continue
         rift_vnfd = rift_vnfds[vnfd_id]
         member_idx = vnfd.member_vnf_index
         openmano_vnfd_id = openmano_vnfd_ids.get(vnfd_id,None)
@@ -310,9 +320,69 @@
                     vnf_ref: vnfd_cp.vnfd_connection_point_ref
                 }
             )
-
     return openmano
 
+def rift2openmano_vnfd_nsd(rift_nsd, rift_vnfds, openmano_vnfd_ids,rift_vnfd_id=None):
+
+    if rift_vnfd_id not in rift_vnfds:
+            raise VNFNotFoundError("VNF id %s not provided" % rift_vnfd_id)
+
+    openmano_vnfd_nsd = {}
+    for groups in rift_nsd.scaling_group_descriptor:
+        openmano_vnfd_nsd["name"] = rift_vnfd_id+'__'+'scaling_group'+'__'+groups.name
+    openmano_vnfd_nsd["description"] = "Scaling Group"
+    topology = {}
+    openmano_vnfd_nsd["topology"] = topology
+    topology["connections"] = {}
+    topology["nodes"] = {}
+    tst_index = []
+    openmano_vnfd_id = openmano_vnfd_ids.get(rift_vnfd_id,None)
+    for rvnfd_id in rift_nsd.constituent_vnfds:
+        if rvnfd_id.vnfd_id_ref == rift_vnfd_id:
+            topology["nodes"][rift_vnfd_id+'__'+str(rvnfd_id.member_vnf_index)] = {
+                "type": "VNF",
+                "vnf_id": openmano_vnfd_id
+            }
+
+    for vld in rift_nsd.vlds:
+
+        # Create a connections entry for each external VLD
+        topology["connections"][vld.name] = {}
+        topology["connections"][vld.name]["nodes"] = []
+        if True:
+            if vld.name not in topology["nodes"]:
+                topology["nodes"][vld.name] = {
+                        "type": "external_network",
+                        "model": vld.name,
+                        }
+            topology["connections"][vld.name]["nodes"].append(
+                    {vld.name: "0"}
+                    )
+
+            
+
+    for vnfd_cp in vld.vnfd_connection_point_ref:
+        if not rift_vnfd_id in vnfd_cp.vnfd_id_ref:
+            continue
+        if rift_vnfd_id in vnfd_cp.vnfd_id_ref:
+
+            # Get the RIFT VNF for this external VLD connection point
+            vnfd = rift_vnfds[vnfd_cp.vnfd_id_ref]
+            
+
+            # For each VNF in this connection, use the same interface name
+            topology["connections"][vld.name]["type"] = "link"
+            # Vnf ref is the vnf name with the member_vnf_idx appended
+            member_idx = vnfd_cp.member_vnf_index_ref
+            vnf_ref = rift_vnfd_id + "__" + str(member_idx)
+            topology["connections"][vld.name]["nodes"].append(
+                {
+                    vnf_ref: vnfd_cp.vnfd_connection_point_ref
+                }
+            )
+    return openmano_vnfd_nsd
+
+
 def cloud_init(rift_vnfd_id, vdu):
     """ Populate cloud_init with script from
          either the inline contents or from the file provided
@@ -677,7 +747,6 @@
 
 def main(argv=sys.argv[1:]):
     args = parse_args(argv)
-
     nsd = None
     openmano_vnfr_ids = dict()
     vnf_dict = None
@@ -691,9 +760,9 @@
         nsd = create_nsd_from_file(args.nsd_file_hdl)
 
     openmano_nsd = rift2openmano_nsd(nsd, vnf_dict, openmano_vnfr_ids)
-
+    vnfd_nsd = rift2openmano_vnfd_nsd(nsd, vnf_dict, openmano_vnfr_ids)
     write_yaml_to_file(openmano_nsd["name"], args.outdir, openmano_nsd)
-
+    write_yaml_to_file(vnfd_nsd["name"], args.outdir, vnfd_nsd)
     for vnf in vnf_dict.values():
         openmano_vnf = rift2openmano_vnfd(vnf, nsd)
         write_yaml_to_file(openmano_vnf["vnf"]["name"], args.outdir, openmano_vnf)
diff --git a/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/openmano_nsm.py b/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/openmano_nsm.py
index 0ad877e..db08e8e 100644
--- a/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/openmano_nsm.py
+++ b/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/openmano_nsm.py
@@ -42,21 +42,21 @@
 
 
 DUMP_OPENMANO_DIR = os.path.join(
-        os.environ["RIFT_ARTIFACTS"],
-        "openmano_descriptors"
-        )
+    os.environ["RIFT_ARTIFACTS"],
+    "openmano_descriptors"
+)
 
 
 def dump_openmano_descriptor(name, descriptor_str):
     filename = "{}_{}.yaml".format(
         time.strftime("%Y%m%d-%H%M%S"),
         name
-        )
+    )
 
     filepath = os.path.join(
-            DUMP_OPENMANO_DIR,
-            filename
-            )
+        DUMP_OPENMANO_DIR,
+        filename
+    )
 
     try:
         if not os.path.exists(DUMP_OPENMANO_DIR):
@@ -99,7 +99,7 @@
             self._log.debug(
                 "Got VNFR VDU Opdata xact_info: %s, action: %s): %s:%s",
                 xact_info, action, xpath, msg
-                )
+            )
 
             if action == rwdts.QueryAction.READ:
                 schema = RwVnfrYang.YangData_RwVnfr_VnfrConsole_Vnfr_Vdur.schema()
@@ -107,17 +107,17 @@
 
                 try:
                     console_url = yield from self._loop.run_in_executor(
-                            None,
-                            self._nsr._http_api.get_instance_vm_console_url,
-                            self._nsr._nsr_uuid,
-                            self._vdur_id
-                            )
+                        None,
+                        self._nsr._http_api.get_instance_vm_console_url,
+                        self._nsr._nsr_uuid,
+                        self._vdur_id
+                    )
 
                     self._log.debug("Got console response: %s for NSR ID %s vdur ID %s",
-                                        console_url,
-                                        self._nsr._nsr_uuid,
-                                        self._vdur_id
-                                       )
+                                    console_url,
+                                    self._nsr._nsr_uuid,
+                                    self._vdur_id
+                                    )
                     vdur_console = RwVnfrYang.YangData_RwVnfr_VnfrConsole_Vnfr_Vdur()
                     vdur_console.id = self._vdur_id
                     if console_url:
@@ -127,14 +127,14 @@
                     self._log.debug("Recevied console URL for vdu {} is {}".format(self._vdu_id,vdur_console))
                 except openmano_client.InstanceStatusError as e:
                     self._log.error("Could not get NS instance console URL: %s",
-                                        str(e))
+                                    str(e))
                     vdur_console = RwVnfrYang.YangData_RwVnfr_VnfrConsole_Vnfr_Vdur()
                     vdur_console.id = self._vdur_id
                     vdur_console.console_url = 'none'
 
                 xact_info.respond_xpath(rsp_code=rwdts.XactRspCode.ACK,
-                                            xpath=self.vnfr_vdu_console_xpath,
-                                            msg=vdur_console)
+                                        xpath=self.vnfr_vdu_console_xpath,
+                                        msg=vdur_console)
             else:
                 #raise VnfRecordError("Not supported operation %s" % action)
                 self._log.error("Not supported operation %s" % action)
@@ -200,9 +200,9 @@
 
         # If the name already exists, get the openmano vnfd id
         name_uuid_map = yield from self._loop.run_in_executor(
-                    None,
-                    self._cli_api.vnf_list,
-                    )
+            None,
+            self._cli_api.vnf_list,
+        )
 
         if name in name_uuid_map:
             vnf_id = name_uuid_map[name]
@@ -211,15 +211,15 @@
             return
 
         self._vnf_id, _ = yield from self._loop.run_in_executor(
-                None,
-                self._cli_api.vnf_create,
-                self.openmano_vnfd_yaml,
-                )
+            None,
+            self._cli_api.vnf_create,
+            self.openmano_vnfd_yaml,
+        )
 
         fpath = dump_openmano_descriptor(
-           "{}_vnf".format(name),
-           self.openmano_vnfd_yaml
-           )
+            "{}_vnf".format(name),
+            self.openmano_vnfd_yaml
+        )
 
         self._log.debug("Dumped Openmano VNF descriptor to: %s", fpath)
 
@@ -257,9 +257,9 @@
     TIMEOUT_SECS = 300
     INSTANCE_TERMINATE_TIMEOUT = 60
 
-    def __init__(self, dts, log, loop, publisher, cli_api, http_api, nsd_msg, nsr_config_msg,key_pairs):
-        self._dts = dts
+    def __init__(self, dts, log, loop, publisher, cli_api, http_api, nsd_msg, nsr_config_msg,key_pairs,rift_vnfd_id=None ):
         self._log = log
+        self._dts = dts
         self._loop = loop
         self._publisher = publisher
         self._cli_api = cli_api
@@ -267,20 +267,22 @@
 
         self._nsd_msg = nsd_msg
         self._nsr_config_msg = nsr_config_msg
-
         self._vlrs = []
         self._vnfrs = []
+        self._nsrs = {}
         self._vdur_console_handler = {}
         self._key_pairs = key_pairs
 
         self._nsd_uuid = None
         self._nsr_uuid = None
+        self._nsd_msg = nsd_msg
 
         self._nsr_msg = None
 
         self._created = False
 
         self._monitor_task = None
+        self._rift_vnfd_id = rift_vnfd_id
         self._state = OpenmanoNSRecordState.INIT
 
     @property
@@ -288,6 +290,19 @@
         return rift2openmano.RiftNSD(self._nsd_msg)
 
     @property
+    def rift_vnfd_id(self):
+        return self._rift_vnfd_id
+
+    @property
+    def nsd_msg(self):
+        return self._nsd_msg
+
+    @property
+    def nsr_config_msg(self):
+        return self._nsr_config_msg
+
+
+    @property
     def vnfds(self):
         return {v.rift_vnfd_id: v.vnfd for v in self._vnfrs}
 
@@ -300,11 +315,32 @@
         return self._vnfrs
 
     @property
+    def key_pairs(self):
+        return self._key_pairs
+
+    @property
+    def nsr_msg(self):
+        return self._nsr_msg
+
+    @property
+    def vlrs(self):
+        return self._vlrs
+
+    @property
     def openmano_nsd_yaml(self):
         self._log.debug("Converting nsd %s from rift to openmano", self.nsd.id)
         openmano_nsd = rift2openmano.rift2openmano_nsd(self.nsd, self.vnfds,self.vnfr_ids)
         return yaml.safe_dump(openmano_nsd, default_flow_style=False)
 
+    @property
+    def openmano_scaling_yaml(self):
+        self._log.debug("Creating Openmano Scaling Descriptor %s")
+        try:
+            openmano_vnfd_nsd = rift2openmano.rift2openmano_vnfd_nsd(self.nsd, self.vnfds, self.vnfr_ids, self._rift_vnfd_id)
+            return yaml.safe_dump(openmano_vnfd_nsd, default_flow_style=False)
+        except Exception as e:
+            self._log.exception("Scaling Descriptor Exception: %s", str(e))
+
     def get_ssh_key_pairs(self):
         cloud_config = {}
         key_pairs = list()
@@ -372,7 +408,7 @@
             for vlr in self._vlrs:
                 if vlr.vld_msg.name == vld_msg.name:
                     self._log.debug("Received VLR name %s, VLR DC: %s for VLD: %s",vlr.vld_msg.name,
-                                     vlr.om_datacenter_name,vld_msg.name)
+                                    vlr.om_datacenter_name,vld_msg.name)
                     #network["vim-network-name"] = vld_msg.name
                     network = {}
                     ip_profile = {}
@@ -410,6 +446,52 @@
 
         return yaml.safe_dump(openmano_instance_create, default_flow_style=False,width=1000)
 
+    @property
+    def scaling_instance_create_yaml(self, scaleout=False):
+        self._log.debug("Creating instance-scenario-create input file for nsd %s with name %s", self.nsd.id, self._nsr_config_msg.name+"scal1")
+        scaling_instance_create = {}
+        for group_list in self._nsd_msg.scaling_group_descriptor:
+            scaling_instance_create["name"] = self._nsr_config_msg.name + "__"+group_list.name
+            if scaleout:
+                scaling_instance_create["scenario"] = self._nsd_uuid + "__" +group_list.name
+            else:
+                scaling_instance_create["scenario"] = self._nsd_uuid
+        scaling_instance_create["description"] = self._nsr_config_msg.description
+
+
+        if self._nsr_config_msg.has_field("om_datacenter"):
+            scaling_instance_create["datacenter"] = self._nsr_config_msg.om_datacenter
+        scaling_instance_create["vnfs"] = {}
+        for vnfr in self._vnfrs:
+            if "om_datacenter" in vnfr.vnfr.vnfr_msg:
+                vnfr_name = vnfr.vnfr.vnfd.name + "__" + str(vnfr.vnfr.vnfr_msg.member_vnf_index_ref)
+                scaling_instance_create["vnfs"][vnfr_name] = {"datacenter": vnfr.vnfr.vnfr_msg.om_datacenter}
+        scaling_instance_create["networks"] = {}
+        for vld_msg in self._nsd_msg.vld:
+            scaling_instance_create["networks"][vld_msg.name] = {}
+            scaling_instance_create["networks"][vld_msg.name]["sites"] = list()
+            for vlr in self._vlrs:
+                if vlr.vld_msg.name == vld_msg.name:
+                    self._log.debug("Received VLR name %s, VLR DC: %s for VLD: %s",vlr.vld_msg.name,
+                                    vlr.om_datacenter_name,vld_msg.name)
+                    #network["vim-network-name"] = vld_msg.name
+                    network = {}
+                    ip_profile = {}
+                    if vld_msg.vim_network_name:
+                        network["netmap-use"] = vld_msg.vim_network_name
+                    #else:
+                    #    network["netmap-create"] = vlr.name
+                    if vlr.om_datacenter_name:
+                        network["datacenter"] = vlr.om_datacenter_name
+                    elif vld_msg.has_field("om_datacenter"):
+                        network["datacenter"] = vld_msg.om_datacenter
+                    elif "datacenter" in scaling_instance_create:
+                        network["datacenter"] = scaling_instance_create["datacenter"]
+                    if network:
+                        scaling_instance_create["networks"][vld_msg.name]["sites"].append(network)
+
+        return yaml.safe_dump(scaling_instance_create, default_flow_style=False, width=1000)
+
     @asyncio.coroutine
     def add_vlr(self, vlr):
         self._vlrs.append(vlr)
@@ -442,6 +524,11 @@
         yield from vnfr.create()
         self._vnfrs.append(vnfr)
 
+    @asyncio.coroutine
+    def add_nsr(self, nsr, vnfr):
+        self._nsrs[vnfr.id] = nsr
+
+    @asyncio.coroutine
     def delete(self):
         if not self._created:
             self._log.debug("NSD wasn't created.  Skipping delete.")
@@ -462,9 +549,9 @@
     def create(self):
         self._log.debug("Creating openmano scenario")
         name_uuid_map = yield from self._loop.run_in_executor(
-                None,
-                self._cli_api.ns_list,
-                )
+            None,
+            self._cli_api.ns_list,
+        )
 
         if self._nsd_msg.name in name_uuid_map:
             self._log.debug("Found existing openmano scenario")
@@ -476,21 +563,35 @@
         # scenario on reload or to support muliple instances of the name
         # nsd
         self._nsd_uuid, _ = yield from self._loop.run_in_executor(
-                None,
-                self._cli_api.ns_create,
-                self.openmano_nsd_yaml,
-                self._nsd_msg.name
-                )
+            None,
+            self._cli_api.ns_create,
+            self.openmano_nsd_yaml,
+            self._nsd_msg.name
+        )
         fpath = dump_openmano_descriptor(
-           "{}_nsd".format(self._nsd_msg.name),
-           self.openmano_nsd_yaml,
-           )
+            "{}_nsd".format(self._nsd_msg.name),
+            self.openmano_nsd_yaml,
+        )
 
         self._log.debug("Dumped Openmano NS descriptor to: %s", fpath)
 
         self._created = True
 
     @asyncio.coroutine
+    def scaling_scenario_create(self):
+        self._log.debug("Creating scaling openmano scenario")
+        self._nsd_uuid, _ = yield from self._loop.run_in_executor(
+            None,
+            self._cli_api.ns_create,
+            self.openmano_scaling_yaml,
+
+        )
+        fpath = dump_openmano_descriptor(
+            "{}_sgd".format(self._nsd_msg.name),
+            self.scaling_instance_create_yaml,
+        )
+
+    @asyncio.coroutine
     def instance_monitor_task(self):
         self._log.debug("Starting Instance monitoring task")
 
@@ -502,14 +603,14 @@
 
             try:
                 instance_resp_json = yield from self._loop.run_in_executor(
-                        None,
-                        self._http_api.get_instance,
-                        self._nsr_uuid,
-                        )
+                    None,
+                    self._http_api.get_instance,
+                    self._nsr_uuid,
+                )
 
                 self._log.debug("Got instance response: %s for NSR ID %s",
-                        instance_resp_json,
-                        self._nsr_uuid)
+                                instance_resp_json,
+                                self._nsr_uuid)
 
             except openmano_client.InstanceStatusError as e:
                 self._log.error("Could not get NS instance status: %s", str(e))
@@ -586,8 +687,8 @@
                 # to come up with openmano constituent VNF name.  Use this
                 # knowledge to map the vnfr back.
                 openmano_vnfr_suffix = "__{}".format(
-                        vnfr.vnfr.vnfr_msg.member_vnf_index_ref
-                        )
+                    vnfr.vnfr.vnfr_msg.member_vnf_index_ref
+                )
 
                 for vnf in instance_resp_json["vnfs"]:
                     if vnf["vnf_name"].endswith(openmano_vnfr_suffix):
@@ -636,8 +737,8 @@
 
                         if vnf_ip_address is None:
                             self._log.warning("No IP address obtained "
-                                    "for VNF: {}, will retry.".format(
-                                        vnf_status['vnf_name']))
+                                              "for VNF: {}, will retry.".format(
+                                vnf_status['vnf_name']))
                             continue
 
                         self._log.debug("All VMs in VNF are active.  Marking as running.")
@@ -651,7 +752,7 @@
                         for vm in vnf_status["vms"]:
                             if vm["uuid"] not in self._vdur_console_handler:
                                 vdur_console_handler = VnfrConsoleOperdataDtsHandler(self._dts, self._log, self._loop,
-                                                    self, vnfr_msg.id,vm["uuid"],vm["name"])
+                                                                                     self, vnfr_msg.id,vm["uuid"],vm["name"])
                                 yield from vdur_console_handler.register()
                                 self._vdur_console_handler[vm["uuid"]] = vdur_console_handler
 
@@ -688,12 +789,12 @@
         if self._nsd_uuid is None:
             raise ValueError("Cannot deploy an uncreated nsd")
 
-        self._log.debug("Deploying openmano scenario")
+        self._log.debug("Deploying openmano instance scenario")
 
         name_uuid_map = yield from self._loop.run_in_executor(
-                None,
-                self._cli_api.ns_instance_list,
-                )
+            None,
+            self._cli_api.ns_instance_list,
+        )
 
         if self._nsr_config_msg.name in name_uuid_map:
             self._log.debug("Found existing instance with nsr name: %s", self._nsr_config_msg.name)
@@ -701,21 +802,44 @@
         else:
             self._nsr_msg = nsr_msg
             fpath = dump_openmano_descriptor(
-               "{}_instance_sce_create".format(self._nsr_config_msg.name),
-               self.openmano_instance_create_yaml,
-               )
-            self._log.debug("Dumped Openmano NS Scenario Cretae to: %s", fpath)
+                "{}_instance_sce_create".format(self._nsr_config_msg.name),
+                self.openmano_instance_create_yaml,
+            )
+            self._log.debug("Dumped Openmano instance Scenario Cretae to: %s", fpath)
 
             self._nsr_uuid = yield from self._loop.run_in_executor(
-                    None,
-                    self._cli_api.ns_instance_scenario_create,
-                    self.openmano_instance_create_yaml)
+                None,
+                self._cli_api.ns_instance_scenario_create,
+                self.openmano_instance_create_yaml)
 
         self._state = OpenmanoNSRecordState.INSTANTIATION_PENDING
 
         self._monitor_task = asyncio.ensure_future(
-                self.instance_monitor_task(), loop=self._loop
-                )
+            self.instance_monitor_task(), loop=self._loop
+        )
+
+    @asyncio.coroutine
+    def deploy_scaling(self, nsr_msg, rift_vnfd_id):
+        self._log.debug("Deploying Scaling instance scenario")
+        self._nsr_msg = nsr_msg
+        self._rift_vnfd_id = rift_vnfd_id
+        fpath = dump_openmano_descriptor(
+            "{}_scale_instance".format(self._nsr_config_msg.name),
+            self.scaling_instance_create_yaml
+            )
+        self._nsr_uuid = yield from self._loop.run_in_executor(
+                None,
+                self._cli_api.ns_instance_scenario_create,
+                self.scaling_instance_create_yaml)
+
+        self._state = OpenmanoNSRecordState.INSTANTIATION_PENDING
+
+        self._monitor_task = asyncio.ensure_future(
+            self.instance_monitor_task(), loop=self._loop
+        )
+
+        self._state = OpenmanoNSRecordState.INIT
+
 
     def terminate(self):
         if self._nsr_uuid is None:
@@ -737,7 +861,7 @@
     @asyncio.coroutine
     def create_vlr(self,vlr):
         self._log.debug("Creating openmano vim network VLR name %s, VLR DC: %s",vlr.vld_msg.name,
-                                     vlr.om_datacenter_name)
+                        vlr.om_datacenter_name)
         net_create = {}
         net = {}
         net['name'] = vlr.name
@@ -750,7 +874,7 @@
             if ip_profile_params.ip_version == "ipv6":
                 ip_profile['ip_version'] = "IPv6"
             else:
-                ip_profile['ip_version'] = "IPv4" 
+                ip_profile['ip_version'] = "IPv4"
             if ip_profile_params.has_field('subnet_address'):
                 ip_profile['subnet_address'] = ip_profile_params.subnet_address
             if ip_profile_params.has_field('gateway_address'):
@@ -762,22 +886,22 @@
                 ip_profile['dhcp_start_address'] = ip_profile_params.dhcp_params.start_address
                 ip_profile['dhcp_count'] = ip_profile_params.dhcp_params.count
             net['ip_profile'] = ip_profile
-        net_create["network"]= net   
+        net_create["network"]= net
 
         net_create_msg = yaml.safe_dump(net_create,default_flow_style=False)
         fpath = dump_openmano_descriptor(
             "{}_vim_net_create_{}".format(self._nsr_config_msg.name,vlr.name),
-             net_create_msg)
+            net_create_msg)
         self._log.debug("Dumped Openmano VIM Net create to: %s", fpath)
 
         vim_network_uuid = yield from self._loop.run_in_executor(
-                    None,
-                    self._cli_api.ns_vim_network_create,
-                    net_create_msg,
-                    vlr.om_datacenter_name)
+            None,
+            self._cli_api.ns_vim_network_create,
+            net_create_msg,
+            vlr.om_datacenter_name)
         self._vlrs.append(vlr)
 
-           
+
 
 class OpenmanoNsPlugin(rwnsmplugin.NsmPluginBase):
     """
@@ -799,18 +923,18 @@
     def _set_ro_account(self, ro_account):
         self._log.debug("Setting openmano plugin cloud account: %s", ro_account)
         self._cli_api = openmano_client.OpenmanoCliAPI(
-                self.log,
-                ro_account.openmano.host,
-                ro_account.openmano.port,
-                ro_account.openmano.tenant_id,
-                )
+            self.log,
+            ro_account.openmano.host,
+            ro_account.openmano.port,
+            ro_account.openmano.tenant_id,
+        )
 
         self._http_api = openmano_client.OpenmanoHttpAPI(
-                self.log,
-                ro_account.openmano.host,
-                ro_account.openmano.port,
-                ro_account.openmano.tenant_id,
-                )
+            self.log,
+            ro_account.openmano.host,
+            ro_account.openmano.port,
+            ro_account.openmano.tenant_id,
+        )
 
     def set_state(self, nsr_id, state):
         # Currently we update only during terminate to
@@ -826,16 +950,16 @@
         Create Network service record
         """
         openmano_nsr = OpenmanoNsr(
-                self._dts,
-                self._log,
-                self._loop,
-                self._publisher,
-                self._cli_api,
-                self._http_api,
-                nsd_msg,
-                nsr_config_msg,
-                key_pairs
-                )
+            self._dts,
+            self._log,
+            self._loop,
+            self._publisher,
+            self._cli_api,
+            self._http_api,
+            nsd_msg,
+            nsr_config_msg,
+            key_pairs
+        )
         self._openmano_nsrs[nsr_config_msg.id] = openmano_nsr
 
     @asyncio.coroutine
@@ -853,12 +977,45 @@
         yield from nsr.instantiate(xact)
 
     @asyncio.coroutine
-    def instantiate_vnf(self, nsr, vnfr):
+    def instantiate_vnf(self, nsr, vnfr, scaleout=False):
         """
         Instantiate NSR with the passed nsr id
         """
         openmano_nsr = self._openmano_nsrs[nsr.id]
-        yield from openmano_nsr.add_vnfr(vnfr)
+        if scaleout:
+            openmano_vnf_nsr = OpenmanoNsr(
+                self._dts,
+                self._log,
+                self._loop,
+                self._publisher,
+                self._cli_api,
+                self._http_api,
+                openmano_nsr.nsd_msg,
+                openmano_nsr.nsr_config_msg,
+                openmano_nsr.key_pairs,
+                #openmano_nsr.nsr_msg,
+                vnfr.vnfd.id
+            )
+            for vlr in openmano_nsr.vlrs:
+                yield from openmano_vnf_nsr.add_vlr(vlr)
+            try:
+                yield from openmano_nsr.add_nsr(openmano_vnf_nsr, vnfr)
+            except Exception as e:
+                self.log.exception(str(e))
+            try:
+                yield from openmano_vnf_nsr.add_vnfr(vnfr)
+            except Exception as e:
+                self.log.exception(str(e))
+            try:
+                yield from openmano_vnf_nsr.scaling_scenario_create()
+            except Exception as e:
+                self.log.exception(str(e))
+            try:
+                yield from openmano_vnf_nsr.deploy_scaling(openmano_vnf_nsr.nsr_msg, vnfr.id)
+            except Exception as e:
+                self.log.exception(str(e))
+        else:
+            yield from openmano_nsr.add_vnfr(vnfr)
 
         # Mark the VNFR as running
         # TODO: Create a task to monitor nsr/vnfr status
@@ -891,7 +1048,7 @@
         if openmano_nsr._state == OpenmanoNSRecordState.RUNNING:
             yield from openmano_nsr.create_vlr(vlr)
             yield from self._publisher.publish_vlr(None, vlr.vlr_msg)
-        else: 
+        else:
             yield from openmano_nsr.add_vlr(vlr)
 
     @asyncio.coroutine
diff --git a/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/rwnsmtasklet.py b/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/rwnsmtasklet.py
index 85b31a5..afcb822 100755
--- a/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/rwnsmtasklet.py
+++ b/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/rwnsmtasklet.py
@@ -1701,7 +1701,6 @@
                     vnfr = yield from self.create_vnf_record(vnfd_msg, const_vnfd_msg, cloud_account_name, om_datacenter_name, group_name, index)
                     scale_instance.add_vnfr(vnfr)
                     vnfrs.append(vnfr)
-
             return vnfrs
 
         @asyncio.coroutine
@@ -1722,7 +1721,8 @@
                                     format(group.name, index))
                     scale_instance.operational_status = "failed"
                 else:
-                    yield from self.instantiate_vnfs(vnfrs)
+                    yield from self.instantiate_vnfs(vnfrs, scaleout=True)
+
 
             except Exception as e:
                 self._log.exception("Failed to begin instantiatiation of vnfs for scale group {}: {}".
@@ -2026,11 +2026,10 @@
         # Fetch the VNFD associated with this VNF
         placement_groups = self.get_placement_groups(vnfd_msg, const_vnfd)
         self._log.info("Cloud Account for VNF %d is %s",const_vnfd.member_vnf_index,cloud_account_name)
-        self._log.info("Launching VNF: %s (Member Index: %s) in NSD plancement Groups: %s, restart mode self.restart_mode %s",
+        self._log.info("Launching VNF: %s (Member Index: %s) in NSD plancement Groups: %s",
                        vnfd_msg.name,
                        const_vnfd.member_vnf_index,
-                       [ group.name for group in placement_groups],
-                       self.restart_mode)
+                       [ group.name for group in placement_groups])
         vnfr = yield from VirtualNetworkFunctionRecord.create_record(self._dts,
                                             self._log,
                                             self._loop,
@@ -2095,14 +2094,14 @@
         return vnfr
 
     @asyncio.coroutine
-    def instantiate_vnfs(self, vnfrs):
+    def instantiate_vnfs(self, vnfrs, scaleout=False):
         """
         This function instantiates VNFs for every VNF in this Network Service
         """
         self._log.debug("Instantiating %u VNFs in NS %s", len(vnfrs), self.id)
         for vnf in vnfrs:
             self._log.debug("Instantiating VNF: %s in NS %s", vnf, self.id)
-            yield from self.nsm_plugin.instantiate_vnf(self, vnf)
+            yield from self.nsm_plugin.instantiate_vnf(self, vnf,scaleout)
 
     @asyncio.coroutine
     def instantiate_vnffgs(self):
@@ -2351,9 +2350,12 @@
 
         def on_instantiate_done(fut):
             # If the do_instantiate fails, then publish NSR with failed result
-            if fut.exception() is not None:
-                self._log.error("NSR instantiation failed for NSR id %s: %s", self.id, str(fut.exception()))
-                self._loop.create_task(self.instantiation_failed(failed_reason=str(fut.exception())))
+            e = fut.exception()
+            if e is not None:
+                import traceback, sys
+                print(traceback.format_exception(None,e, e.__traceback__), file=sys.stderr, flush=True)
+                self._log.error("NSR instantiation failed for NSR id %s: %s", self.id, str(e))
+                self._loop.create_task(self.instantiation_failed(failed_reason=str(e)))
 
         instantiate_task = self._loop.create_task(do_instantiate())
         instantiate_task.add_done_callback(on_instantiate_done)
@@ -3382,6 +3384,8 @@
                             raise NsrVlUpdateError("NS config NSD should have atleast 1 VLD defined")
 
                     if msg.has_field("scaling_group"):
+                        self._log.debug("ScaleMsg %s", msg)
+                        self._log.debug("NSSCALINGSTATE %s", nsr.state)
                         if nsr.state != NetworkServiceRecordState.RUNNING:
                             raise ScalingOperationError("Unable to perform scaling action when NS is not in running state")
 
@@ -3863,15 +3867,15 @@
 
     def create_nsr(self, nsr_msg, key_pairs=None,restart_mode=False):
         """ Create an NSR instance """
+        self._log.debug("NSRMSG %s", nsr_msg)
         if nsr_msg.id in self._nsrs:
             msg = "NSR id %s already exists" % nsr_msg.id
             self._log.error(msg)
             raise NetworkServiceRecordError(msg)
 
-        self._log.info("Create NetworkServiceRecord nsr id %s from nsd_id %s, restart mode %s",
+        self._log.info("Create NetworkServiceRecord nsr id %s from nsd_id %s",
                        nsr_msg.id,
-                       nsr_msg.nsd.id,
-                       restart_mode)
+                       nsr_msg.nsd.id)
 
         nsm_plugin = self._ro_plugin_selector.ro_plugin
         sdn_account_name = self._cloud_account_handler.get_cloud_account_sdn_name(nsr_msg.cloud_account)
diff --git a/rwlaunchpad/plugins/yang/rw-pkg-mgmt.tailf.yang b/rwlaunchpad/plugins/yang/rw-pkg-mgmt.tailf.yang
index 1086af9..e6e50c6 100644
--- a/rwlaunchpad/plugins/yang/rw-pkg-mgmt.tailf.yang
+++ b/rwlaunchpad/plugins/yang/rw-pkg-mgmt.tailf.yang
@@ -35,6 +35,10 @@
     tailf:callpoint rw_callpoint;
   }
 
+  tailf:annotate "/rw-pkg-mgmt:copy-jobs" {
+    tailf:callpoint rw_callpoint;
+  }
+
   tailf:annotate "/rw-pkg-mgmt:get-package-endpoint" {
      tailf:actionpoint rw_actionpoint;
   }