commit de50b097aea6b0fa2849d5a2f9a1009126aa4437
author srikanth <srikanthvavila@gmail.com> Tue Aug 19 08:31:46 2014 -0700
committer srikanth <srikanthvavila@gmail.com> Tue Aug 19 08:31:46 2014 -0700
tree ef5bccdbdb359cb2615d02f755382d9f6a9d017f
parent 116e6e8c4a30545efbd822e21bb530652286aef2

ONOS specific CLI changes

cli/sdncon/rest/views.py

diff --git a/cli/sdncon/rest/views.py b/cli/sdncon/rest/views.py
index 6355c35..be01800 100755
--- a/cli/sdncon/rest/views.py
+++ b/cli/sdncon/rest/views.py
@@ -47,7 +47,12 @@
 JSON_CONTENT_TYPE = 'application/json'
 BINARY_DATA_CONTENT_TYPE = 'application/octet-stream'
 
-CONTROLLER_URL_PREFIX = 'http://localhost:8080/wm/'
+onos = 1
+
+if onos == 1:
+    CONTROLLER_URL_PREFIX = 'http://localhost:9000/wm/'
+else:
+    CONTROLLER_URL_PREFIX = 'http://localhost:8080/wm/'
 
 def controller_url(*elements):
     return CONTROLLER_URL_PREFIX + '/'.join(elements)
@@ -675,18 +680,30 @@
 
 @safe_rest_view
 def do_device(request):
-    return get_sdnplatform_query(request, "device")
+    if onos == 0:
+        return get_sdnplatform_query(request, "device")
+    else:
+        url = controller_url("onos", "topology", "hosts")
+        if request.META['QUERY_STRING']:
+            url += '?' + request.META['QUERY_STRING']
+        return get_sdnplatform_response(url)        
 
 @safe_rest_view
 def do_switches(request):
-    url = controller_url("core", "controller", "switches", "json")
+    if onos == 0:
+        url = controller_url("core", "controller", "switches", "json")
+    else:
+        url = controller_url("onos", "topology", "switches")
     if request.META['QUERY_STRING']:
         url += '?' + request.META['QUERY_STRING']
     return get_sdnplatform_response(url)        
 
 @safe_rest_view
 def do_links(request):
-    url = controller_url("topology", "links", "json")
+    if onos == 0:
+        url = controller_url("topology", "links", "json")
+    else:
+        url = controller_url("onos", "topology", "links")
     if request.META['QUERY_STRING']:
         url += '?' + request.META['QUERY_STRING']
     return get_sdnplatform_response(url)        

cli/sdncon/settings.py

diff --git a/cli/sdncon/settings.py b/cli/sdncon/settings.py
index cc2c62e..97f766e 100755
--- a/cli/sdncon/settings.py
+++ b/cli/sdncon/settings.py
@@ -17,7 +17,7 @@
 # Django settings for sdncon project.
 
 import os, sys
-from cassandra.ttypes import ConsistencyLevel
+#from cassandra.ttypes import ConsistencyLevel
 
 DEBUG = True
 DEBUG_PROPAGATE_EXCEPTIONS = DEBUG
@@ -31,7 +31,8 @@
 
 DATABASES = {
     'default': {
-        'ENGINE': 'django_cassandra.db',
+        #'ENGINE': 'django_cassandra.db',
+        'ENGINE': 'django.db.backends.sqlite3',
         'NAME': 'sdncon',
         'USER': '',                      # Not used with sqlite3.
         'PASSWORD': '',                  # Not used with sqlite3.
@@ -155,7 +156,7 @@
     'djangotoolbox',
     'sdncon.rest',
     'sdncon.controller',
-    'django_cassandra',
+    #'django_cassandra',
     'sdncon.coreui',
     'sdncon.clusterAdmin',
     #'sdncon.account',