diff --git a/xos/synchronizer/steps/helpers.py b/xos/synchronizer/steps/helpers.py
index 5a3eda9..1f53674 100644
--- a/xos/synchronizer/steps/helpers.py
+++ b/xos/synchronizer/steps/helpers.py
@@ -23,7 +23,7 @@
             return 'http://%s' % url
     @staticmethod
     def get_onos_fabric_service():
-        fabric_service = Service.objects.get(name="fabric") # TODO understand why FabricService.leaf_model is still FabricService and not service
+        # FIXME do not select by name but follow ServiceDependency
+        fabric_service = Service.objects.get(name="fabric")
         onos_fabric_service = fabric_service.subscriber_services[0].leaf_model
-
         return onos_fabric_service
\ No newline at end of file
diff --git a/xos/synchronizer/steps/sync_fabric_port.py b/xos/synchronizer/steps/sync_fabric_port.py
index a88874b..793bfd2 100644
--- a/xos/synchronizer/steps/sync_fabric_port.py
+++ b/xos/synchronizer/steps/sync_fabric_port.py
@@ -15,7 +15,7 @@
 
 import requests
 from requests.auth import HTTPBasicAuth
-from synchronizers.new_base.syncstep import SyncStep, DeferredException
+from synchronizers.new_base.syncstep import SyncStep, DeferredException, model_accessor
 from synchronizers.new_base.modelaccessor import FabricService, SwitchPort
 
 from xosconfig import Config
@@ -30,6 +30,7 @@
     observes = SwitchPort
 
     def sync_record(self, model):
+        log.info("Adding port %s/%s to onos-fabric" % (model.switch.ofId, model.portId))
         interfaces = []
         for intf in model.interfaces.all():
             i = {
@@ -52,6 +53,7 @@
         onos = Helpers.get_onos_fabric_service()
 
         url = 'http://%s:%s/onos/v1/network/configuration/' % (onos.rest_hostname, onos.rest_port)
+
         r = requests.post(url, json=data, auth=HTTPBasicAuth(onos.rest_username, onos.rest_password))
 
         if r.status_code != 200:
@@ -63,5 +65,13 @@
             except Exception:
                 print r.text
 
-    def delete_record(self, switch):
-        pass
+    def delete_record(self, model):
+        log.info("Removing port %s/%s from onos-fabric" % (model.switch.ofId, model.portId))
+        onos = Helpers.get_onos_fabric_service()
+        url = 'http://%s:%s/onos/v1/network/configuration/ports/%s/%s' % (onos.rest_hostname, onos.rest_port, model.switch.ofId, model.portId)
+
+        r = requests.delete(url, auth=HTTPBasicAuth(onos.rest_username, onos.rest_password))
+
+        if r.status_code != 204:
+            log.error(r.text)
+            raise Exception("Failed to remove port %s from ONOS" % model.name)
diff --git a/xos/synchronizer/steps/sync_fabric_switch.py b/xos/synchronizer/steps/sync_fabric_switch.py
index e2e47ce..7f5aa17 100644
--- a/xos/synchronizer/steps/sync_fabric_switch.py
+++ b/xos/synchronizer/steps/sync_fabric_switch.py
@@ -15,7 +15,7 @@
 
 import requests
 from requests.auth import HTTPBasicAuth
-from synchronizers.new_base.syncstep import SyncStep, DeferredException
+from synchronizers.new_base.syncstep import SyncStep, model_accessor
 from synchronizers.new_base.modelaccessor import FabricService, Switch
 
 from xosconfig import Config
@@ -30,6 +30,7 @@
     observes = Switch
 
     def sync_record(self, model):
+        log.info("Adding switch %s to onos-fabric" % model.name)
         # Send device info to onos-fabric netcfg
         data = {
           "devices": {
@@ -64,5 +65,14 @@
             except Exception:
                 print r.text
 
-    def delete_record(self, switch):
-        pass
+    def delete_record(self, model):
+        log.info("Removing switch %s from onos-fabric" % model.name)
+        onos = Helpers.get_onos_fabric_service()
+        url = 'http://%s:%s/onos/v1/network/configuration/devices/%s' % (
+        onos.rest_hostname, onos.rest_port, model.ofId)
+
+        r = requests.delete(url, auth=HTTPBasicAuth(onos.rest_username, onos.rest_password))
+
+        if r.status_code != 204:
+            log.error(r.text)
+            raise Exception("Failed to remove switch %s from ONOS" % model.name)
diff --git a/xos/synchronizer/steps/test_sync_fabric_port.py b/xos/synchronizer/steps/test_sync_fabric_port.py
new file mode 100644
index 0000000..00aded5
--- /dev/null
+++ b/xos/synchronizer/steps/test_sync_fabric_port.py
@@ -0,0 +1,195 @@
+# Copyright 2017-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import unittest
+
+import functools
+from mock import patch, call, Mock, PropertyMock
+import requests_mock
+import multistructlog
+from multistructlog import create_logger
+
+import os, sys
+
+# Hack to load synchronizer framework
+test_path=os.path.abspath(os.path.dirname(os.path.realpath(__file__)))
+xos_dir=os.path.join(test_path, "../../..")
+if not os.path.exists(os.path.join(test_path, "new_base")):
+    xos_dir=os.path.join(test_path, "../../../../../../orchestration/xos/xos")
+    services_dir = os.path.join(xos_dir, "../../xos_services")
+sys.path.append(xos_dir)
+sys.path.append(os.path.join(xos_dir, 'synchronizers', 'new_base'))
+# END Hack to load synchronizer framework
+
+# generate model from xproto
+def get_models_fn(service_name, xproto_name):
+    name = os.path.join(service_name, "xos", xproto_name)
+    if os.path.exists(os.path.join(services_dir, name)):
+        return name
+    else:
+        name = os.path.join(service_name, "xos", "synchronizer", "models", xproto_name)
+        if os.path.exists(os.path.join(services_dir, name)):
+            return name
+    raise Exception("Unable to find service=%s xproto=%s" % (service_name, xproto_name))
+# END generate model from xproto
+
+def match_json(desired, req):
+    if desired!=req.json():
+        raise Exception("Got request %s, but body is not matching" % req.url)
+        return False
+    return True
+
+class TestSyncFabricPort(unittest.TestCase):
+
+    def setUp(self):
+        global DeferredException
+
+        self.sys_path_save = sys.path
+        sys.path.append(xos_dir)
+        sys.path.append(os.path.join(xos_dir, 'synchronizers', 'new_base'))
+
+        # Setting up the config module
+        from xosconfig import Config
+        config = os.path.join(test_path, "../test_config.yaml")
+        Config.clear()
+        Config.init(config, "synchronizer-config-schema.yaml")
+        # END Setting up the config module
+
+        from synchronizers.new_base.mock_modelaccessor_build import build_mock_modelaccessor
+        build_mock_modelaccessor(xos_dir, services_dir, [get_models_fn("fabric", "fabric.xproto")])
+        import synchronizers.new_base.modelaccessor
+
+        from sync_fabric_port import SyncFabricPort, model_accessor
+
+        # import all class names to globals
+        for (k, v) in model_accessor.all_model_classes.items():
+            globals()[k] = v
+
+
+        self.sync_step = SyncFabricPort
+        self.sync_step.log = Mock()
+
+
+        # mock onos-fabric
+        onos_fabric = Mock()
+        onos_fabric.name = "onos-fabric"
+        onos_fabric.rest_hostname = "onos-fabric"
+        onos_fabric.rest_port = "8181"
+        onos_fabric.rest_username = "onos"
+        onos_fabric.rest_password = "rocks"
+
+        onos_fabric_base = Mock()
+        onos_fabric_base.leaf_model = onos_fabric
+
+        self.fabric = Mock()
+        self.fabric.name = "fabric"
+        self.fabric.subscriber_services = [onos_fabric_base]
+
+        # create a mock SwitchPort instance
+        self.o = Mock()
+        self.o.id = 1
+        self.o.tologdict.return_value = {}
+
+
+
+
+    def tearDown(self):
+        self.o = None
+        sys.path = self.sys_path_save
+
+    @requests_mock.Mocker()
+    def test_sync_port(self, m):
+        intf1 = Mock()
+        intf1.name = "intf1"
+        intf1.ips = "1.1.1.1/16"
+        intf1.vlanUntagged = None
+
+        self.o.interfaces.all.return_value = [intf1]
+        self.o.switch.ofId = "of:1234"
+        self.o.portId = "1"
+
+        expected_conf = {
+            "ports": {
+                "%s/%s" % (self.o.switch.ofId, self.o.portId): {
+                    "interfaces": [
+                        {
+                            "name": intf1.name,
+                            "ips": [ intf1.ips ]
+                        }
+                    ]
+                }
+            }
+        }
+
+        m.post("http://onos-fabric:8181/onos/v1/network/configuration/",
+               status_code=200,
+               additional_matcher=functools.partial(match_json, expected_conf))
+
+        with patch.object(Service.objects, "get") as onos_fabric_get:
+            onos_fabric_get.return_value = self.fabric
+
+            self.sync_step().sync_record(self.o)
+
+            self.assertTrue(m.called)
+
+    @requests_mock.Mocker()
+    def test_sync_port_with_vlan(self, m):
+        intf1 = Mock()
+        intf1.name = "intf1"
+        intf1.ips = "1.1.1.1/16"
+        intf1.vlanUntagged = 42
+
+        self.o.interfaces.all.return_value = [intf1]
+        self.o.switch.ofId = "of:1234"
+        self.o.portId = "1"
+
+        expected_conf = {
+            "ports": {
+                "%s/%s" % (self.o.switch.ofId, self.o.portId): {
+                    "interfaces": [
+                        {
+                            "name": intf1.name,
+                            "ips": [intf1.ips],
+                            "vlan-untagged": intf1.vlanUntagged
+                        }
+                    ]
+                }
+            }
+        }
+
+        m.post("http://onos-fabric:8181/onos/v1/network/configuration/",
+               status_code=200,
+               additional_matcher=functools.partial(match_json, expected_conf))
+
+        with patch.object(Service.objects, "get") as onos_fabric_get:
+            onos_fabric_get.return_value = self.fabric
+
+            self.sync_step().sync_record(self.o)
+
+            self.assertTrue(m.called)
+
+    @requests_mock.Mocker()
+    def test_delete_port(self, m):
+        m.delete("http://onos-fabric:8181/onos/v1/network/configuration/ports/of:1234/1",
+            status_code=204)
+
+        self.o.switch.ofId = "of:1234"
+        self.o.portId = "1"
+
+        with patch.object(Service.objects, "get") as onos_fabric_get:
+            onos_fabric_get.return_value = self.fabric
+
+            self.sync_step().delete_record(self.o)
+
+            self.assertTrue(m.called)
\ No newline at end of file
diff --git a/xos/synchronizer/steps/test_sync_fabric_switch.py b/xos/synchronizer/steps/test_sync_fabric_switch.py
new file mode 100644
index 0000000..c3345e7
--- /dev/null
+++ b/xos/synchronizer/steps/test_sync_fabric_switch.py
@@ -0,0 +1,161 @@
+# Copyright 2017-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import unittest
+
+import functools
+from mock import patch, call, Mock, PropertyMock
+import requests_mock
+import multistructlog
+from multistructlog import create_logger
+
+import os, sys
+
+# Hack to load synchronizer framework
+test_path=os.path.abspath(os.path.dirname(os.path.realpath(__file__)))
+xos_dir=os.path.join(test_path, "../../..")
+if not os.path.exists(os.path.join(test_path, "new_base")):
+    xos_dir=os.path.join(test_path, "../../../../../../orchestration/xos/xos")
+    services_dir = os.path.join(xos_dir, "../../xos_services")
+sys.path.append(xos_dir)
+sys.path.append(os.path.join(xos_dir, 'synchronizers', 'new_base'))
+# END Hack to load synchronizer framework
+
+# generate model from xproto
+def get_models_fn(service_name, xproto_name):
+    name = os.path.join(service_name, "xos", xproto_name)
+    if os.path.exists(os.path.join(services_dir, name)):
+        return name
+    else:
+        name = os.path.join(service_name, "xos", "synchronizer", "models", xproto_name)
+        if os.path.exists(os.path.join(services_dir, name)):
+            return name
+    raise Exception("Unable to find service=%s xproto=%s" % (service_name, xproto_name))
+# END generate model from xproto
+
+def match_json(desired, req):
+    if desired!=req.json():
+        raise Exception("Got request %s, but body is not matching" % req.url)
+        return False
+    return True
+
+class TestSyncFabricSwitch(unittest.TestCase):
+
+    def setUp(self):
+        global DeferredException
+
+        self.sys_path_save = sys.path
+        sys.path.append(xos_dir)
+        sys.path.append(os.path.join(xos_dir, 'synchronizers', 'new_base'))
+
+        # Setting up the config module
+        from xosconfig import Config
+        config = os.path.join(test_path, "../test_config.yaml")
+        Config.clear()
+        Config.init(config, "synchronizer-config-schema.yaml")
+        # END Setting up the config module
+
+        from synchronizers.new_base.mock_modelaccessor_build import build_mock_modelaccessor
+        build_mock_modelaccessor(xos_dir, services_dir, [get_models_fn("fabric", "fabric.xproto")])
+        import synchronizers.new_base.modelaccessor
+
+        from sync_fabric_switch import SyncFabricSwitch, model_accessor
+
+        # import all class names to globals
+        for (k, v) in model_accessor.all_model_classes.items():
+            globals()[k] = v
+
+
+        self.sync_step = SyncFabricSwitch
+        self.sync_step.log = Mock()
+
+
+        # mock onos-fabric
+        onos_fabric = Mock()
+        onos_fabric.name = "onos-fabric"
+        onos_fabric.rest_hostname = "onos-fabric"
+        onos_fabric.rest_port = "8181"
+        onos_fabric.rest_username = "onos"
+        onos_fabric.rest_password = "rocks"
+
+        onos_fabric_base = Mock()
+        onos_fabric_base.leaf_model = onos_fabric
+
+        self.fabric = Mock()
+        self.fabric.name = "fabric"
+        self.fabric.subscriber_services = [onos_fabric_base]
+
+        # create a mock Switch instance
+        self.o = Mock()
+        self.o.name = "MockSwitch"
+        self.o.ofId = "of:1234"
+
+    def tearDown(self):
+        self.o = None
+        sys.path = self.sys_path_save
+
+    @requests_mock.Mocker()
+    def test_sync_switch(self, m):
+
+        self.o.ofId = "of:1234"
+        self.o.portId = "1"
+        self.o.driver = "ofdpa3"
+        self.o.ipv4NodeSid = "17"
+        self.o.ipv4Loopback = "192.168.0.201"
+        self.o.routerMac = "00:00:02:01:06:01"
+        self.o.isEdgeRouter = False
+
+        expected_conf = {
+            "devices": {
+                self.o.ofId: {
+                    "basic": {
+                    "name": self.o.name,
+                    "driver": self.o.driver
+                },
+                "segmentrouting" : {
+                    "name" : self.o.name,
+                    "ipv4NodeSid" : self.o.ipv4NodeSid,
+                    "ipv4Loopback" : self.o.ipv4Loopback,
+                    "routerMac" : self.o.routerMac,
+                    "isEdgeRouter" : self.o.isEdgeRouter,
+                    "adjacencySids" : []
+              }
+                }
+            }
+        }
+
+        m.post("http://onos-fabric:8181/onos/v1/network/configuration/",
+               status_code=200,
+               additional_matcher=functools.partial(match_json, expected_conf))
+
+        with patch.object(Service.objects, "get") as onos_fabric_get:
+            onos_fabric_get.return_value = self.fabric
+
+            self.sync_step().sync_record(self.o)
+
+            self.assertTrue(m.called)
+
+    @requests_mock.Mocker()
+    def test_delete_switch(self, m):
+        m.delete("http://onos-fabric:8181/onos/v1/network/configuration/devices/of:1234",
+            status_code=204)
+
+        self.o.ofId = "of:1234"
+
+        with patch.object(Service.objects, "get") as onos_fabric_get:
+            onos_fabric_get.return_value = self.fabric
+
+            self.sync_step().delete_record(self.o)
+
+            self.assertTrue(m.called)
\ No newline at end of file
diff --git a/xos/synchronizer/test_config.yaml b/xos/synchronizer/test_config.yaml
new file mode 100644
index 0000000..97a4327
--- /dev/null
+++ b/xos/synchronizer/test_config.yaml
@@ -0,0 +1,29 @@
+
+# Copyright 2017-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+name: fabric
+accessor:
+  username: xosadmin@opencord.org
+  password: "sample"
+  kind: "testframework"
+logging:
+  version: 1
+  handlers:
+    console:
+      class: logging.StreamHandler
+  loggers:
+    'multistructlog':
+      handlers:
+          - console