summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorIsaku Yamahata <yamahata@valinux.co.jp>2013-02-08 12:28:04 +0900
committerFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2013-02-08 22:55:16 +0900
commitc28f383526e17c3d2157cd55a4740c9a5d6a9124 (patch)
treeb9feedfbd3cfa6b943b5c0d4b17c40ef562e76a8
parent9a145d1db1da9b80388f3af79ad96b4bddb32414 (diff)
app/rest: add requirements to path component
This patch adds requirements to path component so that URL is verified. And simplify with submapper. Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
-rw-r--r--ryu/app/rest.py36
1 files changed, 22 insertions, 14 deletions
diff --git a/ryu/app/rest.py b/ryu/app/rest.py
index 3ed1ecd2..15c59c11 100644
--- a/ryu/app/rest.py
+++ b/ryu/app/rest.py
@@ -160,9 +160,11 @@ class MacController(ControllerBase):
self.nw = data
def create(self, _req, network_id, dpid, port_id, mac_addr, **_kwargs):
- mac = mac_lib.haddr_to_bin(mac_addr)
+ dpid = dpid_lib.str_to_dpid(dpid)
+ port_id = int(port_id)
+ mac_addr = mac_lib.haddr_to_bin(mac_addr)
try:
- self.nw.create_mac(network_id, int(dpid, 16), int(port_id), mac)
+ self.nw.create_mac(network_id, dpid, port_id, mac_addr)
except PortNotFound:
return Response(status=404)
except network.MacAddressAlreadyExist:
@@ -171,18 +173,22 @@ class MacController(ControllerBase):
return Response(status=200)
def update(self, _req, network_id, dpid, port_id, mac_addr, **_kwargs):
- mac = mac_lib.haddr_to_bin(mac_addr)
+ dpid = dpid_lib.str_to_dpid(dpid)
+ port_id = int(port_id)
+ mac_addr = mac_lib.haddr_to_bin(mac_addr)
try:
- self.nw.update_mac(network_id, int(dpid, 16), int(port_id), mac)
+ self.nw.update_mac(network_id, dpid, port_id, mac_addr)
except PortNotFound:
return Response(status=404)
return Response(status=200)
def lists(self, _req, network_id, dpid, port_id, **_kwargs):
+ dpid = dpid_lib.str_to_dpid(dpid)
+ port_id = int(port_id)
try:
body = json.dumps([mac_lib.haddr_to_str(mac_addr) for mac_addr in
- self.nw.list_mac(int(dpid, 16), int(port_id))])
+ self.nw.list_mac(dpid, port_id)])
except PortNotFound:
return Response(status=404)
@@ -236,16 +242,18 @@ class RestAPI(app_manager.RyuApp):
conditions=dict(method=['DELETE']))
wsgi.registory['MacController'] = self.nw
+ route_name = 'macs'
uri += '/macs'
- mapper.connect('macs', uri,
+ mapper.connect(route_name, uri,
controller=MacController, action='lists',
- conditions=dict(method=['GET']))
+ conditions=dict(method=['GET']),
+ requirements=requirements)
uri += '/{mac_addr}'
- mapper.connect('macs', uri,
- controller=MacController, action='create',
- conditions=dict(method=['POST']))
-
- mapper.connect('macs', uri,
- controller=MacController, action='update',
- conditions=dict(method=['PUT']))
+ requirements['mac_addr'] = mac_lib.HADDR_PATTERN
+ s = mapper.submapper(controller=MacController,
+ requirements=requirements)
+ s.connect(route_name, uri, action='create',
+ conditions=dict(method=['POST']))
+ s.connect(route_name, uri, action='update',
+ conditions=dict(method=['PUT']))