diff --git a/configuration/external-connectivity.rst b/configuration/external-connectivity.rst
index a9ac538..0ecf272 100644
--- a/configuration/external-connectivity.rst
+++ b/configuration/external-connectivity.rst
@@ -28,28 +28,28 @@
 
 .. code-block:: json
 
-	{
-	  "ports" : {
-	    "of:0000000000000001/1" : {
-	      "interfaces" : [
-	        {
-	          "name" : "upstream1",
-	          "ips"  : [ "10.0.1.2/24" ],
-	          "vlan-untagged" : 4000
-	        }
-	      ]
-	    },
-	    "of:0000000000000001/2" : {
-	      "interfaces" : [
-	          {
-	            "name" : "quagga",
-	            "ips"  : [ "10.0.1.2/24" ],
-	            "vlan-untagged" : 4000
-	          }
-	      ]
-	    }
-	  }
-	}
+    {
+      "ports" : {
+        "of:0000000000000001/1" : {
+          "interfaces" : [
+            {
+              "name" : "upstream1",
+              "ips"  : [ "10.0.1.2/24" ],
+              "vlan-untagged" : 4000
+            }
+          ]
+        },
+        "of:0000000000000001/2" : {
+          "interfaces" : [
+              {
+                "name" : "quagga",
+                "ips"  : [ "10.0.1.2/24" ],
+                "vlan-untagged" : 4000
+              }
+          ]
+        }
+      }
+    }
 
 - ``name``: An arbitrary name string for the interface. Optional.
 - ``ips``: Configure the peering subnet (10.0.1.0/24) and the switch port IP (10.0.1.2).
@@ -65,11 +65,11 @@
 Of course you are not obliged to use ``10.0.1.0/24``, you should use a subnet that makes sense for your peering environment.
 
 .. note::
-	This configuration will set up an L2 link between the two fabric switch ports, over which the Quagga and external router can communicate.
-	Both Quagga and the upstream router will receive untagged packets
-	(i.e they will never see packets with vlanId 4000, which is used inside the leaf switch to establish a bridging domain).
+    This configuration will set up an L2 link between the two fabric switch ports, over which the Quagga and external router can communicate.
+    Both Quagga and the upstream router will receive untagged packets
+    (i.e they will never see packets with vlanId 4000, which is used inside the leaf switch to establish a bridging domain).
 
-	If you need a vlan-tag in the compute node to distinguish the traffic going to Quagga, you can change the vlan assignment on the switch port "of:0000000000000001/2" to be vlan-tagged instead of vlan-untagged.
+    If you need a vlan-tag in the compute node to distinguish the traffic going to Quagga, you can change the vlan assignment on the switch port "of:0000000000000001/2" to be vlan-tagged instead of vlan-untagged.
 
 Deploy the Quagga Docker Image
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -77,14 +77,14 @@
 
 .. code-block:: console
 
-	$ docker pull opencord/quagga
+    $ docker pull opencord/quagga
 
 We also need to download the **pipework** tool which will be used to connect the docker image to the physical interface that we set aside earlier.
 
 .. code-block:: console
 
-	$ wget https://raw.githubusercontent.com/jpetazzo/pipework/master/pipework
-	$ chmod +x pipework
+    $ wget https://raw.githubusercontent.com/jpetazzo/pipework/master/pipework
+    $ chmod +x pipework
 
 Create a directory for your Quagga configuration files, and create a bgpd.conf and zebra.conf in there.
 This folder is going to be mounted into the Quagga container.
@@ -92,20 +92,20 @@
 
 .. code-block:: console
 
-	$ mkdir configs
-	$ touch zebra.conf bgpd.conf
+    $ mkdir configs
+    $ touch zebra.conf bgpd.conf
 
 Now run the docker image (make sure the path the config directory matches what is on your system):
 
 .. code-block:: console
 
-	$ sudo docker run --privileged -d -v configs:/etc/quagga -n quagga opencord/quagga
+    $ sudo docker run --privileged -d -v configs:/etc/quagga -n quagga opencord/quagga
 
 Finally, we can use the pipework tool to add the physical interface into the container so that Quagga can talk out over the fabric:
 
 .. code-block:: console
 
-	$ sudo ./pipework mlx1 -i eth1 quagga 10.0.1.3/24
+    $ sudo ./pipework mlx1 -i eth1 quagga 10.0.1.3/24
 
 This will add host interface ``mlx1`` to the container with name ``quagga`` with interface name ``eth1`` inside the container.
 The newly added interface will have the IP ``10.0.1.3``.
@@ -115,8 +115,8 @@
 
 .. code-block:: console
 
-	$ sudo docker rm -f quagga
-	$ sudo docker run --privileged -d -v configs:/etc/quagga -n quagga opencord/quagga
+    $ sudo docker rm -f quagga
+    $ sudo docker run --privileged -d -v configs:/etc/quagga -n quagga opencord/quagga
 
 Configure Quagga
 ^^^^^^^^^^^^^^^^
@@ -138,12 +138,12 @@
 
 .. code-block:: text
 
-	!
-	hostname cord-zebra
-	password cord
-	!
-	fpm connection ip 10.6.0.1 port 2620
-	!
+    !
+    hostname cord-zebra
+    password cord
+    !
+    fpm connection ip 10.6.0.1 port 2620
+    !
 
 The FPM connection IP address is the IP address of **one of the onos cluster instances** - does not matter which one.
 If you have other configuration that needs to go in zebra.conf you should add that here as well.
@@ -154,34 +154,34 @@
 
 .. code-block:: text
 
-	hostname bgp
-	password cord
-	!
-	ip prefix-list 1 seq 10 permit 192.168.0.0/16
-	!
-	route-map NEXTHOP permit 10
-	match ip address prefix-list 1
-	set ip next-hop 10.0.1.2
-	!
-	router bgp 65535
-	  bgp router-id 10.0.1.3
-	  !
-	  network 192.168.0.0/16
-	  !
-	  neighbor 10.0.1.1 remote-as 65540
-	  neighbor 10.0.1.1 description upstream1
-	  neighbor 10.0.1.1 route-map NEXTHOP out
-	  !
+    hostname bgp
+    password cord
+    !
+    ip prefix-list 1 seq 10 permit 192.168.0.0/16
+    !
+    route-map NEXTHOP permit 10
+    match ip address prefix-list 1
+    set ip next-hop 10.0.1.2
+    !
+    router bgp 65535
+      bgp router-id 10.0.1.3
+      !
+      network 192.168.0.0/16
+      !
+      neighbor 10.0.1.1 remote-as 65540
+      neighbor 10.0.1.1 description upstream1
+      neighbor 10.0.1.1 route-map NEXTHOP out
+      !
 
 This configuration peers with one upstream router ``10.0.1.1`` and advertises one route ``192.168.0.0/16``.
 Note that Quagga (and as a result Trellis) is in a different AS ``65535`` from the upstream router AS ``65540``,
 as we are using E-BGP for this connectivity.
 
 .. note::
-	Pay attention to the configuration to rewrite the next hop of routes that are advertised to the upstream router.
-	A ``route-map`` is used to set the next hop of advertised routes to ``10.0.1.2``,
-	which is **different from the address that Quagga is using to peer with the external router**.
-	As mentioned above, it is important that this rewriting is done correctly so that the fabric switch is able to **distinguish data plane and control plane** traffic.
+    Pay attention to the configuration to rewrite the next hop of routes that are advertised to the upstream router.
+    A ``route-map`` is used to set the next hop of advertised routes to ``10.0.1.2``,
+    which is **different from the address that Quagga is using to peer with the external router**.
+    As mentioned above, it is important that this rewriting is done correctly so that the fabric switch is able to **distinguish data plane and control plane** traffic.
 
 
 Route service and static route
@@ -197,25 +197,25 @@
 
 .. code-block:: text
 
-	onos> routes
+    onos> routes
 
-	B: Best route, R: Resolved route
+    B: Best route, R: Resolved route
 
-	Table: ipv4
-	B R  Network            Next Hop        Source (Node)
-	     0.0.0.0/0          172.16.0.1      FPM (127.0.0.1)
-	> *  1.1.0.0/18         10.0.1.20       STATIC
-	> *  10.0.99.0/24       10.0.1.1        FPM (127.0.0.1)
-	  *  10.0.99.0/24       10.0.6.1        FPM (127.0.0.1)
-	   Total: 2
+    Table: ipv4
+    B R  Network            Next Hop        Source (Node)
+         0.0.0.0/0          172.16.0.1      FPM (127.0.0.1)
+    > *  1.1.0.0/18         10.0.1.20       STATIC
+    > *  10.0.99.0/24       10.0.1.1        FPM (127.0.0.1)
+      *  10.0.99.0/24       10.0.6.1        FPM (127.0.0.1)
+       Total: 2
 
-	Table: ipv6
-	B R  Network                                     Next Hop                                Source (Node)
-	> *  2000::7700/120                              fe80::288:ff:fe00:1                     FPM (127.0.0.1)
-	> *  2000::8800/120                              fe80::288:ff:fe00:2                     FPM (127.0.0.1)
-	> *  2000::9900/120                              fe80::288:ff:fe00:1                     FPM (127.0.0.1)
-	  *  2000::9900/120                              fe80::288:ff:fe00:2                     FPM (127.0.0.1)
-	   Total: 3
+    Table: ipv6
+    B R  Network                                     Next Hop                                Source (Node)
+    > *  2000::7700/120                              fe80::288:ff:fe00:1                     FPM (127.0.0.1)
+    > *  2000::8800/120                              fe80::288:ff:fe00:2                     FPM (127.0.0.1)
+    > *  2000::9900/120                              fe80::288:ff:fe00:1                     FPM (127.0.0.1)
+      *  2000::9900/120                              fe80::288:ff:fe00:2                     FPM (127.0.0.1)
+       Total: 3
 
 
 Add a static route
@@ -223,9 +223,9 @@
 
 .. code-block:: console
 
-	onos> route-add <prefix> <nexthop>
-	onos> route-add 1.1.0.0/18 10.0.1.20
-	onos> route-add 2020::101/120 2000::1
+    onos> route-add <prefix> <nexthop>
+    onos> route-add 1.1.0.0/18 10.0.1.20
+    onos> route-add 2020::101/120 2000::1
 
 
 Remove a static route
@@ -233,8 +233,8 @@
 
 .. code-block:: console
 
-	onos> route-remove <prefix> <nexthop>
-	onos> route-remove 1.1.0.0/18 10.0.1.20
+    onos> route-remove <prefix> <nexthop>
+    onos> route-remove 1.1.0.0/18 10.0.1.20
 
 
 Access route service via REST
@@ -245,18 +245,18 @@
 
 .. code-block:: console
 
-	$ curl --user onos:rocks -X POST -H 'Content-Type:application/json' http://<controller-ip>:8181/onos/routeservice/routes -d@routes.json
-	$ curl --user onos:rocks -X GET -H 'Accept:application/json' http://<controller-ip>:8181/onos/routeservice/routes | python -mjson.tool
-	$ curl --user onos:rocks -X DELETE -H 'Content-Type:application/json' http://<controller-ip>:8181/onos/routeservice/routes -d@routes.json
+    $ curl --user onos:rocks -X POST -H 'Content-Type:application/json' http://<controller-ip>:8181/onos/routeservice/routes -d@routes.json
+    $ curl --user onos:rocks -X GET -H 'Accept:application/json' http://<controller-ip>:8181/onos/routeservice/routes | python -mjson.tool
+    $ curl --user onos:rocks -X DELETE -H 'Content-Type:application/json' http://<controller-ip>:8181/onos/routeservice/routes -d@routes.json
 
 with identical json format for both POST and DELETE:
 
 .. code-block:: json
 
-	{
-	  "prefix": "20.0.0.1/24",
-	  "nextHop": "10.0.1.10"
-	}
+    {
+      "prefix": "20.0.0.1/24",
+      "nextHop": "10.0.1.10"
+    }
 
 
 Bulk routes
@@ -264,25 +264,25 @@
 
 .. code-block:: console
 
-	$ curl --user onos:rocks -X POST -H 'Content-Type:application/json' http://<controller-ip>:8181/onos/routeservice/routes/bulk -d@routes.json
-	$ curl --user onos:rocks -X DELETE -H 'Content-Type:application/json' http://<controller-ip>:8181/onos/routeservice/routes/bulk -d@routes.json
+    $ curl --user onos:rocks -X POST -H 'Content-Type:application/json' http://<controller-ip>:8181/onos/routeservice/routes/bulk -d@routes.json
+    $ curl --user onos:rocks -X DELETE -H 'Content-Type:application/json' http://<controller-ip>:8181/onos/routeservice/routes/bulk -d@routes.json
 
 with identical json format for both POST and DELETE:
 
 .. code-block:: json
 
-	{
-	  "routes": [
-	    {
-	      "prefix": "20.0.0.1/24",
-	      "nextHop": "10.0.1.10"
-	    },
-	    {
-	      "prefix": "30.0.0.1/24",
-	      "nextHop": "10.0.2.15"
-	    }
-	  ]
-	}
+    {
+      "routes": [
+        {
+          "prefix": "20.0.0.1/24",
+          "nextHop": "10.0.1.10"
+        },
+        {
+          "prefix": "30.0.0.1/24",
+          "nextHop": "10.0.2.15"
+        }
+      ]
+    }
 
 
 Verify routes
@@ -291,11 +291,11 @@
 
 .. code-block:: console
 
-	onos> flows any of:0000000000000205 30
-	<snip>
-	id=670000d1f6782c, state=ADDED, bytes=0, packets=0, duration=39, liveType=UNKNOWN, priority=36010, tableId=30, appId=org.onosproject.segmentrouting, payLoad=null, selector=[ETH_TYPE:ipv4, IPV4_DST:1.1.0.0/18],
-	 treatment=DefaultTrafficTreatment{immediate=[], deferred=[GROUP:0x70000014], transition=TABLE:60, meter=None, cleared=false, metadata=null}
-	<snip>
+    onos> flows any of:0000000000000205 30
+    <snip>
+    id=670000d1f6782c, state=ADDED, bytes=0, packets=0, duration=39, liveType=UNKNOWN, priority=36010, tableId=30, appId=org.onosproject.segmentrouting, payLoad=null, selector=[ETH_TYPE:ipv4, IPV4_DST:1.1.0.0/18],
+     treatment=DefaultTrafficTreatment{immediate=[], deferred=[GROUP:0x70000014], transition=TABLE:60, meter=None, cleared=false, metadata=null}
+    <snip>
 
 Notes about next hops
 ^^^^^^^^^^^^^^^^^^^^^
@@ -305,11 +305,11 @@
 
 .. code-block:: console
 
-	onos> hosts
-	<snip>
-	id=A2:9B:32:9D:7F:B3/None, mac=A2:9B:32:9D:7F:B3, location=of:0000000000000205/48, vlan=None, ip(s)=[192.168.101.2], configured=false
-	id=B2:A4:E2:72:D1:91/None, mac=B2:A4:E2:72:D1:91, location=of:0000000000000204/16, vlan=None, ip(s)=[10.0.1.20], configured=false
-	id=EE:22:F7:BE:86:50/None, mac=EE:22:F7:BE:86:50, location=of:0000000000000205/16, vlan=None, ip(s)=[10.0.2.15], configured=false
+    onos> hosts
+    <snip>
+    id=A2:9B:32:9D:7F:B3/None, mac=A2:9B:32:9D:7F:B3, location=of:0000000000000205/48, vlan=None, ip(s)=[192.168.101.2], configured=false
+    id=B2:A4:E2:72:D1:91/None, mac=B2:A4:E2:72:D1:91, location=of:0000000000000204/16, vlan=None, ip(s)=[10.0.1.20], configured=false
+    id=EE:22:F7:BE:86:50/None, mac=EE:22:F7:BE:86:50, location=of:0000000000000205/16, vlan=None, ip(s)=[10.0.2.15], configured=false
 
 If the next hop has not been resolved for any reason, it would be necessary to configure the next hop as a host (/32 prefix) together with MAC address and location.
 Learn more about how to configure a host using `Network Config Host Provider <https://wiki.onosproject.org/display/ONOS/Network+Config+Host+Provider>`_
@@ -327,20 +327,20 @@
 
 .. code-block:: text
 
-	ADDED, bytes=0, packets=0, table=30, priority=48010, selector=[ETH_TYPE:ipv4, IPV4_DST:50.0.0.0/24], treatment=[transition=TABLE:60]
+    ADDED, bytes=0, packets=0, table=30, priority=48010, selector=[ETH_TYPE:ipv4, IPV4_DST:50.0.0.0/24], treatment=[transition=TABLE:60]
 
 Route blackholing can be done via network configuration.
 
 .. code-block:: json
 
-	{
-	  "apps" : {
-	    "org.onosproject.segmentrouting" : {
-	      "segmentrouting": {
-	        "blackholeIps": [
-	          "50.0.0.0/24"
-	        ]
-	      }
-	    }
-	  }
-	}
+    {
+      "apps" : {
+        "org.onosproject.segmentrouting" : {
+          "segmentrouting": {
+            "blackholeIps": [
+              "50.0.0.0/24"
+            ]
+          }
+        }
+      }
+    }
diff --git a/development.rst b/development.rst
index 6ffe401..c9ee147 100644
--- a/development.rst
+++ b/development.rst
@@ -2,5 +2,5 @@
 *****************
 
 .. note::
-	We are updating the content of this page. More coming soon.
+    We are updating the content of this page. More coming soon.
 
diff --git a/testing.rst b/testing.rst
index a627e74..6213b74 100644
--- a/testing.rst
+++ b/testing.rst
@@ -4,15 +4,15 @@
 We use two open source test tools to test Trellis behavior.
 
 - **Data Plane Testing - OFTest**
-	We use **OFTest** to verify the **behavior of a hardware switch** is the same as described in the OF-DPA specification.
-	This tool was originally developed by Big Switch and later modified by Accton.
-	The test cases for verifying OF-DPA behavior were written by ONF.
-	To learn more about OFTest and how we use it for OF-DPA verification, please visit :doc:`Data Plane Testing <testing/data-plane-testing>`.
+    We use **OFTest** to verify the **behavior of a hardware switch** is the same as described in the OF-DPA specification.
+    This tool was originally developed by Big Switch and later modified by Accton.
+    The test cases for verifying OF-DPA behavior were written by ONF.
+    To learn more about OFTest and how we use it for OF-DPA verification, please visit :doc:`Data Plane Testing <testing/data-plane-testing>`.
 
 - **Control Plane Testing - TestON**
-	We use **TestON** to verify the **Trellis control application behavior** when used for a leaf-spine fabric.
-	These tests are merged into ONOS test repository and run nightly.
-	To learn more about TestON, please visit :doc:`Control Plane Testing <testing/control-plane-testing>`.
+    We use **TestON** to verify the **Trellis control application behavior** when used for a leaf-spine fabric.
+    These tests are merged into ONOS test repository and run nightly.
+    To learn more about TestON, please visit :doc:`Control Plane Testing <testing/control-plane-testing>`.
 
 .. toctree::
    :maxdepth: 1
diff --git a/testing/control-plane-testing.rst b/testing/control-plane-testing.rst
index f1c94c7..7499296 100644
--- a/testing/control-plane-testing.rst
+++ b/testing/control-plane-testing.rst
@@ -13,20 +13,20 @@
 -------------------------
 - Clone Mininet and run the install script
 
-	.. code-block:: console
+    .. code-block:: console
 
-		$ cd ~
-		$ git clone https://github.com/jhall11/mininet.git      # Clone the repository
-		$ cd mininet
-		$ git branch -v -a                                      # Show all the remote repositories
-		$ git checkout -b dynamic_topo origin/dynamic_topo      # Checkout the dynamic_topo repository
-		$ cd util
-		$ sudo ./install.sh -3fvn                               # Install OpenFlow 1.3, Open Vswitch and Mininet dependencies
+        $ cd ~
+        $ git clone https://github.com/jhall11/mininet.git      # Clone the repository
+        $ cd mininet
+        $ git branch -v -a                                      # Show all the remote repositories
+        $ git checkout -b dynamic_topo origin/dynamic_topo      # Checkout the dynamic_topo repository
+        $ cd util
+        $ sudo ./install.sh -3fvn                               # Install OpenFlow 1.3, Open Vswitch and Mininet dependencies
 
 - Follow `Trellis in a Box <https://github.com/opennetworkinglab/routing/tree/master/trellis>`_ to install Trellis dependencies, such as DHCP server and Quagga.
 
-	.. note::
-		If DHCP server does not properly run because of a permission error, please see `this <https://help.ubuntu.com/community/isc-dhcp-server#Permission_issues_with_ISC-DHCP_server>`_ to solve the problem.
+    .. note::
+        If DHCP server does not properly run because of a permission error, please see `this <https://help.ubuntu.com/community/    isc-dhcp-server#Permission_issues_with_ISC-DHCP_server>`_ to solve the problem.
 
 - Set environment variables as described in `Create a Cell File <../installation.html#create-a-cell-file>`_
 
@@ -44,16 +44,16 @@
 
 .. code-block:: console
 
-	cd ~/OnosSystemTest/TestON/bin
-	./cleanup.sh
+    cd ~/OnosSystemTest/TestON/bin
+    ./cleanup.sh
 
 Fabric-related tests are located in ``OnosSystemTest/TestON/tests/USECASE/SegmentRouting/``.
 Each individual test can be run by executing ``cli.py`` script with test name. For example:
 
 .. code-block:: console
 
-	cd ~/OnosSystemTest/TestON/bin
-	./cli.py run SRSanity
+    cd ~/OnosSystemTest/TestON/bin
+    ./cli.py run SRSanity
 
 
 Test Plan
@@ -68,12 +68,12 @@
 - 2x3 leaf-spine with dual-homed ToR on one leaf
 - 2x5 topology with spines S0 and S1, and leafs L0, L1, L2, L3, L4
 
-	- L1+L2 and L3+L4 are paired switches.
-	- All spine links with L1-4 are double links.
-	- Hosts take ips with dhcp and there exist 2 external routers.
-	- Hosts can use ipv4 or ipv6.
-	- We configure untagged/tagged single/dual home hosts in order to test every possible combination.
-	- Most of the hosts reside in different ip subnets.
+  - L1+L2 and L3+L4 are paired switches.
+  - All spine links with L1-4 are double links.
+  - Hosts take ips with dhcp and there exist 2 external routers.
+  - Hosts can use ipv4 or ipv6.
+  - We configure untagged/tagged single/dual home hosts in order to test every possible combination.
+  - Most of the hosts reside in different ip subnets.
 
 Tests Steps
 -----------
@@ -81,9 +81,9 @@
 - Start mininet and check flow state
 - Test connectivity
 
-	- pingall
-	- (Optional) ``ping 10.0.99.2`` to check external IPv4 connectivity
-	- (Optional) ``ping6 2000:9902`` to check external IPv6 connectivity
+  - pingall
+  - (Optional) ``ping 10.0.99.2`` to check external IPv4 connectivity
+  - (Optional) ``ping6 2000:9902`` to check external IPv6 connectivity
 - Additional actions and tests defined in each individual test case
 
 
diff --git a/testing/data-plane-testing.rst b/testing/data-plane-testing.rst
index 1d8307e..9c194db 100644
--- a/testing/data-plane-testing.rst
+++ b/testing/data-plane-testing.rst
@@ -19,12 +19,12 @@
 
 .. code-block:: console
 
-	$ sudo apt-get install python python-pip python-dev python-lxml libffi-dev libssl-dev -y
-	$ sudo pip install cryptography
-	$ sudo pip install ncclient
-	$ sudo pip install scapy pycrypto
-	$ sudo apt-get install python-ecdsa git
-	$ git clone https://gerrit.opencord.org/fabric-oftest
+    $ sudo apt-get install python python-pip python-dev python-lxml libffi-dev libssl-dev -y
+    $ sudo pip install cryptography
+    $ sudo pip install ncclient
+    $ sudo pip install scapy pycrypto
+    $ sudo apt-get install python-ecdsa git
+    $ git clone https://gerrit.opencord.org/fabric-oftest
 
 Now let's configure the switch and point it to the test server.
 It can be done in the same way as connecting the switch to any controller.
@@ -34,13 +34,13 @@
 
 .. code-block:: console
 
-	$ cd oftest
-	$ sudo ./oft -V1.3 --test-dir=ofdpa flows.PacketInArp -i 12@eth1 -i 24@eth2
-	WARNING: No route found for IPv6 destination :: (no default route?)
-	flows.PacketInArp ... ok
-	----------------------------------------------------------------------
-	Ran 1 test in 4.044s
-	OK
+    $ cd oftest
+    $ sudo ./oft -V1.3 --test-dir=ofdpa flows.PacketInArp -i 12@eth1 -i 24@eth2
+    WARNING: No route found for IPv6 destination :: (no default route?)
+    flows.PacketInArp ... ok
+    ----------------------------------------------------------------------
+    Ran 1 test in 4.044s
+    OK
 
 Run Tests
 =========
@@ -49,35 +49,35 @@
 
 .. code-block:: console
 
-	$ sudo ./oft -V1.3 --test-dir=ofdpa flows -i 12@eth1 -i 24@eth2
-	flows.ArpNL2 ... FAIL
-	flows.L2FloodQinQ ... ok
-	flows.L2FloodTagged ... ok
-	flows.L2FloodTaggedUnknownSrc ... ok
-	flows.L2UnicastTagged ... ok
-	flows.L3McastToL2 ... FAIL
-	flows.L3McastToL3 ... FAIL
-	flows.L3McastToVPN ... FAIL
-	flows.L3UcastTagged ... ok
-	flows.L3VPNMPLS ... ok
-	flows.L3VPN_32 ... FAIL
-	flows.MPLSBUG ... ok
-	flows.MplsTermination ... FAIL
-	flows.Mtu1500 ... ok
-	flows.Mtu4000 ... ERROR
-	flows.PacketInArp ... ok
-	flows.PacketInSrcMacMiss ... FAIL
-	flows.PacketInUDP ... ok
+    $ sudo ./oft -V1.3 --test-dir=ofdpa flows -i 12@eth1 -i 24@eth2
+    flows.ArpNL2 ... FAIL
+    flows.L2FloodQinQ ... ok
+    flows.L2FloodTagged ... ok
+    flows.L2FloodTaggedUnknownSrc ... ok
+    flows.L2UnicastTagged ... ok
+    flows.L3McastToL2 ... FAIL
+    flows.L3McastToL3 ... FAIL
+    flows.L3McastToVPN ... FAIL
+    flows.L3UcastTagged ... ok
+    flows.L3VPNMPLS ... ok
+    flows.L3VPN_32 ... FAIL
+    flows.MPLSBUG ... ok
+    flows.MplsTermination ... FAIL
+    flows.Mtu1500 ... ok
+    flows.Mtu4000 ... ERROR
+    flows.PacketInArp ... ok
+    flows.PacketInSrcMacMiss ... FAIL
+    flows.PacketInUDP ... ok
 
 For example, in this case, all the multicast failed because we don't have three ports, the test L3VPN failed as well, and that is a bug of the current build.
 The **PacketInSrcMac** Miss failed because Mac learning is not enabled.
 
 .. note::
-	Expected test results can be found in https://github.com/opencord/fabric-oftest/blob/master/README.md
+    Expected test results can be found in https://github.com/opencord/fabric-oftest/blob/master/README.md
 
 .. tip::
-	OFTest can't successfully delete all groups using an OF message, because of that some tests interfere with others.
-	If the results seem suspicious, **erase the flow tables and group tables** and run the test alone.
+    OFTest can't successfully delete all groups using an OF message, because of that some tests interfere with others.
+    If the results seem suspicious, **erase the flow tables and group tables** and run the test alone.
 
 
 
diff --git a/troubleshooting.rst b/troubleshooting.rst
index 6930dd0..4412a28 100644
--- a/troubleshooting.rst
+++ b/troubleshooting.rst
@@ -13,7 +13,7 @@
 
 .. code-block:: console
 
-	onos> app activate t3
+    onos> app activate t3
 
 T3 supports tracing of following packet types:
 
@@ -36,54 +36,54 @@
 
 .. code-block:: console
 
-	onos> t3-troubleshoot --help
-	DESCRIPTION
-	        onos:troubleshoot
+    onos> t3-troubleshoot --help
+    DESCRIPTION
+            onos:troubleshoot
 
-	    troubleshoots flows and groups between source and destination
+        troubleshoots flows and groups between source and destination
 
-	SYNTAX
-	        onos:troubleshoot [options]
+    SYNTAX
+            onos:troubleshoot [options]
 
-	OPTIONS
-	        -sm, --srcMac
-	                Source MAC
-	        -j, --json
-	                Output JSON
-	        --help
-	                Display this help message
-	        -v, --verbose
-	                Outputs complete path
-	        -ipp, --ipProto
-	                IP Proto
-	        -s, --srcIp
-	                Source IP
-	        -dm, --dstMac
-	                Destination MAC
-	        -ml, --mplsLabel
-	                Mpls label of incoming packet
-	        -vv, --veryverbose
-	                Outputs flows and groups for every device
-	        -udps, --udpSrc
-	                UDP Source
-	        -mb, --mplsBos
-	                MPLS BOS
-	        -et, --ethType
-	                ETH Type
-	                (defaults to ipv4)
-	        -sp, --srcPort
-	                Source Port
-	        -dtp, --dstTcpPort
-	                destination TCP Port
-	        -udpd, --udpDst
-	                UDP Destination
-	        -stp, --srcTcpPort
-	                Source TCP Port
-	        -d, --dstIp
-	                Destination IP
-	        -vid, --vlanId
-	                Vlan of incoming packet
-	                (defaults to None)
+    OPTIONS
+            -sm, --srcMac
+                    Source MAC
+            -j, --json
+                    Output JSON
+            --help
+                    Display this help message
+            -v, --verbose
+                    Outputs complete path
+            -ipp, --ipProto
+                    IP Proto
+            -s, --srcIp
+                    Source IP
+            -dm, --dstMac
+                    Destination MAC
+            -ml, --mplsLabel
+                    Mpls label of incoming packet
+            -vv, --veryverbose
+                    Outputs flows and groups for every device
+            -udps, --udpSrc
+                    UDP Source
+            -mb, --mplsBos
+                    MPLS BOS
+            -et, --ethType
+                    ETH Type
+                    (defaults to ipv4)
+            -sp, --srcPort
+                    Source Port
+            -dtp, --dstTcpPort
+                    destination TCP Port
+            -udpd, --udpDst
+                    UDP Destination
+            -stp, --srcTcpPort
+                    Source TCP Port
+            -d, --dstIp
+                    Destination IP
+            -vid, --vlanId
+                    Vlan of incoming packet
+                    (defaults to None)
 
 Default Verbosity Level
 -----------------------
@@ -91,7 +91,7 @@
 
 .. code-block:: console
 
-	onos> t3-troubleshoot -s 10.0.2.1 -sp of:0000000000000204/3 -sm 00:AA:00:00:00:01 -et IPV4 -d 10.0.3.1 -dm 00:00:00:00:02:04 -vid None
+    onos> t3-troubleshoot -s 10.0.2.1 -sp of:0000000000000204/3 -sm 00:AA:00:00:00:01 -et IPV4 -d 10.0.3.1 -dm 00:00:00:00:02:04 -vid None
 
 with this command we are asking the t3 tool to trace a packet with
 
@@ -110,13 +110,13 @@
 
 .. code-block:: console
 
-	Tracing packet: [IN_PORT:3, ETH_DST:00:00:00:00:02:04, ETH_SRC:00:AA:00:00:00:01, ETH_TYPE:ipv4, VLAN_VID:None, IPV4_SRC:10.0.2.1/32, IPV4_DST:10.0.3.1/32, TCP_SRC:12345, TCP_DST:80, MPLS_BOS:true]
-	Paths
-	[of:0000000000000204/3, of:0000000000000204/2, of:0000000000000227/1, of:0000000000000227/2, of:0000000000000205/2, of:0000000000000205/3]
-	[of:0000000000000204/3, of:0000000000000204/1, of:0000000000000226/1, of:0000000000000226/2, of:0000000000000205/1, of:0000000000000205/3]
-	Result:
-	Reached required destination Host
-	Reached required destination Host
+    Tracing packet: [IN_PORT:3, ETH_DST:00:00:00:00:02:04, ETH_SRC:00:AA:00:00:00:01, ETH_TYPE:ipv4, VLAN_VID:None, IPV4_SRC:10.0.2.1/32, IPV4_DST:10.0.3.1/32, TCP_SRC:12345, TCP_DST:80, MPLS_BOS:true]
+    Paths
+    [of:0000000000000204/3, of:0000000000000204/2, of:0000000000000227/1, of:0000000000000227/2, of:0000000000000205/2, of:0000000000000205/3]
+    [of:0000000000000204/3, of:0000000000000204/1, of:0000000000000226/1, of:0000000000000226/2, of:0000000000000205/1, of:0000000000000205/3]
+    Result:
+    Reached required destination Host
+    Reached required destination Host
 
 Middle Verbosity Level
 ----------------------
@@ -124,108 +124,108 @@
 
 .. code-block:: console
 
-	onos> t3-troubleshoot -v -s 10.0.2.1 -sp of:0000000000000204/3 -sm 00:AA:00:00:00:01 -et IPV4 -d 10.0.3.1 -dm 00:00:00:00:02:04 -vid None
+    onos> t3-troubleshoot -v -s 10.0.2.1 -sp of:0000000000000204/3 -sm 00:AA:00:00:00:01 -et IPV4 -d 10.0.3.1 -dm 00:00:00:00:02:04 -vid None
 
 prints flows selectors and groupId that are met along the path
 
 .. code-block:: console
 
-	Tracing packet: [IN_PORT:3, ETH_DST:00:00:00:00:02:04, ETH_SRC:00:AA:00:00:00:01, ETH_TYPE:ipv4, VLAN_VID:None, IPV4_SRC:10.0.2.1/32, IPV4_DST:10.0.3.1/32, TCP_SRC:12345, TCP_DST:80, MPLS_BOS:true]
-	Path [of:0000000000000204/3, of:0000000000000204/2, of:0000000000000227/1, of:0000000000000227/2, of:0000000000000205/2, of:0000000000000205/3]
-	Device of:0000000000000204
-	Input from of:0000000000000204/3
-	Flows
-	flowId=a20000bd57cb49, selector=[]
-	flowId=900000d4173ff7, selector=[IN_PORT:3, VLAN_VID:None]
-	flowId=9000004b3d1965, selector=[IN_PORT:3, ETH_DST:00:00:00:00:02:04, ETH_TYPE:ipv4, VLAN_VID:20]
-	flowId=900000499769f5, selector=[ETH_TYPE:ipv4, IPV4_DST:10.0.3.0/24]
-	flowId=a2000038b487e7, selector=[]
-	Groups
-	groupId=GroupId{id=0x70000010}
-	groupId=GroupId{id=0x9200000d}
-	groupId=GroupId{id=0x9000000c}
-	groupId=GroupId{id=0xffe0002}
-	groupId=GroupId{id=0x9200000f}
-	groupId=GroupId{id=0x9000000e}
-	groupId=GroupId{id=0xffe0001}
-	Output through of:0000000000000204/2
-	Device of:0000000000000227
-	Input from of:0000000000000227/1
-	Flows
-	flowId=a200005577bcd6, selector=[]
-	flowId=900000498457b2, selector=[IN_PORT:1, VLAN_VID:None]
-	flowId=900000f87746c9, selector=[IN_PORT:1, ETH_DST:00:00:00:00:02:27, ETH_TYPE:mpls_unicast, VLAN_VID:4094]
-	flowId=a200005bfd6ed7, selector=[]
-	flowId=9000009f3d554f, selector=[ETH_TYPE:mpls_unicast, MPLS_LABEL:205, MPLS_BOS:true]
-	flowId=a20000e601fc35, selector=[]
-	Groups
-	groupId=GroupId{id=0x70000017}
-	groupId=GroupId{id=0x20000016}
-	groupId=GroupId{id=0xffe0002}
-	Output through of:0000000000000227/2
-	Device of:0000000000000205
-	Input from of:0000000000000205/2
-	Flows
-	flowId=a200008d542817, selector=[]
-	flowId=900000be3179a0, selector=[IN_PORT:1, VLAN_VID:None]
-	flowId=900000766be164, selector=[IN_PORT:1, ETH_DST:00:00:00:00:02:05, ETH_TYPE:ipv4, VLAN_VID:4094]
-	flowId=900000ec1d5779, selector=[ETH_TYPE:ipv4, IPV4_DST:10.0.3.1/32]
-	flowId=a2000042d8e6b5, selector=[]
-	Groups
-	groupId=GroupId{id=0x2000002a}
-	groupId=GroupId{id=0x1e0003}
-	groupId=GroupId{id=0x2000002a}
-	groupId=GroupId{id=0x1e0003}
-	Output through of:0000000000000205/3
-	Path [of:0000000000000204/3, of:0000000000000204/1, of:0000000000000226/1, of:0000000000000226/2, of:0000000000000205/1, of:0000000000000205/3]
-	Device of:0000000000000204
-	Input from of:0000000000000204/3
-	Flows
-	flowId=a20000bd57cb49, selector=[]
-	flowId=900000d4173ff7, selector=[IN_PORT:3, VLAN_VID:None]
-	flowId=9000004b3d1965, selector=[IN_PORT:3, ETH_DST:00:00:00:00:02:04, ETH_TYPE:ipv4, VLAN_VID:20]
-	flowId=900000499769f5, selector=[ETH_TYPE:ipv4, IPV4_DST:10.0.3.0/24]
-	flowId=a2000038b487e7, selector=[]
-	Groups
-	groupId=GroupId{id=0x70000010}
-	groupId=GroupId{id=0x9200000d}
-	groupId=GroupId{id=0x9000000c}
-	groupId=GroupId{id=0xffe0002}
-	groupId=GroupId{id=0x9200000f}
-	groupId=GroupId{id=0x9000000e}
-	groupId=GroupId{id=0xffe0001}
-	Output through of:0000000000000204/1
-	Device of:0000000000000226
-	Input from of:0000000000000226/1
-	Flows
-	flowId=a20000e9b27d24, selector=[]
-	flowId=9000004bd76105, selector=[IN_PORT:1, VLAN_VID:None]
-	flowId=90000069f274d1, selector=[IN_PORT:1, ETH_DST:00:00:00:00:02:26, ETH_TYPE:mpls_unicast, VLAN_VID:4094]
-	flowId=a200000ec7529e, selector=[]
-	flowId=90000050f9a350, selector=[ETH_TYPE:mpls_unicast, MPLS_LABEL:205, MPLS_BOS:true]
-	flowId=a20000b15cada6, selector=[]
-	Groups
-	groupId=GroupId{id=0x7000000b}
-	groupId=GroupId{id=0x20000009}
-	groupId=GroupId{id=0xffe0002}
-	Output through of:0000000000000226/2
-	Device of:0000000000000205
-	Input from of:0000000000000205/1
-	Flows
-	flowId=a200008d542817, selector=[]
-	flowId=900000be3179a0, selector=[IN_PORT:1, VLAN_VID:None]
-	flowId=900000766be164, selector=[IN_PORT:1, ETH_DST:00:00:00:00:02:05, ETH_TYPE:ipv4, VLAN_VID:4094]
-	flowId=900000ec1d5779, selector=[ETH_TYPE:ipv4, IPV4_DST:10.0.3.1/32]
-	flowId=a2000042d8e6b5, selector=[]
-	Groups
-	groupId=GroupId{id=0x2000002a}
-	groupId=GroupId{id=0x1e0003}
-	groupId=GroupId{id=0x2000002a}
-	groupId=GroupId{id=0x1e0003}
-	Output through of:0000000000000205/3
-	Result:
-	Reached required destination Host
-	Reached required destination Host
+    Tracing packet: [IN_PORT:3, ETH_DST:00:00:00:00:02:04, ETH_SRC:00:AA:00:00:00:01, ETH_TYPE:ipv4, VLAN_VID:None, IPV4_SRC:10.0.2.1/32, IPV4_DST:10.0.3.1/32, TCP_SRC:12345, TCP_DST:80, MPLS_BOS:true]
+    Path [of:0000000000000204/3, of:0000000000000204/2, of:0000000000000227/1, of:0000000000000227/2, of:0000000000000205/2, of:0000000000000205/3]
+    Device of:0000000000000204
+    Input from of:0000000000000204/3
+    Flows
+    flowId=a20000bd57cb49, selector=[]
+    flowId=900000d4173ff7, selector=[IN_PORT:3, VLAN_VID:None]
+    flowId=9000004b3d1965, selector=[IN_PORT:3, ETH_DST:00:00:00:00:02:04, ETH_TYPE:ipv4, VLAN_VID:20]
+    flowId=900000499769f5, selector=[ETH_TYPE:ipv4, IPV4_DST:10.0.3.0/24]
+    flowId=a2000038b487e7, selector=[]
+    Groups
+    groupId=GroupId{id=0x70000010}
+    groupId=GroupId{id=0x9200000d}
+    groupId=GroupId{id=0x9000000c}
+    groupId=GroupId{id=0xffe0002}
+    groupId=GroupId{id=0x9200000f}
+    groupId=GroupId{id=0x9000000e}
+    groupId=GroupId{id=0xffe0001}
+    Output through of:0000000000000204/2
+    Device of:0000000000000227
+    Input from of:0000000000000227/1
+    Flows
+    flowId=a200005577bcd6, selector=[]
+    flowId=900000498457b2, selector=[IN_PORT:1, VLAN_VID:None]
+    flowId=900000f87746c9, selector=[IN_PORT:1, ETH_DST:00:00:00:00:02:27, ETH_TYPE:mpls_unicast, VLAN_VID:4094]
+    flowId=a200005bfd6ed7, selector=[]
+    flowId=9000009f3d554f, selector=[ETH_TYPE:mpls_unicast, MPLS_LABEL:205, MPLS_BOS:true]
+    flowId=a20000e601fc35, selector=[]
+    Groups
+    groupId=GroupId{id=0x70000017}
+    groupId=GroupId{id=0x20000016}
+    groupId=GroupId{id=0xffe0002}
+    Output through of:0000000000000227/2
+    Device of:0000000000000205
+    Input from of:0000000000000205/2
+    Flows
+    flowId=a200008d542817, selector=[]
+    flowId=900000be3179a0, selector=[IN_PORT:1, VLAN_VID:None]
+    flowId=900000766be164, selector=[IN_PORT:1, ETH_DST:00:00:00:00:02:05, ETH_TYPE:ipv4, VLAN_VID:4094]
+    flowId=900000ec1d5779, selector=[ETH_TYPE:ipv4, IPV4_DST:10.0.3.1/32]
+    flowId=a2000042d8e6b5, selector=[]
+    Groups
+    groupId=GroupId{id=0x2000002a}
+    groupId=GroupId{id=0x1e0003}
+    groupId=GroupId{id=0x2000002a}
+    groupId=GroupId{id=0x1e0003}
+    Output through of:0000000000000205/3
+    Path [of:0000000000000204/3, of:0000000000000204/1, of:0000000000000226/1, of:0000000000000226/2, of:0000000000000205/1, of:0000000000000205/3]
+    Device of:0000000000000204
+    Input from of:0000000000000204/3
+    Flows
+    flowId=a20000bd57cb49, selector=[]
+    flowId=900000d4173ff7, selector=[IN_PORT:3, VLAN_VID:None]
+    flowId=9000004b3d1965, selector=[IN_PORT:3, ETH_DST:00:00:00:00:02:04, ETH_TYPE:ipv4, VLAN_VID:20]
+    flowId=900000499769f5, selector=[ETH_TYPE:ipv4, IPV4_DST:10.0.3.0/24]
+    flowId=a2000038b487e7, selector=[]
+    Groups
+    groupId=GroupId{id=0x70000010}
+    groupId=GroupId{id=0x9200000d}
+    groupId=GroupId{id=0x9000000c}
+    groupId=GroupId{id=0xffe0002}
+    groupId=GroupId{id=0x9200000f}
+    groupId=GroupId{id=0x9000000e}
+    groupId=GroupId{id=0xffe0001}
+    Output through of:0000000000000204/1
+    Device of:0000000000000226
+    Input from of:0000000000000226/1
+    Flows
+    flowId=a20000e9b27d24, selector=[]
+    flowId=9000004bd76105, selector=[IN_PORT:1, VLAN_VID:None]
+    flowId=90000069f274d1, selector=[IN_PORT:1, ETH_DST:00:00:00:00:02:26, ETH_TYPE:mpls_unicast, VLAN_VID:4094]
+    flowId=a200000ec7529e, selector=[]
+    flowId=90000050f9a350, selector=[ETH_TYPE:mpls_unicast, MPLS_LABEL:205, MPLS_BOS:true]
+    flowId=a20000b15cada6, selector=[]
+    Groups
+    groupId=GroupId{id=0x7000000b}
+    groupId=GroupId{id=0x20000009}
+    groupId=GroupId{id=0xffe0002}
+    Output through of:0000000000000226/2
+    Device of:0000000000000205
+    Input from of:0000000000000205/1
+    Flows
+    flowId=a200008d542817, selector=[]
+    flowId=900000be3179a0, selector=[IN_PORT:1, VLAN_VID:None]
+    flowId=900000766be164, selector=[IN_PORT:1, ETH_DST:00:00:00:00:02:05, ETH_TYPE:ipv4, VLAN_VID:4094]
+    flowId=900000ec1d5779, selector=[ETH_TYPE:ipv4, IPV4_DST:10.0.3.1/32]
+    flowId=a2000042d8e6b5, selector=[]
+    Groups
+    groupId=GroupId{id=0x2000002a}
+    groupId=GroupId{id=0x1e0003}
+    groupId=GroupId{id=0x2000002a}
+    groupId=GroupId{id=0x1e0003}
+    Output through of:0000000000000205/3
+    Result:
+    Reached required destination Host
+    Reached required destination Host
 
 High Verbosity Level
 --------------------
@@ -233,138 +233,138 @@
 
 .. code-block:: console
 
-	onos> t3-troubleshoot -vv -s 10.0.2.1 -sp of:0000000000000204/3 -sm 00:AA:00:00:00:01 -et IPV4 -d 10.0.3.1 -dm 00:00:00:00:02:04 -vid None
+    onos> t3-troubleshoot -vv -s 10.0.2.1 -sp of:0000000000000204/3 -sm 00:AA:00:00:00:01 -et IPV4 -d 10.0.3.1 -dm 00:00:00:00:02:04 -vid None
 
 This verbosity level prints all the flows and groups that are met along the path
 
 .. code-block:: console
 
-	Tracing packet: [IN_PORT:3, ETH_DST:00:00:00:00:02:04, ETH_SRC:00:AA:00:00:00:01, ETH_TYPE:ipv4, VLAN_VID:None, IPV4_SRC:10.0.2.1/32, IPV4_DST:10.0.3.1/32, TCP_SRC:12345, TCP_DST:80, MPLS_BOS:true]
-	Path [of:0000000000000204/3, of:0000000000000204/2, of:0000000000000227/1, of:0000000000000227/2, of:0000000000000205/2, of:0000000000000205/3]
-	Device of:0000000000000204
-	Input from of:0000000000000204/3
-	Flows
-	ADDED, bytes=733506, packets=8691, table=0, priority=0, selector=[], treatment=[transition=TABLE:10]
-	ADDED, bytes=11110, packets=61, table=10, priority=32768, selector=[IN_PORT:3, VLAN_VID:None], treatment=[immediate=[VLAN_PUSH:vlan, VLAN_ID:20], transition=TABLE:20]
-	ADDED, bytes=8698, packets=29, table=20, priority=32768, selector=[IN_PORT:3, ETH_DST:00:00:00:00:02:04, ETH_TYPE:ipv4, VLAN_VID:20], treatment=[transition=TABLE:30]
-	ADDED, bytes=16612, packets=50, table=30, priority=48010, selector=[ETH_TYPE:ipv4, IPV4_DST:10.0.3.0/24], treatment=[deferred=[GROUP:0x70000010], transition=TABLE:60]
-	ADDED, bytes=34400, packets=112, table=60, priority=0, selector=[], treatment=[immediate=[NOACTION]]
-	Groups
-	id=0x70000010, state=ADDED, type=SELECT, bytes=16906, packets=53, appId=org.onosproject.segmentrouting, referenceCount=3
-	id=0x70000010, bucket=1, bytes=490, packets=5, actions=[GROUP:0x9200000d]
-	id=0x70000010, bucket=2, bytes=16416, packets=48, actions=[GROUP:0x9200000f]
-	id=0x9200000d, state=ADDED, type=INDIRECT, bytes=490, packets=5, appId=org.onosproject.segmentrouting, referenceCount=0
-	id=0x9200000d, bucket=1, bytes=490, packets=5, actions=[VLAN_POP, MPLS_PUSH:mpls_unicast, MPLS_LABEL:205, GROUP:0x9000000c, VLAN_PUSH:vlan, VLAN_ID:4095]
-	id=0x9000000c, state=ADDED, type=INDIRECT, bytes=490, packets=5, appId=org.onosproject.segmentrouting, referenceCount=0
-	id=0x9000000c, bucket=1, bytes=490, packets=5, actions=[ETH_DST:00:00:00:00:02:27, ETH_SRC:00:00:00:00:02:04, VLAN_ID:4094, GROUP:0xffe0002]
-	id=0xffe0002, state=ADDED, type=INDIRECT, bytes=726, packets=7, appId=org.onosproject.segmentrouting, referenceCount=0
-	id=0xffe0002, bucket=1, bytes=726, packets=7, actions=[VLAN_POP, OUTPUT:2]
-	id=0x9200000f, state=ADDED, type=INDIRECT, bytes=16416, packets=48, appId=org.onosproject.segmentrouting, referenceCount=0
-	id=0x9200000f, bucket=1, bytes=16416, packets=48, actions=[VLAN_POP, MPLS_PUSH:mpls_unicast, MPLS_LABEL:205, GROUP:0x9000000e, VLAN_PUSH:vlan, VLAN_ID:4095]
-	id=0x9000000e, state=ADDED, type=INDIRECT, bytes=16416, packets=48, appId=org.onosproject.segmentrouting, referenceCount=0
-	id=0x9000000e, bucket=1, bytes=16416, packets=48, actions=[ETH_DST:00:00:00:00:02:26, ETH_SRC:00:00:00:00:02:04, VLAN_ID:4094, GROUP:0xffe0001]
-	id=0xffe0001, state=ADDED, type=INDIRECT, bytes=16416, packets=48, appId=org.onosproject.segmentrouting, referenceCount=0
-	id=0xffe0001, bucket=1, bytes=16416, packets=48, actions=[VLAN_POP, OUTPUT:1]
-	Output through of:0000000000000204/2
-	Device of:0000000000000227
-	Input from of:0000000000000227/1
-	Flows
-	ADDED, bytes=702318, packets=8511, table=0, priority=0, selector=[], treatment=[transition=TABLE:10]
-	ADDED, bytes=343130, packets=4234, table=10, priority=32768, selector=[IN_PORT:1, VLAN_VID:None], treatment=[immediate=[VLAN_PUSH:vlan, VLAN_ID:4094], transition=TABLE:20]
-	ADDED, bytes=754, packets=7, table=20, priority=32768, selector=[IN_PORT:1, ETH_DST:00:00:00:00:02:27, ETH_TYPE:mpls_unicast, VLAN_VID:4094], treatment=[transition=TABLE:23]
-	ADDED, bytes=17566, packets=57, table=23, priority=0, selector=[], treatment=[transition=TABLE:24]
-	ADDED, bytes=510, packets=5, table=24, priority=100, selector=[ETH_TYPE:mpls_unicast, MPLS_LABEL:205, MPLS_BOS:true], treatment=[deferred=[MPLS_POP:ipv4, DEC_TTL, GROUP:0x70000017], transition=TABLE:60]
-	ADDED, bytes=17566, packets=57, table=60, priority=0, selector=[], treatment=[immediate=[NOACTION]]
-	Groups
-	id=0x70000017, state=ADDED, type=SELECT, bytes=754, packets=7, appId=org.onosproject.segmentrouting, referenceCount=2
-	id=0x70000017, bucket=1, bytes=754, packets=7, actions=[GROUP:0x20000016]
-	id=0x20000016, state=ADDED, type=INDIRECT, bytes=754, packets=7, appId=org.onosproject.segmentrouting, referenceCount=0
-	id=0x20000016, bucket=1, bytes=754, packets=7, actions=[ETH_DST:00:00:00:00:02:05, ETH_SRC:00:00:00:00:02:27, VLAN_ID:4094, GROUP:0xffe0002]
-	id=0xffe0002, state=ADDED, type=INDIRECT, bytes=754, packets=7, appId=org.onosproject.segmentrouting, referenceCount=0
-	id=0xffe0002, bucket=1, bytes=754, packets=7, actions=[VLAN_POP, OUTPUT:2]
-	Output through of:0000000000000227/2
-	Device of:0000000000000205
-	Input from of:0000000000000205/2
-	Flows
-	ADDED, bytes=2105886, packets=24084, table=0, priority=0, selector=[], treatment=[transition=TABLE:10]
-	ADDED, bytes=358792, packets=4275, table=10, priority=32768, selector=[IN_PORT:1, VLAN_VID:None], treatment=[immediate=[VLAN_PUSH:vlan, VLAN_ID:4094], transition=TABLE:20]
-	ADDED, bytes=16416, packets=48, table=20, priority=32768, selector=[IN_PORT:1, ETH_DST:00:00:00:00:02:05, ETH_TYPE:ipv4, VLAN_VID:4094], treatment=[transition=TABLE:30]
-	ADDED, bytes=196, packets=2, table=30, priority=64010, selector=[ETH_TYPE:ipv4, IPV4_DST:10.0.3.1/32], treatment=[deferred=[GROUP:0x2000002a], transition=TABLE:60]
-	ADDED, bytes=1370884, packets=15163, table=60, priority=0, selector=[], treatment=[immediate=[NOACTION]]
-	Groups
-	id=0x2000002a, state=ADDED, type=INDIRECT, bytes=196, packets=2, appId=org.onosproject.segmentrouting, referenceCount=1
-	id=0x2000002a, bucket=1, bytes=196, packets=2, actions=[ETH_DST:00:AA:00:00:00:03, ETH_SRC:00:00:00:00:02:05, VLAN_ID:30, GROUP:0x1e0003]
-	id=0x1e0003, state=ADDED, type=INDIRECT, bytes=12960, packets=126, appId=org.onosproject.segmentrouting, referenceCount=1
-	id=0x1e0003, bucket=1, bytes=12960, packets=126, actions=[VLAN_POP, OUTPUT:3]
-	id=0x2000002a, state=ADDED, type=INDIRECT, bytes=196, packets=2, appId=org.onosproject.segmentrouting, referenceCount=1
-	id=0x2000002a, bucket=1, bytes=196, packets=2, actions=[ETH_DST:00:AA:00:00:00:03, ETH_SRC:00:00:00:00:02:05, VLAN_ID:30, GROUP:0x1e0003]
-	id=0x1e0003, state=ADDED, type=INDIRECT, bytes=12960, packets=126, appId=org.onosproject.segmentrouting, referenceCount=1
-	id=0x1e0003, bucket=1, bytes=12960, packets=126, actions=[VLAN_POP, OUTPUT:3]
-	Output through of:0000000000000205/3
-	Path [of:0000000000000204/3, of:0000000000000204/1, of:0000000000000226/1, of:0000000000000226/2, of:0000000000000205/1, of:0000000000000205/3]
-	Device of:0000000000000204
-	Input from of:0000000000000204/3
-	Flows
-	ADDED, bytes=733506, packets=8691, table=0, priority=0, selector=[], treatment=[transition=TABLE:10]
-	ADDED, bytes=11110, packets=61, table=10, priority=32768, selector=[IN_PORT:3, VLAN_VID:None], treatment=[immediate=[VLAN_PUSH:vlan, VLAN_ID:20], transition=TABLE:20]
-	ADDED, bytes=8698, packets=29, table=20, priority=32768, selector=[IN_PORT:3, ETH_DST:00:00:00:00:02:04, ETH_TYPE:ipv4, VLAN_VID:20], treatment=[transition=TABLE:30]
-	ADDED, bytes=16612, packets=50, table=30, priority=48010, selector=[ETH_TYPE:ipv4, IPV4_DST:10.0.3.0/24], treatment=[deferred=[GROUP:0x70000010], transition=TABLE:60]
-	ADDED, bytes=34400, packets=112, table=60, priority=0, selector=[], treatment=[immediate=[NOACTION]]
-	Groups
-	id=0x70000010, state=ADDED, type=SELECT, bytes=16906, packets=53, appId=org.onosproject.segmentrouting, referenceCount=3
-	id=0x70000010, bucket=1, bytes=490, packets=5, actions=[GROUP:0x9200000d]
-	id=0x70000010, bucket=2, bytes=16416, packets=48, actions=[GROUP:0x9200000f]
-	id=0x9200000d, state=ADDED, type=INDIRECT, bytes=490, packets=5, appId=org.onosproject.segmentrouting, referenceCount=0
-	id=0x9200000d, bucket=1, bytes=490, packets=5, actions=[VLAN_POP, MPLS_PUSH:mpls_unicast, MPLS_LABEL:205, GROUP:0x9000000c, VLAN_PUSH:vlan, VLAN_ID:4095]
-	id=0x9000000c, state=ADDED, type=INDIRECT, bytes=490, packets=5, appId=org.onosproject.segmentrouting, referenceCount=0
-	id=0x9000000c, bucket=1, bytes=490, packets=5, actions=[ETH_DST:00:00:00:00:02:27, ETH_SRC:00:00:00:00:02:04, VLAN_ID:4094, GROUP:0xffe0002]
-	id=0xffe0002, state=ADDED, type=INDIRECT, bytes=726, packets=7, appId=org.onosproject.segmentrouting, referenceCount=0
-	id=0xffe0002, bucket=1, bytes=726, packets=7, actions=[VLAN_POP, OUTPUT:2]
-	id=0x9200000f, state=ADDED, type=INDIRECT, bytes=16416, packets=48, appId=org.onosproject.segmentrouting, referenceCount=0
-	id=0x9200000f, bucket=1, bytes=16416, packets=48, actions=[VLAN_POP, MPLS_PUSH:mpls_unicast, MPLS_LABEL:205, GROUP:0x9000000e, VLAN_PUSH:vlan, VLAN_ID:4095]
-	id=0x9000000e, state=ADDED, type=INDIRECT, bytes=16416, packets=48, appId=org.onosproject.segmentrouting, referenceCount=0
-	id=0x9000000e, bucket=1, bytes=16416, packets=48, actions=[ETH_DST:00:00:00:00:02:26, ETH_SRC:00:00:00:00:02:04, VLAN_ID:4094, GROUP:0xffe0001]
-	id=0xffe0001, state=ADDED, type=INDIRECT, bytes=16416, packets=48, appId=org.onosproject.segmentrouting, referenceCount=0
-	id=0xffe0001, bucket=1, bytes=16416, packets=48, actions=[VLAN_POP, OUTPUT:1]
-	Output through of:0000000000000204/1
-	Device of:0000000000000226
-	Input from of:0000000000000226/1
-	Flows
-	ADDED, bytes=701910, packets=8507, table=0, priority=0, selector=[], treatment=[transition=TABLE:10]
-	ADDED, bytes=358984, packets=4275, table=10, priority=32768, selector=[IN_PORT:1, VLAN_VID:None], treatment=[immediate=[VLAN_PUSH:vlan, VLAN_ID:4094], transition=TABLE:20]
-	ADDED, bytes=16608, packets=48, table=20, priority=32768, selector=[IN_PORT:1, ETH_DST:00:00:00:00:02:26, ETH_TYPE:mpls_unicast, VLAN_VID:4094], treatment=[transition=TABLE:23]
-	ADDED, bytes=17158, packets=53, table=23, priority=0, selector=[], treatment=[transition=TABLE:24]
-	ADDED, bytes=16608, packets=48, table=24, priority=100, selector=[ETH_TYPE:mpls_unicast, MPLS_LABEL:205, MPLS_BOS:true], treatment=[deferred=[MPLS_POP:ipv4, DEC_TTL, GROUP:0x7000000b], transition=TABLE:60]
-	ADDED, bytes=17158, packets=53, table=60, priority=0, selector=[], treatment=[immediate=[NOACTION]]
-	Groups
-	id=0x7000000b, state=ADDED, type=SELECT, bytes=16608, packets=48, appId=org.onosproject.segmentrouting, referenceCount=2
-	id=0x7000000b, bucket=1, bytes=16608, packets=48, actions=[GROUP:0x20000009]
-	id=0x20000009, state=ADDED, type=INDIRECT, bytes=16608, packets=48, appId=org.onosproject.segmentrouting, referenceCount=0
-	id=0x20000009, bucket=1, bytes=16608, packets=48, actions=[ETH_DST:00:00:00:00:02:05, ETH_SRC:00:00:00:00:02:26, VLAN_ID:4094, GROUP:0xffe0002]
-	id=0xffe0002, state=ADDED, type=INDIRECT, bytes=16608, packets=48, appId=org.onosproject.segmentrouting, referenceCount=0
-	id=0xffe0002, bucket=1, bytes=16608, packets=48, actions=[VLAN_POP, OUTPUT:2]
-	Output through of:0000000000000226/2
-	Device of:0000000000000205
-	Input from of:0000000000000205/1
-	Flows
-	ADDED, bytes=2105886, packets=24084, table=0, priority=0, selector=[], treatment=[transition=TABLE:10]
-	ADDED, bytes=358792, packets=4275, table=10, priority=32768, selector=[IN_PORT:1, VLAN_VID:None], treatment=[immediate=[VLAN_PUSH:vlan, VLAN_ID:4094], transition=TABLE:20]
-	ADDED, bytes=16416, packets=48, table=20, priority=32768, selector=[IN_PORT:1, ETH_DST:00:00:00:00:02:05, ETH_TYPE:ipv4, VLAN_VID:4094], treatment=[transition=TABLE:30]
-	ADDED, bytes=196, packets=2, table=30, priority=64010, selector=[ETH_TYPE:ipv4, IPV4_DST:10.0.3.1/32], treatment=[deferred=[GROUP:0x2000002a], transition=TABLE:60]
-	ADDED, bytes=1370884, packets=15163, table=60, priority=0, selector=[], treatment=[immediate=[NOACTION]]
-	Groups
-	id=0x2000002a, state=ADDED, type=INDIRECT, bytes=196, packets=2, appId=org.onosproject.segmentrouting, referenceCount=1
-	id=0x2000002a, bucket=1, bytes=196, packets=2, actions=[ETH_DST:00:AA:00:00:00:03, ETH_SRC:00:00:00:00:02:05, VLAN_ID:30, GROUP:0x1e0003]
-	id=0x1e0003, state=ADDED, type=INDIRECT, bytes=12960, packets=126, appId=org.onosproject.segmentrouting, referenceCount=1
-	id=0x1e0003, bucket=1, bytes=12960, packets=126, actions=[VLAN_POP, OUTPUT:3]
-	id=0x2000002a, state=ADDED, type=INDIRECT, bytes=196, packets=2, appId=org.onosproject.segmentrouting, referenceCount=1
-	id=0x2000002a, bucket=1, bytes=196, packets=2, actions=[ETH_DST:00:AA:00:00:00:03, ETH_SRC:00:00:00:00:02:05, VLAN_ID:30, GROUP:0x1e0003]
-	id=0x1e0003, state=ADDED, type=INDIRECT, bytes=12960, packets=126, appId=org.onosproject.segmentrouting, referenceCount=1
-	id=0x1e0003, bucket=1, bytes=12960, packets=126, actions=[VLAN_POP, OUTPUT:3]
-	Output through of:0000000000000205/3
-	Result:
-	Reached required destination Host
-	Reached required destination Host
+    Tracing packet: [IN_PORT:3, ETH_DST:00:00:00:00:02:04, ETH_SRC:00:AA:00:00:00:01, ETH_TYPE:ipv4, VLAN_VID:None, IPV4_SRC:10.0.2.1/32, IPV4_DST:10.0.3.1/32, TCP_SRC:12345, TCP_DST:80, MPLS_BOS:true]
+    Path [of:0000000000000204/3, of:0000000000000204/2, of:0000000000000227/1, of:0000000000000227/2, of:0000000000000205/2, of:0000000000000205/3]
+    Device of:0000000000000204
+    Input from of:0000000000000204/3
+    Flows
+    ADDED, bytes=733506, packets=8691, table=0, priority=0, selector=[], treatment=[transition=TABLE:10]
+    ADDED, bytes=11110, packets=61, table=10, priority=32768, selector=[IN_PORT:3, VLAN_VID:None], treatment=[immediate=[VLAN_PUSH:vlan, VLAN_ID:20], transition=TABLE:20]
+    ADDED, bytes=8698, packets=29, table=20, priority=32768, selector=[IN_PORT:3, ETH_DST:00:00:00:00:02:04, ETH_TYPE:ipv4, VLAN_VID:20], treatment=[transition=TABLE:30]
+    ADDED, bytes=16612, packets=50, table=30, priority=48010, selector=[ETH_TYPE:ipv4, IPV4_DST:10.0.3.0/24], treatment=[deferred=[GROUP:0x70000010], transition=TABLE:60]
+    ADDED, bytes=34400, packets=112, table=60, priority=0, selector=[], treatment=[immediate=[NOACTION]]
+    Groups
+    id=0x70000010, state=ADDED, type=SELECT, bytes=16906, packets=53, appId=org.onosproject.segmentrouting, referenceCount=3
+    id=0x70000010, bucket=1, bytes=490, packets=5, actions=[GROUP:0x9200000d]
+    id=0x70000010, bucket=2, bytes=16416, packets=48, actions=[GROUP:0x9200000f]
+    id=0x9200000d, state=ADDED, type=INDIRECT, bytes=490, packets=5, appId=org.onosproject.segmentrouting, referenceCount=0
+    id=0x9200000d, bucket=1, bytes=490, packets=5, actions=[VLAN_POP, MPLS_PUSH:mpls_unicast, MPLS_LABEL:205, GROUP:0x9000000c, VLAN_PUSH:vlan, VLAN_ID:4095]
+    id=0x9000000c, state=ADDED, type=INDIRECT, bytes=490, packets=5, appId=org.onosproject.segmentrouting, referenceCount=0
+    id=0x9000000c, bucket=1, bytes=490, packets=5, actions=[ETH_DST:00:00:00:00:02:27, ETH_SRC:00:00:00:00:02:04, VLAN_ID:4094, GROUP:0xffe0002]
+    id=0xffe0002, state=ADDED, type=INDIRECT, bytes=726, packets=7, appId=org.onosproject.segmentrouting, referenceCount=0
+    id=0xffe0002, bucket=1, bytes=726, packets=7, actions=[VLAN_POP, OUTPUT:2]
+    id=0x9200000f, state=ADDED, type=INDIRECT, bytes=16416, packets=48, appId=org.onosproject.segmentrouting, referenceCount=0
+    id=0x9200000f, bucket=1, bytes=16416, packets=48, actions=[VLAN_POP, MPLS_PUSH:mpls_unicast, MPLS_LABEL:205, GROUP:0x9000000e, VLAN_PUSH:vlan, VLAN_ID:4095]
+    id=0x9000000e, state=ADDED, type=INDIRECT, bytes=16416, packets=48, appId=org.onosproject.segmentrouting, referenceCount=0
+    id=0x9000000e, bucket=1, bytes=16416, packets=48, actions=[ETH_DST:00:00:00:00:02:26, ETH_SRC:00:00:00:00:02:04, VLAN_ID:4094, GROUP:0xffe0001]
+    id=0xffe0001, state=ADDED, type=INDIRECT, bytes=16416, packets=48, appId=org.onosproject.segmentrouting, referenceCount=0
+    id=0xffe0001, bucket=1, bytes=16416, packets=48, actions=[VLAN_POP, OUTPUT:1]
+    Output through of:0000000000000204/2
+    Device of:0000000000000227
+    Input from of:0000000000000227/1
+    Flows
+    ADDED, bytes=702318, packets=8511, table=0, priority=0, selector=[], treatment=[transition=TABLE:10]
+    ADDED, bytes=343130, packets=4234, table=10, priority=32768, selector=[IN_PORT:1, VLAN_VID:None], treatment=[immediate=[VLAN_PUSH:vlan, VLAN_ID:4094], transition=TABLE:20]
+    ADDED, bytes=754, packets=7, table=20, priority=32768, selector=[IN_PORT:1, ETH_DST:00:00:00:00:02:27, ETH_TYPE:mpls_unicast, VLAN_VID:4094], treatment=[transition=TABLE:23]
+    ADDED, bytes=17566, packets=57, table=23, priority=0, selector=[], treatment=[transition=TABLE:24]
+    ADDED, bytes=510, packets=5, table=24, priority=100, selector=[ETH_TYPE:mpls_unicast, MPLS_LABEL:205, MPLS_BOS:true], treatment=[deferred=[MPLS_POP:ipv4, DEC_TTL, GROUP:0x70000017], transition=TABLE:60]
+    ADDED, bytes=17566, packets=57, table=60, priority=0, selector=[], treatment=[immediate=[NOACTION]]
+    Groups
+    id=0x70000017, state=ADDED, type=SELECT, bytes=754, packets=7, appId=org.onosproject.segmentrouting, referenceCount=2
+    id=0x70000017, bucket=1, bytes=754, packets=7, actions=[GROUP:0x20000016]
+    id=0x20000016, state=ADDED, type=INDIRECT, bytes=754, packets=7, appId=org.onosproject.segmentrouting, referenceCount=0
+    id=0x20000016, bucket=1, bytes=754, packets=7, actions=[ETH_DST:00:00:00:00:02:05, ETH_SRC:00:00:00:00:02:27, VLAN_ID:4094, GROUP:0xffe0002]
+    id=0xffe0002, state=ADDED, type=INDIRECT, bytes=754, packets=7, appId=org.onosproject.segmentrouting, referenceCount=0
+    id=0xffe0002, bucket=1, bytes=754, packets=7, actions=[VLAN_POP, OUTPUT:2]
+    Output through of:0000000000000227/2
+    Device of:0000000000000205
+    Input from of:0000000000000205/2
+    Flows
+    ADDED, bytes=2105886, packets=24084, table=0, priority=0, selector=[], treatment=[transition=TABLE:10]
+    ADDED, bytes=358792, packets=4275, table=10, priority=32768, selector=[IN_PORT:1, VLAN_VID:None], treatment=[immediate=[VLAN_PUSH:vlan, VLAN_ID:4094], transition=TABLE:20]
+    ADDED, bytes=16416, packets=48, table=20, priority=32768, selector=[IN_PORT:1, ETH_DST:00:00:00:00:02:05, ETH_TYPE:ipv4, VLAN_VID:4094], treatment=[transition=TABLE:30]
+    ADDED, bytes=196, packets=2, table=30, priority=64010, selector=[ETH_TYPE:ipv4, IPV4_DST:10.0.3.1/32], treatment=[deferred=[GROUP:0x2000002a], transition=TABLE:60]
+    ADDED, bytes=1370884, packets=15163, table=60, priority=0, selector=[], treatment=[immediate=[NOACTION]]
+    Groups
+    id=0x2000002a, state=ADDED, type=INDIRECT, bytes=196, packets=2, appId=org.onosproject.segmentrouting, referenceCount=1
+    id=0x2000002a, bucket=1, bytes=196, packets=2, actions=[ETH_DST:00:AA:00:00:00:03, ETH_SRC:00:00:00:00:02:05, VLAN_ID:30, GROUP:0x1e0003]
+    id=0x1e0003, state=ADDED, type=INDIRECT, bytes=12960, packets=126, appId=org.onosproject.segmentrouting, referenceCount=1
+    id=0x1e0003, bucket=1, bytes=12960, packets=126, actions=[VLAN_POP, OUTPUT:3]
+    id=0x2000002a, state=ADDED, type=INDIRECT, bytes=196, packets=2, appId=org.onosproject.segmentrouting, referenceCount=1
+    id=0x2000002a, bucket=1, bytes=196, packets=2, actions=[ETH_DST:00:AA:00:00:00:03, ETH_SRC:00:00:00:00:02:05, VLAN_ID:30, GROUP:0x1e0003]
+    id=0x1e0003, state=ADDED, type=INDIRECT, bytes=12960, packets=126, appId=org.onosproject.segmentrouting, referenceCount=1
+    id=0x1e0003, bucket=1, bytes=12960, packets=126, actions=[VLAN_POP, OUTPUT:3]
+    Output through of:0000000000000205/3
+    Path [of:0000000000000204/3, of:0000000000000204/1, of:0000000000000226/1, of:0000000000000226/2, of:0000000000000205/1, of:0000000000000205/3]
+    Device of:0000000000000204
+    Input from of:0000000000000204/3
+    Flows
+    ADDED, bytes=733506, packets=8691, table=0, priority=0, selector=[], treatment=[transition=TABLE:10]
+    ADDED, bytes=11110, packets=61, table=10, priority=32768, selector=[IN_PORT:3, VLAN_VID:None], treatment=[immediate=[VLAN_PUSH:vlan, VLAN_ID:20], transition=TABLE:20]
+    ADDED, bytes=8698, packets=29, table=20, priority=32768, selector=[IN_PORT:3, ETH_DST:00:00:00:00:02:04, ETH_TYPE:ipv4, VLAN_VID:20], treatment=[transition=TABLE:30]
+    ADDED, bytes=16612, packets=50, table=30, priority=48010, selector=[ETH_TYPE:ipv4, IPV4_DST:10.0.3.0/24], treatment=[deferred=[GROUP:0x70000010], transition=TABLE:60]
+    ADDED, bytes=34400, packets=112, table=60, priority=0, selector=[], treatment=[immediate=[NOACTION]]
+    Groups
+    id=0x70000010, state=ADDED, type=SELECT, bytes=16906, packets=53, appId=org.onosproject.segmentrouting, referenceCount=3
+    id=0x70000010, bucket=1, bytes=490, packets=5, actions=[GROUP:0x9200000d]
+    id=0x70000010, bucket=2, bytes=16416, packets=48, actions=[GROUP:0x9200000f]
+    id=0x9200000d, state=ADDED, type=INDIRECT, bytes=490, packets=5, appId=org.onosproject.segmentrouting, referenceCount=0
+    id=0x9200000d, bucket=1, bytes=490, packets=5, actions=[VLAN_POP, MPLS_PUSH:mpls_unicast, MPLS_LABEL:205, GROUP:0x9000000c, VLAN_PUSH:vlan, VLAN_ID:4095]
+    id=0x9000000c, state=ADDED, type=INDIRECT, bytes=490, packets=5, appId=org.onosproject.segmentrouting, referenceCount=0
+    id=0x9000000c, bucket=1, bytes=490, packets=5, actions=[ETH_DST:00:00:00:00:02:27, ETH_SRC:00:00:00:00:02:04, VLAN_ID:4094, GROUP:0xffe0002]
+    id=0xffe0002, state=ADDED, type=INDIRECT, bytes=726, packets=7, appId=org.onosproject.segmentrouting, referenceCount=0
+    id=0xffe0002, bucket=1, bytes=726, packets=7, actions=[VLAN_POP, OUTPUT:2]
+    id=0x9200000f, state=ADDED, type=INDIRECT, bytes=16416, packets=48, appId=org.onosproject.segmentrouting, referenceCount=0
+    id=0x9200000f, bucket=1, bytes=16416, packets=48, actions=[VLAN_POP, MPLS_PUSH:mpls_unicast, MPLS_LABEL:205, GROUP:0x9000000e, VLAN_PUSH:vlan, VLAN_ID:4095]
+    id=0x9000000e, state=ADDED, type=INDIRECT, bytes=16416, packets=48, appId=org.onosproject.segmentrouting, referenceCount=0
+    id=0x9000000e, bucket=1, bytes=16416, packets=48, actions=[ETH_DST:00:00:00:00:02:26, ETH_SRC:00:00:00:00:02:04, VLAN_ID:4094, GROUP:0xffe0001]
+    id=0xffe0001, state=ADDED, type=INDIRECT, bytes=16416, packets=48, appId=org.onosproject.segmentrouting, referenceCount=0
+    id=0xffe0001, bucket=1, bytes=16416, packets=48, actions=[VLAN_POP, OUTPUT:1]
+    Output through of:0000000000000204/1
+    Device of:0000000000000226
+    Input from of:0000000000000226/1
+    Flows
+    ADDED, bytes=701910, packets=8507, table=0, priority=0, selector=[], treatment=[transition=TABLE:10]
+    ADDED, bytes=358984, packets=4275, table=10, priority=32768, selector=[IN_PORT:1, VLAN_VID:None], treatment=[immediate=[VLAN_PUSH:vlan, VLAN_ID:4094], transition=TABLE:20]
+    ADDED, bytes=16608, packets=48, table=20, priority=32768, selector=[IN_PORT:1, ETH_DST:00:00:00:00:02:26, ETH_TYPE:mpls_unicast, VLAN_VID:4094], treatment=[transition=TABLE:23]
+    ADDED, bytes=17158, packets=53, table=23, priority=0, selector=[], treatment=[transition=TABLE:24]
+    ADDED, bytes=16608, packets=48, table=24, priority=100, selector=[ETH_TYPE:mpls_unicast, MPLS_LABEL:205, MPLS_BOS:true], treatment=[deferred=[MPLS_POP:ipv4, DEC_TTL, GROUP:0x7000000b], transition=TABLE:60]
+    ADDED, bytes=17158, packets=53, table=60, priority=0, selector=[], treatment=[immediate=[NOACTION]]
+    Groups
+    id=0x7000000b, state=ADDED, type=SELECT, bytes=16608, packets=48, appId=org.onosproject.segmentrouting, referenceCount=2
+    id=0x7000000b, bucket=1, bytes=16608, packets=48, actions=[GROUP:0x20000009]
+    id=0x20000009, state=ADDED, type=INDIRECT, bytes=16608, packets=48, appId=org.onosproject.segmentrouting, referenceCount=0
+    id=0x20000009, bucket=1, bytes=16608, packets=48, actions=[ETH_DST:00:00:00:00:02:05, ETH_SRC:00:00:00:00:02:26, VLAN_ID:4094, GROUP:0xffe0002]
+    id=0xffe0002, state=ADDED, type=INDIRECT, bytes=16608, packets=48, appId=org.onosproject.segmentrouting, referenceCount=0
+    id=0xffe0002, bucket=1, bytes=16608, packets=48, actions=[VLAN_POP, OUTPUT:2]
+    Output through of:0000000000000226/2
+    Device of:0000000000000205
+    Input from of:0000000000000205/1
+    Flows
+    ADDED, bytes=2105886, packets=24084, table=0, priority=0, selector=[], treatment=[transition=TABLE:10]
+    ADDED, bytes=358792, packets=4275, table=10, priority=32768, selector=[IN_PORT:1, VLAN_VID:None], treatment=[immediate=[VLAN_PUSH:vlan, VLAN_ID:4094], transition=TABLE:20]
+    ADDED, bytes=16416, packets=48, table=20, priority=32768, selector=[IN_PORT:1, ETH_DST:00:00:00:00:02:05, ETH_TYPE:ipv4, VLAN_VID:4094], treatment=[transition=TABLE:30]
+    ADDED, bytes=196, packets=2, table=30, priority=64010, selector=[ETH_TYPE:ipv4, IPV4_DST:10.0.3.1/32], treatment=[deferred=[GROUP:0x2000002a], transition=TABLE:60]
+    ADDED, bytes=1370884, packets=15163, table=60, priority=0, selector=[], treatment=[immediate=[NOACTION]]
+    Groups
+    id=0x2000002a, state=ADDED, type=INDIRECT, bytes=196, packets=2, appId=org.onosproject.segmentrouting, referenceCount=1
+    id=0x2000002a, bucket=1, bytes=196, packets=2, actions=[ETH_DST:00:AA:00:00:00:03, ETH_SRC:00:00:00:00:02:05, VLAN_ID:30, GROUP:0x1e0003]
+    id=0x1e0003, state=ADDED, type=INDIRECT, bytes=12960, packets=126, appId=org.onosproject.segmentrouting, referenceCount=1
+    id=0x1e0003, bucket=1, bytes=12960, packets=126, actions=[VLAN_POP, OUTPUT:3]
+    id=0x2000002a, state=ADDED, type=INDIRECT, bytes=196, packets=2, appId=org.onosproject.segmentrouting, referenceCount=1
+    id=0x2000002a, bucket=1, bytes=196, packets=2, actions=[ETH_DST:00:AA:00:00:00:03, ETH_SRC:00:00:00:00:02:05, VLAN_ID:30, GROUP:0x1e0003]
+    id=0x1e0003, state=ADDED, type=INDIRECT, bytes=12960, packets=126, appId=org.onosproject.segmentrouting, referenceCount=1
+    id=0x1e0003, bucket=1, bytes=12960, packets=126, actions=[VLAN_POP, OUTPUT:3]
+    Output through of:0000000000000205/3
+    Result:
+    Reached required destination Host
+    Reached required destination Host
 
 Successful Example
 ------------------
@@ -372,12 +372,12 @@
 
 .. code-block:: console
 
-	onos> t3-troubleshoot -s 10.0.2.1 -sp of:0000000000000204/3 -sm 00:AA:00:00:00:01 -et IPV4 -d 10.0.3.1 -dm 00:AA:00:00:00:02 -vid None
-	Tracing packet: [IN_PORT:3, ETH_DST:00:AA:00:00:00:02, ETH_SRC:00:AA:00:00:00:01, ETH_TYPE:ipv4, VLAN_VID:None, IPV4_SRC:10.0.2.1/32, IPV4_DST:10.0.2.2/32, TCP_SRC:12345, TCP_DST:80, MPLS_BOS:true]
-	Paths
-	[of:0000000000000204/3, of:0000000000000204/4]
-	Result:
-	Reached required destination Host
+    onos> t3-troubleshoot -s 10.0.2.1 -sp of:0000000000000204/3 -sm 00:AA:00:00:00:01 -et IPV4 -d 10.0.3.1 -dm 00:AA:00:00:00:02 -vid None
+    Tracing packet: [IN_PORT:3, ETH_DST:00:AA:00:00:00:02, ETH_SRC:00:AA:00:00:00:01, ETH_TYPE:ipv4, VLAN_VID:None, IPV4_SRC:10.0.2.1/32, IPV4_DST:10.0.2.2/32, TCP_SRC:12345, TCP_DST:80, MPLS_BOS:true]
+    Paths
+    [of:0000000000000204/3, of:0000000000000204/4]
+    Result:
+    Reached required destination Host
 
 Failed Example
 --------------
@@ -387,14 +387,14 @@
 
 .. code-block:: console
 
-	onos> t3-troubleshoot -s 10.0.2.1 -sp of:0000000000000204/3 -sm 00:AA:00:00:00:01 -et IPV4 -d 10.0.3.1 -dm 00:00:00:00:02:04 -vid None
-	Tracing packet: [IN_PORT:3, ETH_DST:00:00:00:00:02:04, ETH_SRC:00:AA:00:00:00:01, ETH_TYPE:ipv4, VLAN_VID:None, IPV4_SRC:10.0.2.1/32, IPV4_DST:10.0.3.1/32, TCP_SRC:12345, TCP_DST:80, MPLS_BOS:true]
-	Paths
-	[of:0000000000000204/3, of:0000000000000204/2, of:0000000000000227/1, of:0000000000000227/2, of:0000000000000205/2, of:0000000000000205/3]
-	[of:0000000000000204/3, of:0000000000000204/1, of:0000000000000226/1]
-	Result:
-	Reached required destination Host
-	No output out of device of:0000000000000226 Packet is dropped
+    onos> t3-troubleshoot -s 10.0.2.1 -sp of:0000000000000204/3 -sm 00:AA:00:00:00:01 -et IPV4 -d 10.0.3.1 -dm 00:00:00:00:02:04 -vid None
+    Tracing packet: [IN_PORT:3, ETH_DST:00:00:00:00:02:04, ETH_SRC:00:AA:00:00:00:01, ETH_TYPE:ipv4, VLAN_VID:None, IPV4_SRC:10.0.2.1/32, IPV4_DST:10.0.3.1/32, TCP_SRC:12345, TCP_DST:80, MPLS_BOS:true]
+    Paths
+    [of:0000000000000204/3, of:0000000000000204/2, of:0000000000000227/1, of:0000000000000227/2, of:0000000000000205/2, of:0000000000000205/3]
+    [of:0000000000000204/3, of:0000000000000204/1, of:0000000000000226/1]
+    Result:
+    Reached required destination Host
+    No output out of device of:0000000000000226 Packet is dropped
 
 Notice that on the second path that was previously going through ``of:0000000000000226`` now the packet is dropped due to the rule we removed.
 
@@ -406,49 +406,49 @@
 
   .. code-block:: console
 
-  	  t3-troubleshoot -s 10.0.2.1 -sp of:0000000000000204/3 -sm 00:AA:00:00:00:01 -d 10.0.2.2 -dm 00:AA:00:00:00:02
+      t3-troubleshoot -s 10.0.2.1 -sp of:0000000000000204/3 -sm 00:AA:00:00:00:01 -d 10.0.2.2 -dm 00:AA:00:00:00:02
 
 - L2 Unicast IPv6
 
   .. code-block:: console
 
-  	  t3-troubleshoot -vv -s 2000::301  -sp of:0000000000000205/5 -sm 00:BB:00:00:00:03 -d 2000::302 -dm 00:BB:00:00:00:04 -et ipv6
+      t3-troubleshoot -vv -s 2000::301  -sp of:0000000000000205/5 -sm 00:BB:00:00:00:03 -d 2000::302 -dm 00:BB:00:00:00:04 -et ipv6
 
 - L3 Unicast IPv4
 
   .. code-block:: console
 
-  	  t3-troubleshoot -s 10.0.2.1 -sp of:0000000000000204/3 -sm 00:AA:00:00:00:01 -d 10.0.3.1 -dm 00:00:00:00:02:04
+      t3-troubleshoot -s 10.0.2.1 -sp of:0000000000000204/3 -sm 00:AA:00:00:00:01 -d 10.0.3.1 -dm 00:00:00:00:02:04
 
 - L3 Unicast IPv6
 
   .. code-block:: console
 
-  	  t3-troubleshoot -vv -s 2000::301  -sp of:0000000000000205/5 -sm 00:BB:00:00:00:03 -d 2000::202 -dm 00:00:00:00:02:05 -et ipv6
+      t3-troubleshoot -vv -s 2000::301  -sp of:0000000000000205/5 -sm 00:BB:00:00:00:03 -d 2000::202 -dm 00:00:00:00:02:05 -et ipv6
 
 - ARP
 
   .. code-block:: console
 
-  	  t3-troubleshoot -sp of:0000000000000204/3 -et ARP
+      t3-troubleshoot -sp of:0000000000000204/3 -et ARP
 
 - DHCP
 
   .. code-block:: console
 
-  	  t3-troubleshoot -vv -s 10.0.2.1 -sp of:0000000000000204/3 -sm 00:AA:00:00:00:01 -d 10.0.3.253 -dm 00:00:00:00:02:04 -ipp 17 -udps 67 -udpd 67
+      t3-troubleshoot -vv -s 10.0.2.1 -sp of:0000000000000204/3 -sm 00:AA:00:00:00:01 -d 10.0.3.253 -dm 00:00:00:00:02:04 -ipp 17 -udps 67 -udpd 67
 
 - LLDP
 
   .. code-block:: console
 
-  	  t3-troubleshoot -sp of:0000000000000204/3 -et lldp
+      t3-troubleshoot -sp of:0000000000000204/3 -et lldp
 
 - BDDP
 
   .. code-block:: console
 
-  	  t3-troubleshoot -sp of:0000000000000204/3 -et bddp
+      t3-troubleshoot -sp of:0000000000000204/3 -et bddp
 
 - LLDP from CONTROLLER
 
@@ -459,7 +459,7 @@
 
   .. code-block:: console
 
-  	  t3-troubleshoot -sp of:0000000000000204/CONTROLLER -et lldp
+      t3-troubleshoot -sp of:0000000000000204/CONTROLLER -et lldp
 
 - Multicast
 
@@ -467,7 +467,7 @@
 
   .. code-block:: console
 
-  	  t3-troubleshoot -vv -sp of:0000000000000205/9 -et ipv4 -d 224.0.0.1 -dm 01:00:5e:00:00:01
+      t3-troubleshoot -vv -sp of:0000000000000205/9 -et ipv4 -d 224.0.0.1 -dm 01:00:5e:00:00:01
 
 
 t3-troubleshoot-simple
@@ -479,33 +479,33 @@
 ---------------------------
 .. code-block:: console
 
-	onos> t3-troubleshoot-simple --help
-	DESCRIPTION
-	        onos:troubleshoot-simple
+    onos> t3-troubleshoot-simple --help
+    DESCRIPTION
+            onos:troubleshoot-simple
 
-	    Given two hosts troubleshoots flows and groups between them, in case of segment routing
+        Given two hosts troubleshoots flows and groups between them, in case of segment routing
 
-	SYNTAX
-	        onos:troubleshoot-simple [options] one two
+    SYNTAX
+            onos:troubleshoot-simple [options] one two
 
-	ARGUMENTS
-	        one
-	                One host ID
-	        two
-	                Another host ID
+    ARGUMENTS
+            one
+                    One host ID
+            two
+                    Another host ID
 
-	OPTIONS
-	        -vv, --veryverbose
-	                Outputs flows and groups for every device
-	        -j, --json
-	                Output JSON
-	        --help
-	                Display this help message
-	        -et, --ethType
-	                ETH Type
-	                (defaults to ipv4)
-	        -v, --verbose
-	                Outputs complete path
+    OPTIONS
+            -vv, --veryverbose
+                    Outputs flows and groups for every device
+            -j, --json
+                    Output JSON
+            --help
+                    Display this help message
+            -et, --ethType
+                    ETH Type
+                    (defaults to ipv4)
+            -v, --verbose
+                    Outputs complete path
 
 t3-troubleshoot-simple Example
 ------------------------------
@@ -517,7 +517,7 @@
 
   .. code-block:: console
 
-  	  t3-troubleshoot-simple -v -et IPV4 00:AA:00:00:00:01/None 00:AA:00:00:00:02/None
+      t3-troubleshoot-simple -v -et IPV4 00:AA:00:00:00:01/None 00:AA:00:00:00:02/None
 
 - L3 Multicast
 
@@ -525,7 +525,7 @@
 
   .. code-block:: console
 
-  	  t3-troubleshoot-simple -et IPV4 00:AA:00:00:00:01/None 00:AA:00:00:00:03/None
+      t3-troubleshoot-simple -et IPV4 00:AA:00:00:00:01/None 00:AA:00:00:00:03/None
 
 
 t3-troubleshoot-pingall
@@ -538,25 +538,25 @@
 ----------------------------
 .. code-block:: console
 
-	onos> t3-troubleshoot-pingall --help
-	DESCRIPTION
-	        onos:t3-troubleshoot-pingall
+    onos> t3-troubleshoot-pingall --help
+    DESCRIPTION
+            onos:t3-troubleshoot-pingall
 
-	    Traces a ping between all hosts in the system of a given ETH type
+        Traces a ping between all hosts in the system of a given ETH type
 
-	SYNTAX
-	        onos:t3-troubleshoot-pingall [options]
+    SYNTAX
+            onos:t3-troubleshoot-pingall [options]
 
-	OPTIONS
-	        -j, --json
-	                Output JSON
-	        --help
-	                Display this help message
-	        -et, --ethType
-	                ETH Type
-	                (defaults to ipv4)
-	        -v, --verbose
-	                Outputs trace for each host to host combination
+    OPTIONS
+            -j, --json
+                    Output JSON
+            --help
+                    Display this help message
+            -et, --ethType
+                    ETH Type
+                    (defaults to ipv4)
+            -v, --verbose
+                    Outputs trace for each host to host combination
 
 t3-troubleshoot-pingall Examples
 --------------------------------
@@ -564,7 +564,7 @@
 
   .. code-block:: console
 
-	  t3-troubleshoot-pingall
+      t3-troubleshoot-pingall
 
 - IPv6 hosts
 
@@ -582,27 +582,27 @@
 --------------------------
 .. code-block:: console
 
-	onos> t3-troubleshoot-mcast --help
-	DESCRIPTION
-	        onos:t3-troubleshoot-mcast
+    onos> t3-troubleshoot-mcast --help
+    DESCRIPTION
+            onos:t3-troubleshoot-mcast
 
-	 Traces all the mcast routes present in the system
+     Traces all the mcast routes present in the system
 
-	SYNTAX
-	        onos:t3-troubleshoot-mcast [options]
+    SYNTAX
+            onos:t3-troubleshoot-mcast [options]
 
-	OPTIONS
-	        -j, --json
-	                Output JSON
-	        --help
-	                Display this help message
-	        -vv, --veryverbose
-	                Outputs details of every trace
-	        -vid, --vlanId
-	                Vlan of incoming packet
-	                (defaults to None)
-	        -v, --verbose
-	                Outputs trace for each host to host combination
+    OPTIONS
+            -j, --json
+                    Output JSON
+            --help
+                    Display this help message
+            -vv, --veryverbose
+                    Outputs details of every trace
+            -vid, --vlanId
+                    Vlan of incoming packet
+                    (defaults to None)
+            -v, --verbose
+                    Outputs trace for each host to host combination
 
 REST API
 ========
@@ -611,7 +611,7 @@
 
 .. code-block:: text
 
-	<ONOS_IP>:8181/onos/v1/docs/#/t3
+    <ONOS_IP>:8181/onos/v1/docs/#/t3
 
 The rest API offered are a non verbose and a verbose version of the troubleshoot simple command.
 It bases itself on top of some configuration present in ONOS through netcfg, namely the VLAN interface configuration and the segment routing leaf router MAC for L3 Unicast.
@@ -619,11 +619,11 @@
 
 .. code-block:: console
 
-	curl -X GET --header 'Accept: application/json' 'http://localhost:8181/onos/v1/t3/t3/simple/<host_src>/<host_dst>/<eht_type>'
+    curl -X GET --header 'Accept: application/json' 'http://localhost:8181/onos/v1/t3/t3/simple/<host_src>/<host_dst>/<eht_type>'
 
 .. code-block:: console
 
-	curl -X GET --header 'Accept: application/json' 'http://localhost:8181/onos/v1/t3/t3/simple/<host_src>/<host_dst>/<eht_type>/verbose
+    curl -X GET --header 'Accept: application/json' 'http://localhost:8181/onos/v1/t3/t3/simple/<host_src>/<host_dst>/<eht_type>/verbose
 
 
 Last Resort