Added list_links to route handleres

Author: Ehsan70

ControllerAdvanced-REST.py

@@ -41,22 +41,28 @@
 This class is responsible for
 """
 simple_switch_instance_name = 'simple_switch_api_app'
-url = '/simpleswitch/mactable/{dpid}'
-urll = '/mininet/topo/switches/'
+url = '/mininet/topo/'
 class RestHandler(ControllerBase):
     _CONTEXTS = { 'wsgi': WSGIApplication }
 
     def __init__(self, req, link, data, **config):
         super(RestHandler, self).__init__(req, link, data, **config)
         self.simpl_switch_spp = data[simple_switch_instance_name]
 
-    @route('simpleswitch', urll, methods=['GET'])
-    def list_mac_table(self, req, **kwargs):
+    @route('simpleswitch', url+"switches/", methods=['GET'])
+    def list_switches(self, req, **kwargs):
         simple_switch = self.simpl_switch_spp
 
         body = json.dumps(simple_switch.topo_shape.get_switches_dpid())
         return Response(content_type='application/json', body=body)
 
+    @route('simpleswitch', url+"links/", methods=['GET'])
+    def list_links(self, req, **kwargs):
+        simple_switch = self.simpl_switch_spp
+
+        body = json.dumps(simple_switch.topo_shape.get_links_str())
+        return Response(content_type='application/json', body=body)
+
 """
 This holds the hosts information and their connection to switches.
 An instance of this class is used in TopoStructure to save the topo info.
@@ -410,6 +416,16 @@ def print_switches(self, func_str=None):
             for p in s.ports:
                 print ("\t\t\t " + str(p.hw_addr))
 
+    def get_links_str(self):
+        """
+        Uses the built in __str__ function to print the links saved in the class `topo_raw_links`.
+        Returns a list of link strings
+        """
+        out = []
+        for l in self.topo_raw_links:
+            out.append(str(l))
+        return out
+
     def get_hw_addresses_for_dpid(self, in_dpid):
         """
         For a specific dpid of switch it return a list of mac addresses for each port of that sw.