Make api better match docs

nimbusproject · Jun 19, 2013 · 1cb6fdf · 1cb6fdf
1 parent 73e1c63
commit 1cb6fdf
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/phantomweb/api/dev.py b/phantomweb/api/dev.py
@@ -134,8 +134,14 @@ def site_resource(request, site):
         response_dict = {
             "id": site,
             "credentials": "/api/%s/credentials/sites/%s" % (API_VERSION, site),
+            "instance_types": all_sites[site].get('instance_types', []),
             "uri": "/api/%s/sites/%s" % (API_VERSION, site)
         }
+        if details:
+            if response_dict.get('user_images') is None:
+                response_dict['user_images'] = []
+            if response_dict.get('public_images') is None:
+                response_dict['public_images'] = []
         h = HttpResponse(json.dumps(response_dict), mimetype='application/javascript')
     else:
         h = HttpResponseNotFound('Site %s not found' % site, mimetype='application/javascript')

diff --git a/phantomweb/urls.py b/phantomweb/urls.py
@@ -55,9 +55,11 @@
     url(r'^api/%s/sites$' % DEV_VERSION, 'phantomweb.api.dev.sites'),
     url(r'^api/%s/sites(?P<details>\w+)$' % DEV_VERSION, 'phantomweb.api.dev.sites'),
     url(r'^api/%s/sites/([-0-9A-Za-z]+)$' % DEV_VERSION, 'phantomweb.api.dev.site_resource'),
+    url(r'^api/%s/sites/([-0-9A-Za-z]+)(?P<details>\w+)$' % DEV_VERSION, 'phantomweb.api.dev.site_resource'),
     url(r'^api/%s/credentials/sites$' % DEV_VERSION, 'phantomweb.api.dev.credentials'),
     url(r'^api/%s/credentials/sites(?P<details>\w+)$' % DEV_VERSION, 'phantomweb.api.dev.credentials'),
     url(r'^api/%s/credentials/sites/([-0-9A-Za-z]+)$' % DEV_VERSION, 'phantomweb.api.dev.credentials_resource'),
+    url(r'^api/%s/credentials/sites/([-0-9A-Za-z]+)(?P<details>\w+)$' % DEV_VERSION, 'phantomweb.api.dev.credentials'),
     url(r'^api/%s/credentials/chef$' % DEV_VERSION, 'phantomweb.api.dev.chef_credentials'),
     url(r'^api/%s/credentials/chef/([-0-9A-Za-z]+)$' % DEV_VERSION, 'phantomweb.api.dev.chef_credentials_resource'),
     url(r'^api/%s/launchconfigurations$' % DEV_VERSION, 'phantomweb.api.dev.launchconfigurations'),