openstack/deb-ryu
Code Issues Proposed changes

app/rest: add requirements to path component

Browse Source 
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>
This commit is contained in:
Isaku Yamahata 2013-02-08 12:28:04 +09:00 committed by FUJITA Tomonori
parent 9a145d1db1
commit c28f383526
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ryu/app/rest.py
View File

@ -160,9 +160,11 @@ class MacController(ControllerBase):
self.nw = data self.nw = data
def create(self, _req, network_id, dpid, port_id, mac_addr, **_kwargs): 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: 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: except PortNotFound:
return Response(status=404) return Response(status=404)
except network.MacAddressAlreadyExist: except network.MacAddressAlreadyExist:
@ -171,18 +173,22 @@ class MacController(ControllerBase):
return Response(status=200) return Response(status=200)
def update(self, _req, network_id, dpid, port_id, mac_addr, **_kwargs): 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: 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: except PortNotFound:
return Response(status=404) return Response(status=404)
return Response(status=200) return Response(status=200)
def lists(self, _req, network_id, dpid, port_id, **_kwargs): def lists(self, _req, network_id, dpid, port_id, **_kwargs):
dpid = dpid_lib.str_to_dpid(dpid)
port_id = int(port_id)
try: try:
body = json.dumps([mac_lib.haddr_to_str(mac_addr) for mac_addr in 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: except PortNotFound:
return Response(status=404) return Response(status=404)
@ -236,16 +242,18 @@ class RestAPI(app_manager.RyuApp):
conditions=dict(method=['DELETE'])) conditions=dict(method=['DELETE']))
wsgi.registory['MacController'] = self.nw wsgi.registory['MacController'] = self.nw
route_name = 'macs'
uri += '/macs' uri += '/macs'
mapper.connect('macs', uri, mapper.connect(route_name, uri,
controller=MacController, action='lists', controller=MacController, action='lists',
conditions=dict(method=['GET'])) conditions=dict(method=['GET']),
requirements=requirements)
uri += '/{mac_addr}' uri += '/{mac_addr}'
mapper.connect('macs', uri, requirements['mac_addr'] = mac_lib.HADDR_PATTERN
controller=MacController, action='create', s = mapper.submapper(controller=MacController,
requirements=requirements)
s.connect(route_name, uri, action='create',
conditions=dict(method=['POST'])) conditions=dict(method=['POST']))
s.connect(route_name, uri, action='update',
mapper.connect('macs', uri,
controller=MacController, action='update',
conditions=dict(method=['PUT'])) conditions=dict(method=['PUT']))