Signed-off-by: Isaku Yamahata <[email protected]>

Conflicts:

        ryu/app/client.py
---
 ryu/app/client.py |   44 ++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/ryu/app/client.py b/ryu/app/client.py
index de74357..04d5fec 100644
--- a/ryu/app/client.py
+++ b/ryu/app/client.py
@@ -15,6 +15,7 @@
 # limitations under the License.
 
 import httplib
+import json
 import urlparse
 
 
@@ -40,10 +41,14 @@ class RyuClientBase(object):
         self.port = res.port
         self.url_prefix = '/' + self.version + '/'
 
-    def _do_request(self, method, action):
+    def _do_request(self, method, action, body=None):
         conn = httplib.HTTPConnection(self.host, self.port)
         url = self.url_prefix + action
-        conn.request(method, url)
+        headers = {}
+        if body is not None:
+            body = json.dumps(body)
+            headers['Content-Type'] = 'application/json'
+        conn.request(method, url, body, headers)
         res = conn.getresponse()
         if res.status in (httplib.OK,
                           httplib.CREATED,
@@ -157,3 +162,38 @@ class TunnelClientV1_0(RyuClientBase):
 
 
 TunnelClient = TunnelClientV1_0
+
+
+class SwitchConfClientV1_0(RyuClientBase):
+    version = 'v1.0'
+
+    # /conf/switches
+    # /conf/switches/<dpid>
+    # /conf/switches/<dpid>/<key>
+    path_conf_switches = 'conf/switches'
+    path_switch = path_conf_switches + '/%(dpid)s'
+    path_key = path_switch + '/%(key)s'
+
+    def __init__(self, address):
+        super(SwitchConfClientV1_0, self).__init__(self.version, address)
+
+    def list_switches(self):
+        return self._do_request_read('GET', self.path_conf_switches)
+
+    def delete_switch(self, dpid):
+        self._do_request('DELETE', self.path_switch % locals())
+
+    def list_keys(self, dpid):
+        return self._do_request_read('GET', self.path_switch % locals())
+
+    def set_key(self, dpid, key, value):
+        self._do_request('PUT', self.path_key % locals(), value)
+
+    def get_key(self, dpid, key):
+        return self._do_request_read('GET', self.path_key % locals())
+
+    def delete_key(self, dpid, key):
+        self._do_request('DELETE', self.path_key % locals())
+
+
+SwitchConfClient = SwitchConfClientV1_0
-- 
1.7.1.1


------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Ryu-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ryu-devel

Reply via email to