From 99bc14f16bce9f125715fbe436b7fc0969b62420 Mon Sep 17 00:00:00 2001
From: William Wolf <throughnothing@gmail.com>
Date: Mon, 25 Jul 2011 14:10:08 -0400
Subject: added 1.0 detail test, added VersionRequestDeserializer to support
 Versions actions properly, started 300/multiple choice work

---
 nova/api/openstack/__init__.py |  6 +++
 nova/api/openstack/versions.py | 92 ++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 95 insertions(+), 3 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/__init__.py b/nova/api/openstack/__init__.py
index e87d7c754..fb6f5515e 100644
--- a/nova/api/openstack/__init__.py
+++ b/nova/api/openstack/__init__.py
@@ -40,6 +40,7 @@ from nova.api.openstack import servers
 from nova.api.openstack import server_metadata
 from nova.api.openstack import shared_ip_groups
 from nova.api.openstack import users
+from nova.api.openstack import versions
 from nova.api.openstack import wsgi
 from nova.api.openstack import zones
 
@@ -115,6 +116,10 @@ class APIRouter(base_wsgi.Router):
                                     'select': 'POST',
                                     'boot': 'POST'})
 
+        mapper.connect("versions", "/", 
+                    controller=versions.create_resource(version), 
+                    action="index")
+
         mapper.resource("console", "consoles",
                     controller=consoles.create_resource(),
                     parent_resource=dict(member_name='server',
@@ -164,6 +169,7 @@ class APIRouterV11(APIRouter):
 
     def _setup_routes(self, mapper):
         super(APIRouterV11, self)._setup_routes(mapper, '1.1')
+
         mapper.resource("image_meta", "meta",
                         controller=image_metadata.create_resource(),
                         parent_resource=dict(member_name='image',
diff --git a/nova/api/openstack/versions.py b/nova/api/openstack/versions.py
index df7a94b7e..445a14372 100644
--- a/nova/api/openstack/versions.py
+++ b/nova/api/openstack/versions.py
@@ -28,6 +28,13 @@ ATOM_XMLNS = "http://www.w3.org/2005/Atom"
 
 
 class Versions(wsgi.Resource):
+    @classmethod
+    def factory(cls, global_config, **local_config):
+        """Paste factory."""
+        def _factory(app):
+            return cls(app, **local_config)
+        return _factory
+
     def __init__(self):
         metadata = {
             "attributes": {
@@ -45,7 +52,7 @@ class Versions(wsgi.Resource):
         supported_content_types = ('application/json',
                                    'application/xml',
                                    'application/atom+xml')
-        deserializer = wsgi.RequestDeserializer(
+        deserializer = VersionsRequestDeserializer(
             supported_content_types=supported_content_types)
 
         wsgi.Resource.__init__(self, None, serializer=serializer,
@@ -53,6 +60,14 @@ class Versions(wsgi.Resource):
 
     def dispatch(self, request, *args):
         """Respond to a request for all OpenStack API versions."""
+        if request.path == '/':
+            # List Versions
+            return self._versions_list(request)
+        else:
+            # Versions Multiple Choice
+            return self._versions_multi_choice(request)
+
+    def _versions_list(self, request):
         version_objs = [
             {
                 "id": "v1.1",
@@ -72,6 +87,47 @@ class Versions(wsgi.Resource):
         versions = [builder.build(version) for version in version_objs]
         return dict(versions=versions)
 
+    def _versions_multi_choice(self, request):
+        version_objs = [
+            {
+                "id": "v1.1",
+                "status": "CURRENT",
+                #TODO(wwolf) get correct value for these
+                "updated": "2011-07-18T11:30:00Z",
+            },
+            {
+                "id": "v1.0",
+                "status": "DEPRECATED",
+                #TODO(wwolf) get correct value for these
+                "updated": "2010-10-09T11:30:00Z",
+            },
+        ]
+
+        builder = nova.api.openstack.views.versions.get_view_builder(request)
+        versions = [builder.build(version) for version in version_objs]
+        return dict(versions=versions)
+
+
+class VersionV10(object):
+    def index(self, req):
+        return "test index 1.0"
+
+
+class VersionV11(object):
+    def index(self, req):
+        return "test index 1.1"
+
+class VersionsRequestDeserializer(wsgi.RequestDeserializer):
+    def get_action_args(self, request_environment):
+        """Parse dictionary created by routes library."""
+
+        args = {}
+        if request_environment['PATH_INFO'] == '/':
+            args['action'] = 'index'
+        else:
+            args['action'] = 'multi'
+
+        return args
 
 class VersionsXMLSerializer(wsgi.XMLDictSerializer):
     def _versions_to_xml(self, versions):
@@ -96,7 +152,13 @@ class VersionsXMLSerializer(wsgi.XMLDictSerializer):
 
         return version_node
 
-    def default(self, data):
+    def index(self, data):
+        self._xml_doc = minidom.Document()
+        node = self._versions_to_xml(data['versions'])
+
+        return self.to_xml_string(node)
+
+    def multi(self, data):
         self._xml_doc = minidom.Document()
         node = self._versions_to_xml(data['versions'])
 
@@ -190,10 +252,34 @@ class VersionsAtomSerializer(wsgi.XMLDictSerializer):
             entry.appendChild(content)
             root.appendChild(entry)
 
-    def default(self, data):
+    def index(self, data):
         self._xml_doc = minidom.Document()
         node = self._xml_doc.createElementNS(self.xmlns, 'feed')
         self._create_meta(node, data['versions'])
         self._create_version_entries(node, data['versions'])
 
         return self.to_xml_string(node)
+
+    def multi(self, data):
+        self._xml_doc = minidom.Document()
+        node = self._xml_doc.createElementNS(self.xmlns, 'feed')
+        self._create_meta(node, data['versions'])
+        self._create_version_entries(node, data['versions'])
+
+        return self.to_xml_string(node)
+
+
+def create_resource(version='1.0'):
+    controller = {
+        '1.0': VersionV10,
+        '1.1': VersionV11,
+    }[version]()
+
+    body_serializers = {
+        'application/xml': VersionsXMLSerializer(),
+        'application/atom+xml': VersionsAtomSerializer(),
+    }
+
+    serializer = wsgi.ResponseSerializer(body_serializers)
+
+    return wsgi.Resource(controller, serializer=serializer)
-- 
cgit 


From 810d4b89cbbfa9388fb61f9069ea0104a7d77752 Mon Sep 17 00:00:00 2001
From: William Wolf <throughnothing@gmail.com>
Date: Mon, 25 Jul 2011 15:28:06 -0400
Subject: removed prints, got versions detail tests passing, still need to do
 xml/atom

---
 nova/api/openstack/__init__.py |  2 +-
 nova/api/openstack/versions.py | 96 ++++++++++++++++++++++++++++++++++++------
 2 files changed, 84 insertions(+), 14 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/__init__.py b/nova/api/openstack/__init__.py
index fb6f5515e..a6a8b4595 100644
--- a/nova/api/openstack/__init__.py
+++ b/nova/api/openstack/__init__.py
@@ -118,7 +118,7 @@ class APIRouter(base_wsgi.Router):
 
         mapper.connect("versions", "/", 
                     controller=versions.create_resource(version), 
-                    action="index")
+                    action="detail")
 
         mapper.resource("console", "consoles",
                     controller=consoles.create_resource(),
diff --git a/nova/api/openstack/versions.py b/nova/api/openstack/versions.py
index 445a14372..5655edcfc 100644
--- a/nova/api/openstack/versions.py
+++ b/nova/api/openstack/versions.py
@@ -88,6 +88,7 @@ class Versions(wsgi.Resource):
         return dict(versions=versions)
 
     def _versions_multi_choice(self, request):
+        #TODO
         version_objs = [
             {
                 "id": "v1.1",
@@ -109,18 +110,87 @@ class Versions(wsgi.Resource):
 
 
 class VersionV10(object):
-    def index(self, req):
-        return "test index 1.0"
+    def detail(self, req):
+        #TODO
+        return {
+            "version" : { 
+                "id": "v1.0",
+                "status": "CURRENT",
+                "updated": "2011-01-21T11:33:21-06:00", 
+                "links": [
+                    {
+                        "rel": "self",
+                        "href": "http://servers.api.openstack.org/v1.0/"
+                    },
+                    {
+                        "rel": "describedby",
+                        "type": "application/pdf",
+                        "href": "http://docs.rackspacecloud.com/"
+                            "servers/api/v1.0/cs-devguide-20110125.pdf"
+                    }, 
+                    {
+                        "rel": "describedby",
+                        "type": "application/vnd.sun.wadl+xml",
+                        "href": "http://docs.rackspacecloud.com/"
+                            "servers/api/v1.0/application.wadl"
+                    },
+                ],
+                "media-types": [
+                    {
+                        "base" : "application/xml",
+                        "type" : "application/vnd.openstack.compute-v1.0+xml"
+                    },
+                    {
+                        "base" : "application/json",
+                        "type" : "application/vnd.openstack.compute-v1.0+json"
+                    }
+                ],
+            },
+        }
 
 
 class VersionV11(object):
-    def index(self, req):
-        return "test index 1.1"
+    def detail(self, req):
+        return {
+            "version" : { 
+                "id": "v1.1",
+                "status": "CURRENT",
+                "updated": "2011-01-21T11:33:21-06:00",
+                "links": [
+                    {
+                        "rel": "self",
+                        "href": "http://servers.api.openstack.org/v1.1/"
+                    },
+                    {
+                        "rel": "describedby",
+                        "type": "application/pdf",
+                        "href": "http://docs.rackspacecloud.com/"
+                            "servers/api/v1.1/cs-devguide-20110125.pdf"
+                    }, 
+                    {
+                        "rel": "describedby",
+                        "type": "application/vnd.sun.wadl+xml",
+                        "href": "http://docs.rackspacecloud.com/"
+                            "servers/api/v1.1/application.wadl"
+                    },
+                ],
+                "media-types": [
+                    {
+                        "base" : "application/xml",
+                        "type" : "application/vnd.openstack.compute-v1.1+xml"
+                    },
+                    {
+                        "base" : "application/json",
+                        "type" : "application/vnd.openstack.compute-v1.1+json"
+                    }
+                ],
+            },
+        }
+
 
 class VersionsRequestDeserializer(wsgi.RequestDeserializer):
     def get_action_args(self, request_environment):
         """Parse dictionary created by routes library."""
-
         args = {}
         if request_environment['PATH_INFO'] == '/':
             args['action'] = 'index'
@@ -129,6 +199,7 @@ class VersionsRequestDeserializer(wsgi.RequestDeserializer):
 
         return args
 
+
 class VersionsXMLSerializer(wsgi.XMLDictSerializer):
     def _versions_to_xml(self, versions):
         root = self._xml_doc.createElement('versions')
@@ -158,6 +229,9 @@ class VersionsXMLSerializer(wsgi.XMLDictSerializer):
 
         return self.to_xml_string(node)
 
+    def detail(self,data):
+        return "<xml></xml>"
+
     def multi(self, data):
         self._xml_doc = minidom.Document()
         node = self._versions_to_xml(data['versions'])
@@ -167,6 +241,7 @@ class VersionsXMLSerializer(wsgi.XMLDictSerializer):
 
 class VersionsAtomSerializer(wsgi.XMLDictSerializer):
     def __init__(self, metadata=None, xmlns=None):
+        self.metadata = metadata or {}
         if not xmlns:
             self.xmlns = ATOM_XMLNS
         else:
@@ -260,14 +335,9 @@ class VersionsAtomSerializer(wsgi.XMLDictSerializer):
 
         return self.to_xml_string(node)
 
-    def multi(self, data):
-        self._xml_doc = minidom.Document()
-        node = self._xml_doc.createElementNS(self.xmlns, 'feed')
-        self._create_meta(node, data['versions'])
-        self._create_version_entries(node, data['versions'])
-
-        return self.to_xml_string(node)
-
+    def detail(self, data):
+        #TODO
+        pass
 
 def create_resource(version='1.0'):
     controller = {
-- 
cgit 


From 71a103822b41df3d90a1e958baffda55a9cb8730 Mon Sep 17 00:00:00 2001
From: William Wolf <throughnothing@gmail.com>
Date: Mon, 25 Jul 2011 16:25:19 -0400
Subject: xml version detail working with tests

---
 nova/api/openstack/versions.py | 30 ++++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/versions.py b/nova/api/openstack/versions.py
index 5655edcfc..00fc8d98f 100644
--- a/nova/api/openstack/versions.py
+++ b/nova/api/openstack/versions.py
@@ -209,16 +209,39 @@ class VersionsXMLSerializer(wsgi.XMLDictSerializer):
 
         return root
 
-    def _create_version_node(self, version):
+    def _create_media_types(self, media_types):
+        base = self._xml_doc.createElement('media-types')
+        for type in media_types:
+            node = self._xml_doc.createElement('media-type')
+            node.setAttribute('base', type['base'])
+            node.setAttribute('type', type['type'])
+            base.appendChild(node)
+
+        return base
+            
+    def _create_version_node(self, version, create_ns=False):
         version_node = self._xml_doc.createElement('version')
+        if create_ns:
+            xmlns = "http://docs.openstack.org/common/api/%s" % version['id']
+            xmlns_atom = "http://www.w3.org/2005/Atom"
+            version_node.setAttribute('xmlns', xmlns)
+            version_node.setAttribute('xmlns:atom', xmlns_atom)
+
         version_node.setAttribute('id', version['id'])
         version_node.setAttribute('status', version['status'])
         version_node.setAttribute('updated', version['updated'])
 
+        if 'media-types' in version:
+            media_types = self._create_media_types(version['media-types'])
+            version_node.appendChild(media_types)
+
         for link in version['links']:
             link_node = self._xml_doc.createElement('atom:link')
             link_node.setAttribute('rel', link['rel'])
             link_node.setAttribute('href', link['href'])
+            if 'type' in link:
+                link_node.setAttribute('type', link['type'])
+
             version_node.appendChild(link_node)
 
         return version_node
@@ -230,7 +253,10 @@ class VersionsXMLSerializer(wsgi.XMLDictSerializer):
         return self.to_xml_string(node)
 
     def detail(self,data):
-        return "<xml></xml>"
+        self._xml_doc = minidom.Document()
+        node = self._create_version_node(data['version'], True)
+
+        return self.to_xml_string(node)
 
     def multi(self, data):
         self._xml_doc = minidom.Document()
-- 
cgit 


From 7be2b2482fde20be8802cfe6a200590933a73d7e Mon Sep 17 00:00:00 2001
From: William Wolf <throughnothing@gmail.com>
Date: Mon, 25 Jul 2011 18:28:43 -0400
Subject: atom and xml_detail working, with tests

---
 nova/api/openstack/versions.py | 49 +++++++++++++++++++++++++++++++++++-------
 1 file changed, 41 insertions(+), 8 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/versions.py b/nova/api/openstack/versions.py
index 00fc8d98f..6fba4bbe0 100644
--- a/nova/api/openstack/versions.py
+++ b/nova/api/openstack/versions.py
@@ -116,7 +116,7 @@ class VersionV10(object):
             "version" : { 
                 "id": "v1.0",
                 "status": "CURRENT",
-                "updated": "2011-01-21T11:33:21-06:00", 
+                "updated": "2011-01-21T11:33:21Z", 
                 "links": [
                     {
                         "rel": "self",
@@ -155,7 +155,7 @@ class VersionV11(object):
             "version" : { 
                 "id": "v1.1",
                 "status": "CURRENT",
-                "updated": "2011-01-21T11:33:21-06:00",
+                "updated": "2011-01-21T11:33:21Z",
                 "links": [
                     {
                         "rel": "self",
@@ -298,8 +298,33 @@ class VersionsAtomSerializer(wsgi.XMLDictSerializer):
         link_href = link_href.rstrip('/')
         return link_href.rsplit('/', 1)[0] + '/'
 
-    def _create_meta(self, root, versions):
-        title = self._create_text_elem('title', 'Available API Versions',
+    def _create_detail_meta(self, root, version):
+        title = self._create_text_elem('title', "About This Version",
+                                       type='text')
+
+        updated = self._create_text_elem('updated', version['updated'])
+
+        uri = version['links'][0]['href']
+        id = self._create_text_elem('id', uri)
+
+        link = self._xml_doc.createElement('link')
+        link.setAttribute('rel', 'self')
+        link.setAttribute('href', uri)
+
+        author = self._xml_doc.createElement('author')
+        author_name = self._create_text_elem('name', 'Rackspace')
+        author_uri = self._create_text_elem('uri', 'http://www.rackspace.com/')
+        author.appendChild(author_name)
+        author.appendChild(author_uri)
+
+        root.appendChild(title)
+        root.appendChild(updated)
+        root.appendChild(id)
+        root.appendChild(author)
+        root.appendChild(link)
+
+    def _create_list_meta(self, root, versions):
+        title = self._create_text_elem('title', "Available API Versions",
                                        type='text')
         # Set this updated to the most recently updated version
         recent = self._get_most_recent_update(versions)
@@ -307,6 +332,7 @@ class VersionsAtomSerializer(wsgi.XMLDictSerializer):
 
         base_url = self._get_base_url(versions[0]['links'][0]['href'])
         id = self._create_text_elem('id', base_url)
+
         link = self._xml_doc.createElement('link')
         link.setAttribute('rel', 'self')
         link.setAttribute('href', base_url)
@@ -341,7 +367,10 @@ class VersionsAtomSerializer(wsgi.XMLDictSerializer):
                 link_node = self._xml_doc.createElement('link')
                 link_node.setAttribute('rel', link['rel'])
                 link_node.setAttribute('href', link['href'])
-            entry.appendChild(link_node)
+                if 'type' in link:
+                    link_node.setAttribute('type', link['type'])
+
+                entry.appendChild(link_node)
 
             content = self._create_text_elem('content',
                 'Version %s %s (%s)' %
@@ -356,14 +385,18 @@ class VersionsAtomSerializer(wsgi.XMLDictSerializer):
     def index(self, data):
         self._xml_doc = minidom.Document()
         node = self._xml_doc.createElementNS(self.xmlns, 'feed')
-        self._create_meta(node, data['versions'])
+        self._create_list_meta(node, data['versions'])
         self._create_version_entries(node, data['versions'])
 
         return self.to_xml_string(node)
 
     def detail(self, data):
-        #TODO
-        pass
+        self._xml_doc = minidom.Document()
+        node = self._xml_doc.createElementNS(self.xmlns, 'feed')
+        self._create_detail_meta(node, data['version'])
+        self._create_version_entries(node, [data['version']])
+
+        return self.to_xml_string(node)
 
 def create_resource(version='1.0'):
     controller = {
-- 
cgit 


From eba09454a21ce49afa821ec63ed801883354ff7e Mon Sep 17 00:00:00 2001
From: William Wolf <throughnothing@gmail.com>
Date: Mon, 25 Jul 2011 20:34:41 -0400
Subject: initial stuff to get away from string comparisons for XML, and use
 ElementTree

---
 nova/api/openstack/versions.py | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'nova/api')

diff --git a/nova/api/openstack/versions.py b/nova/api/openstack/versions.py
index 6fba4bbe0..c250dac8c 100644
--- a/nova/api/openstack/versions.py
+++ b/nova/api/openstack/versions.py
@@ -201,6 +201,13 @@ class VersionsRequestDeserializer(wsgi.RequestDeserializer):
 
 
 class VersionsXMLSerializer(wsgi.XMLDictSerializer):
+    #TODO(wwolf): this is temporary until we get rid of toprettyxml 
+    # in the base class (XMLDictSerializer), which I plan to do in 
+    # another branch
+    def to_xml_string(self, node, has_atom=False):
+        self._add_xmlns(node, has_atom)
+        return node.toxml(encoding='UTF-8')
+
     def _versions_to_xml(self, versions):
         root = self._xml_doc.createElement('versions')
 
-- 
cgit 


From 696dc56b74a08d224beccdfd644536ec4217321d Mon Sep 17 00:00:00 2001
From: William Wolf <throughnothing@gmail.com>
Date: Tue, 26 Jul 2011 11:15:44 -0400
Subject: updated atom tests

---
 nova/api/openstack/versions.py | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/versions.py b/nova/api/openstack/versions.py
index c250dac8c..03b99f342 100644
--- a/nova/api/openstack/versions.py
+++ b/nova/api/openstack/versions.py
@@ -115,7 +115,7 @@ class VersionV10(object):
         return {
             "version" : { 
                 "id": "v1.0",
-                "status": "CURRENT",
+                "status": "DEPRECATED",
                 "updated": "2011-01-21T11:33:21Z", 
                 "links": [
                     {
@@ -415,7 +415,15 @@ def create_resource(version='1.0'):
         'application/xml': VersionsXMLSerializer(),
         'application/atom+xml': VersionsAtomSerializer(),
     }
-
     serializer = wsgi.ResponseSerializer(body_serializers)
 
-    return wsgi.Resource(controller, serializer=serializer)
+    supported_content_types = ('application/json',
+                               'application/xml',
+                               'application/atom+xml')
+    deserializer = wsgi.RequestDeserializer(
+        supported_content_types=supported_content_types)
+
+
+
+    return wsgi.Resource(controller, serializer=serializer,
+                         deserializer=deserializer)
-- 
cgit 


From bde063a98dad2ce75be1016b39a2c3f08759d4f6 Mon Sep 17 00:00:00 2001
From: William Wolf <throughnothing@gmail.com>
Date: Tue, 26 Jul 2011 11:30:58 -0400
Subject: got rid of string comparisons in serializer tests

---
 nova/api/openstack/versions.py | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'nova/api')

diff --git a/nova/api/openstack/versions.py b/nova/api/openstack/versions.py
index 03b99f342..40c187607 100644
--- a/nova/api/openstack/versions.py
+++ b/nova/api/openstack/versions.py
@@ -205,6 +205,7 @@ class VersionsXMLSerializer(wsgi.XMLDictSerializer):
     # in the base class (XMLDictSerializer), which I plan to do in 
     # another branch
     def to_xml_string(self, node, has_atom=False):
+        print "TOXML"
         self._add_xmlns(node, has_atom)
         return node.toxml(encoding='UTF-8')
 
@@ -273,6 +274,14 @@ class VersionsXMLSerializer(wsgi.XMLDictSerializer):
 
 
 class VersionsAtomSerializer(wsgi.XMLDictSerializer):
+    #TODO(wwolf): this is temporary until we get rid of toprettyxml 
+    # in the base class (XMLDictSerializer), which I plan to do in 
+    # another branch
+    def to_xml_string(self, node, has_atom=False):
+        print "TOXML"
+        self._add_xmlns(node, has_atom)
+        return node.toxml(encoding='UTF-8')
+
     def __init__(self, metadata=None, xmlns=None):
         self.metadata = metadata or {}
         if not xmlns:
-- 
cgit 


From 26f980c955e357df3685bcccda005a3008f86afb Mon Sep 17 00:00:00 2001
From: William Wolf <throughnothing@gmail.com>
Date: Tue, 26 Jul 2011 11:31:16 -0400
Subject: got rid of some prints

---
 nova/api/openstack/versions.py | 2 --
 1 file changed, 2 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/versions.py b/nova/api/openstack/versions.py
index 40c187607..f389933b9 100644
--- a/nova/api/openstack/versions.py
+++ b/nova/api/openstack/versions.py
@@ -205,7 +205,6 @@ class VersionsXMLSerializer(wsgi.XMLDictSerializer):
     # in the base class (XMLDictSerializer), which I plan to do in 
     # another branch
     def to_xml_string(self, node, has_atom=False):
-        print "TOXML"
         self._add_xmlns(node, has_atom)
         return node.toxml(encoding='UTF-8')
 
@@ -278,7 +277,6 @@ class VersionsAtomSerializer(wsgi.XMLDictSerializer):
     # in the base class (XMLDictSerializer), which I plan to do in 
     # another branch
     def to_xml_string(self, node, has_atom=False):
-        print "TOXML"
         self._add_xmlns(node, has_atom)
         return node.toxml(encoding='UTF-8')
 
-- 
cgit 


From 241a926ed682cb6154ff8f37c4940e7b5885b6fe Mon Sep 17 00:00:00 2001
From: Brian Waldon <brian.waldon@rackspace.com>
Date: Tue, 26 Jul 2011 16:13:09 -0400
Subject: moved v1.1 image creation from /images to /servers/<id>/action

---
 nova/api/openstack/images.py  | 37 ++++++++---------
 nova/api/openstack/servers.py | 93 +++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 106 insertions(+), 24 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/images.py b/nova/api/openstack/images.py
index 30e4fd389..517a51662 100644
--- a/nova/api/openstack/images.py
+++ b/nova/api/openstack/images.py
@@ -98,6 +98,20 @@ class Controller(object):
         self._image_service.delete(context, id)
         return webob.exc.HTTPNoContent()
 
+    def get_builder(self, request):
+        """Indicates that you must use a Controller subclass."""
+        raise NotImplementedError()
+
+    def _server_id_from_req(self, req, data):
+        raise NotImplementedError()
+
+    def _get_extra_properties(self, req, data):
+        return {}
+
+
+class ControllerV10(Controller):
+    """Version 1.0 specific controller logic."""
+
     def create(self, req, body):
         """Snapshot or backup a server instance and save the image.
 
@@ -157,20 +171,6 @@ class Controller(object):
 
         return dict(image=self.get_builder(req).build(image, detail=True))
 
-    def get_builder(self, request):
-        """Indicates that you must use a Controller subclass."""
-        raise NotImplementedError()
-
-    def _server_id_from_req(self, req, data):
-        raise NotImplementedError()
-
-    def _get_extra_properties(self, req, data):
-        return {}
-
-
-class ControllerV10(Controller):
-    """Version 1.0 specific controller logic."""
-
     def get_builder(self, request):
         """Property to get the ViewBuilder class we need to use."""
         base_url = request.application_url
@@ -278,6 +278,9 @@ class ControllerV11(Controller):
                                       server_ref)
         return {'instance_ref': server_ref}
 
+    def create(self, *args, **kwargs):
+        raise webob.exc.HTTPMethodNotAllowed()
+
 
 class ImageXMLSerializer(wsgi.XMLDictSerializer):
 
@@ -369,12 +372,6 @@ class ImageXMLSerializer(wsgi.XMLDictSerializer):
                                        image_dict['image'])
         return self.to_xml_string(node, True)
 
-    def create(self, image_dict):
-        xml_doc = minidom.Document()
-        node = self._image_to_xml_detailed(xml_doc,
-                                       image_dict['image'])
-        return self.to_xml_string(node, True)
-
 
 def create_resource(version='1.0'):
     controller = {
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index d7cabb067..5371e62c9 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -14,6 +14,7 @@
 #    under the License.
 
 import base64
+import os
 import traceback
 
 from webob import exc
@@ -155,20 +156,26 @@ class Controller(object):
         """Multi-purpose method used to reboot, rebuild, or
         resize a server"""
 
-        actions = {
+        self.actions = {
             'changePassword': self._action_change_password,
             'reboot': self._action_reboot,
             'resize': self._action_resize,
             'confirmResize': self._action_confirm_resize,
             'revertResize': self._action_revert_resize,
             'rebuild': self._action_rebuild,
-            'migrate': self._action_migrate}
+            'migrate': self._action_migrate,
+            'createImage': self._action_create_image,
+        }
 
-        for key in actions.keys():
+
+        for key in self.actions.keys():
             if key in body:
-                return actions[key](body, req, id)
+                return self.actions[key](body, req, id)
         raise exc.HTTPNotImplemented()
 
+    def _action_create_image(self, input_dict, req, id):
+        return exc.HTTPNotImplemented()
+
     def _action_change_password(self, input_dict, req, id):
         return exc.HTTPNotImplemented()
 
@@ -585,6 +592,80 @@ class ControllerV11(Controller):
 
         return webob.Response(status_int=202)
 
+    def _action_create_image(self, input_dict, req, instance_id):
+        """Snapshot or backup a server instance and save the image.
+
+        Images now have an `image_type` associated with them, which can be
+        'snapshot' or the backup type, like 'daily' or 'weekly'.
+
+        If the image_type is backup-like, then the rotation factor can be
+        included and that will cause the oldest backups that exceed the
+        rotation factor to be deleted.
+
+        """
+        entity = input_dict.get('createImage', {})
+
+        def get_param(param):
+            try:
+                return entity[param]
+            except KeyError:
+                msg = _("Missing required param: %s") % param
+                raise webob.exc.HTTPBadRequest(explanation=msg)
+
+        context = req.environ['nova.context']
+
+        image_name = get_param("name")
+        image_type = entity.get("image_type", "snapshot")
+
+        # preserve link to server in image properties
+        server_ref = os.path.join(req.application_url,
+                                  'servers',
+                                  str(instance_id))
+        props = {'instance_ref': server_ref}
+
+        metadata = entity.get('metadata', {})
+        try:
+            props.update(metadata)
+        except ValueError:
+            msg = _("Invalid metadata")
+            raise webob.exc.HTTPBadRequest(explanation=msg)
+
+        if image_type == "snapshot":
+            image = self.compute_api.snapshot(context,
+                                              instance_id,
+                                              image_name,
+                                              extra_properties=props)
+
+        elif image_type == "backup":
+            # NOTE(sirp): Unlike snapshot, backup is not a customer facing
+            # API call; rather, it's used by the internal backup scheduler
+            if not FLAGS.allow_admin_api:
+                msg = _("Admin API Required")
+                raise webob.exc.HTTPBadRequest(explanation=msg)
+
+            backup_type = get_param("backup_type")
+            rotation = int(get_param("rotation"))
+
+            image = self.compute_api.backup(context,
+                                            instance_id,
+                                            image_name,
+                                            backup_type,
+                                            rotation,
+                                            extra_properties=props)
+        else:
+            msg = _("Invalid image_type '%s'") % image_type
+            raise webob.exc.HTTPBadRequest(explanation=msg)
+
+
+        # build location of newly-created image entity
+        image_ref = os.path.join(req.application_url,
+                                 'images',
+                                 str(image['id']))
+
+        resp = webob.Response(status_int=202)
+        resp.headers['Location'] = image_ref
+        return resp
+
     def get_default_xmlns(self, req):
         return common.XML_NS_V11
 
@@ -593,6 +674,10 @@ class ControllerV11(Controller):
         return self.helper._get_server_admin_password_new_style(server)
 
 
+
+
+
+
 class HeadersSerializer(wsgi.ResponseHeadersSerializer):
 
     def delete(self, response, data):
-- 
cgit 


From c8b1a357c9bd5fe4bc54e6472f9667123d91c02a Mon Sep 17 00:00:00 2001
From: Brian Waldon <brian.waldon@rackspace.com>
Date: Tue, 26 Jul 2011 16:53:00 -0400
Subject: adding xml deserialization for createImage action

---
 nova/api/openstack/create_instance_helper.py | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

(limited to 'nova/api')

diff --git a/nova/api/openstack/create_instance_helper.py b/nova/api/openstack/create_instance_helper.py
index f8317565e..eb556ae8b 100644
--- a/nova/api/openstack/create_instance_helper.py
+++ b/nova/api/openstack/create_instance_helper.py
@@ -293,6 +293,30 @@ class ServerXMLDeserializer(wsgi.MetadataXMLDeserializer):
     and personality attributes
     """
 
+    def action(self, string):
+        dom = minidom.parseString(string)
+        action_node = dom.childNodes[0]
+        action_name = action_node.tagName
+
+        action_deserializer = {
+            'createImage': self._action_create_image,
+        }.get(action_name, self.default)
+
+        action_data = action_deserializer(action_node)
+
+        return {'body': {action_name: action_data}}
+
+    def _action_create_image(self, node):
+        data = {}
+        attributes = ['name', 'image_type', 'backup_type', 'rotation']
+        for attribute in attributes:
+            value = node.getAttribute(attribute)
+            if value:
+                data[attribute] = value
+        metadata_node = self.find_first_child_named(node, 'metadata')
+        data['metadata'] = self.extract_metadata(metadata_node)
+        return data
+
     def create(self, string):
         """Deserialize an xml-formatted server create request"""
         dom = minidom.parseString(string)
-- 
cgit 


From 84909f4a7733dde453afcc5cc540854ac1bc458c Mon Sep 17 00:00:00 2001
From: Brian Waldon <brian.waldon@rackspace.com>
Date: Tue, 26 Jul 2011 17:00:10 -0400
Subject: pep8

---
 nova/api/openstack/servers.py | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index 7a900cb54..0cc81009b 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -153,8 +153,7 @@ class Controller(object):
 
     @scheduler_api.redirect_handler
     def action(self, req, id, body):
-        """Multi-purpose method used to reboot, rebuild, or
-        resize a server"""
+        """Multi-purpose method used to take actions on a server"""
 
         self.actions = {
             'changePassword': self._action_change_password,
@@ -167,7 +166,6 @@ class Controller(object):
             'createImage': self._action_create_image,
         }
 
-
         for key in self.actions.keys():
             if key in body:
                 return self.actions[key](body, req, id)
@@ -665,7 +663,6 @@ class ControllerV11(Controller):
             msg = _("Invalid image_type '%s'") % image_type
             raise webob.exc.HTTPBadRequest(explanation=msg)
 
-
         # build location of newly-created image entity
         image_ref = os.path.join(req.application_url,
                                  'images',
@@ -683,10 +680,6 @@ class ControllerV11(Controller):
         return self.helper._get_server_admin_password_new_style(server)
 
 
-
-
-
-
 class HeadersSerializer(wsgi.ResponseHeadersSerializer):
 
     def delete(self, response, data):
-- 
cgit 


From e14754bbdbacaf6943c4061e3488f2580acd26ad Mon Sep 17 00:00:00 2001
From: William Wolf <throughnothing@gmail.com>
Date: Tue, 26 Jul 2011 17:51:46 -0400
Subject: initial working 300 multiple choice stuff

---
 nova/api/openstack/__init__.py       |   2 +-
 nova/api/openstack/versions.py       | 191 ++++++++++++++++++++---------------
 nova/api/openstack/views/versions.py |   8 ++
 3 files changed, 117 insertions(+), 84 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/__init__.py b/nova/api/openstack/__init__.py
index c10937bd6..0dfad0ef6 100644
--- a/nova/api/openstack/__init__.py
+++ b/nova/api/openstack/__init__.py
@@ -118,7 +118,7 @@ class APIRouter(base_wsgi.Router):
 
         mapper.connect("versions", "/", 
                     controller=versions.create_resource(version), 
-                    action="detail")
+                    action='show')
 
         mapper.resource("console", "consoles",
                     controller=consoles.create_resource(),
diff --git a/nova/api/openstack/versions.py b/nova/api/openstack/versions.py
index f389933b9..4b567957d 100644
--- a/nova/api/openstack/versions.py
+++ b/nova/api/openstack/versions.py
@@ -25,6 +25,80 @@ from nova.api.openstack import wsgi
 
 
 ATOM_XMLNS = "http://www.w3.org/2005/Atom"
+VERSIONS = { 
+    "v1.0": {
+        "version" : { 
+            "id": "v1.0",
+            "status": "DEPRECATED",
+            "updated": "2011-01-21T11:33:21Z", 
+            "links": [
+                {
+                    "rel": "self",
+                    "href": "http://servers.api.openstack.org/v1.0/"
+                },
+                {
+                    "rel": "describedby",
+                    "type": "application/pdf",
+                    "href": "http://docs.rackspacecloud.com/"
+                    "servers/api/v1.0/cs-devguide-20110125.pdf"
+                }, 
+                {
+                    "rel": "describedby",
+                    "type": "application/vnd.sun.wadl+xml",
+                    "href": "http://docs.rackspacecloud.com/"
+                    "servers/api/v1.0/application.wadl"
+                },
+            ],
+            "media-types": [
+                {
+                    "base" : "application/xml",
+                    "type" : "application/vnd.openstack.compute-v1.0+xml"
+                },
+                {
+                    "base" : "application/json",
+                    "type" : "application/vnd.openstack.compute-v1.0+json"
+                }
+            ],
+        },
+    },
+    "v1.1": {
+        "version" : { 
+            "id": "v1.1",
+            "status": "CURRENT",
+            "updated": "2011-01-21T11:33:21Z",
+            "links": [
+                {
+                    "rel": "self",
+                    "href": "http://servers.api.openstack.org/v1.1/"
+                },
+                {
+                    "rel": "describedby",
+                    "type": "application/pdf",
+                    "href": "http://docs.rackspacecloud.com/"
+                        "servers/api/v1.1/cs-devguide-20110125.pdf"
+                }, 
+                {
+                    "rel": "describedby",
+                    "type": "application/vnd.sun.wadl+xml",
+                    "href": "http://docs.rackspacecloud.com/"
+                        "servers/api/v1.1/application.wadl"
+                },
+            ],
+            "media-types": [
+                {
+                    "base" : "application/xml",
+                    "type" : "application/vnd.openstack.compute-v1.1+xml"
+                },
+                {
+                    "base" : "application/json",
+                    "type" : "application/vnd.openstack.compute-v1.1+json"
+                }
+            ],
+        },
+    },
+}
+
+
 
 
 class Versions(wsgi.Resource):
@@ -43,11 +117,15 @@ class Versions(wsgi.Resource):
             }
         }
 
+        headers_serializer = VersionsHeadersSerializer()
+
         body_serializers = {
             'application/atom+xml': VersionsAtomSerializer(metadata=metadata),
             'application/xml': VersionsXMLSerializer(metadata=metadata),
         }
-        serializer = wsgi.ResponseSerializer(body_serializers)
+        serializer = wsgi.ResponseSerializer(
+            body_serializers=body_serializers,
+            headers_serializer=headers_serializer)
 
         supported_content_types = ('application/json',
                                    'application/xml',
@@ -93,100 +171,41 @@ class Versions(wsgi.Resource):
             {
                 "id": "v1.1",
                 "status": "CURRENT",
-                #TODO(wwolf) get correct value for these
-                "updated": "2011-07-18T11:30:00Z",
+                "links": [
+                    {
+                        "rel": "self",
+                    }
+                ],
+                "media-types": VERSIONS['v1.1']['version']['media-types'],
             },
             {
                 "id": "v1.0",
                 "status": "DEPRECATED",
-                #TODO(wwolf) get correct value for these
-                "updated": "2010-10-09T11:30:00Z",
+                "links": [
+                    {
+                        "rel": "self",
+                    }
+                ],
+                "media-types": VERSIONS['v1.0']['version']['media-types'],
             },
         ]
 
         builder = nova.api.openstack.views.versions.get_view_builder(request)
-        versions = [builder.build(version) for version in version_objs]
-        return dict(versions=versions)
+        choices = [
+            builder.build_choices(version, request) 
+            for version in version_objs]
+
+        return dict(choices=choices)
 
 
 class VersionV10(object):
-    def detail(self, req):
-        #TODO
-        return {
-            "version" : { 
-                "id": "v1.0",
-                "status": "DEPRECATED",
-                "updated": "2011-01-21T11:33:21Z", 
-                "links": [
-                    {
-                        "rel": "self",
-                        "href": "http://servers.api.openstack.org/v1.0/"
-                    },
-                    {
-                        "rel": "describedby",
-                        "type": "application/pdf",
-                        "href": "http://docs.rackspacecloud.com/"
-                            "servers/api/v1.0/cs-devguide-20110125.pdf"
-                    }, 
-                    {
-                        "rel": "describedby",
-                        "type": "application/vnd.sun.wadl+xml",
-                        "href": "http://docs.rackspacecloud.com/"
-                            "servers/api/v1.0/application.wadl"
-                    },
-                ],
-                "media-types": [
-                    {
-                        "base" : "application/xml",
-                        "type" : "application/vnd.openstack.compute-v1.0+xml"
-                    },
-                    {
-                        "base" : "application/json",
-                        "type" : "application/vnd.openstack.compute-v1.0+json"
-                    }
-                ],
-            },
-        }
+    def show(self, req):
+        return VERSIONS['v1.0']
 
 
 class VersionV11(object):
-    def detail(self, req):
-        return {
-            "version" : { 
-                "id": "v1.1",
-                "status": "CURRENT",
-                "updated": "2011-01-21T11:33:21Z",
-                "links": [
-                    {
-                        "rel": "self",
-                        "href": "http://servers.api.openstack.org/v1.1/"
-                    },
-                    {
-                        "rel": "describedby",
-                        "type": "application/pdf",
-                        "href": "http://docs.rackspacecloud.com/"
-                            "servers/api/v1.1/cs-devguide-20110125.pdf"
-                    }, 
-                    {
-                        "rel": "describedby",
-                        "type": "application/vnd.sun.wadl+xml",
-                        "href": "http://docs.rackspacecloud.com/"
-                            "servers/api/v1.1/application.wadl"
-                    },
-                ],
-                "media-types": [
-                    {
-                        "base" : "application/xml",
-                        "type" : "application/vnd.openstack.compute-v1.1+xml"
-                    },
-                    {
-                        "base" : "application/json",
-                        "type" : "application/vnd.openstack.compute-v1.1+json"
-                    }
-                ],
-            },
-        }
-
+    def show(self, req):
+        return VERSIONS['v1.1']
 
 class VersionsRequestDeserializer(wsgi.RequestDeserializer):
     def get_action_args(self, request_environment):
@@ -259,7 +278,7 @@ class VersionsXMLSerializer(wsgi.XMLDictSerializer):
 
         return self.to_xml_string(node)
 
-    def detail(self,data):
+    def show(self,data):
         self._xml_doc = minidom.Document()
         node = self._create_version_node(data['version'], True)
 
@@ -404,7 +423,7 @@ class VersionsAtomSerializer(wsgi.XMLDictSerializer):
 
         return self.to_xml_string(node)
 
-    def detail(self, data):
+    def show(self, data):
         self._xml_doc = minidom.Document()
         node = self._xml_doc.createElementNS(self.xmlns, 'feed')
         self._create_detail_meta(node, data['version'])
@@ -412,6 +431,12 @@ class VersionsAtomSerializer(wsgi.XMLDictSerializer):
 
         return self.to_xml_string(node)
 
+
+class VersionsHeadersSerializer(wsgi.ResponseHeadersSerializer):
+    def multi(self, response, data):
+        response.status_int = 300
+
+
 def create_resource(version='1.0'):
     controller = {
         '1.0': VersionV10,
diff --git a/nova/api/openstack/views/versions.py b/nova/api/openstack/views/versions.py
index 9fa8f49dc..97e35c983 100644
--- a/nova/api/openstack/views/versions.py
+++ b/nova/api/openstack/views/versions.py
@@ -31,6 +31,11 @@ class ViewBuilder(object):
         """
         self.base_url = base_url
 
+    def build_choices(self, version_data, request):
+        version_data['links'][0]['href'] = self._build_versioned_link(request,
+                                             version_data['id'])
+        return version_data
+
     def build(self, version_data):
         """Generic method used to generate a version entity."""
         version = {
@@ -42,6 +47,9 @@ class ViewBuilder(object):
 
         return version
 
+    def _build_versioned_link(self, req, version):
+        return '%s://%s/%s%s' % (req.scheme, req.host, version, req.path)
+
     def _build_links(self, version_data):
         """Generate a container of links that refer to the provided version."""
         href = self.generate_href(version_data["id"])
-- 
cgit 


From 6dbd7583f4f1ca4be59e163c4c568423a91cd29e Mon Sep 17 00:00:00 2001
From: William Wolf <throughnothing@gmail.com>
Date: Tue, 26 Jul 2011 18:10:36 -0400
Subject: pep8 fixes

---
 nova/api/openstack/__init__.py |  4 ++--
 nova/api/openstack/versions.py | 31 ++++++++++++++-----------------
 2 files changed, 16 insertions(+), 19 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/__init__.py b/nova/api/openstack/__init__.py
index 0dfad0ef6..96a2f20e0 100644
--- a/nova/api/openstack/__init__.py
+++ b/nova/api/openstack/__init__.py
@@ -116,8 +116,8 @@ class APIRouter(base_wsgi.Router):
                                     'select': 'POST',
                                     'boot': 'POST'})
 
-        mapper.connect("versions", "/", 
-                    controller=versions.create_resource(version), 
+        mapper.connect("versions", "/",
+                    controller=versions.create_resource(version),
                     action='show')
 
         mapper.resource("console", "consoles",
diff --git a/nova/api/openstack/versions.py b/nova/api/openstack/versions.py
index 4b567957d..58c767d5c 100644
--- a/nova/api/openstack/versions.py
+++ b/nova/api/openstack/versions.py
@@ -25,12 +25,12 @@ from nova.api.openstack import wsgi
 
 
 ATOM_XMLNS = "http://www.w3.org/2005/Atom"
-VERSIONS = { 
+VERSIONS = {
     "v1.0": {
-        "version" : { 
+        "version" : {
             "id": "v1.0",
             "status": "DEPRECATED",
-            "updated": "2011-01-21T11:33:21Z", 
+            "updated": "2011-01-21T11:33:21Z",
             "links": [
                 {
                     "rel": "self",
@@ -41,7 +41,7 @@ VERSIONS = {
                     "type": "application/pdf",
                     "href": "http://docs.rackspacecloud.com/"
                     "servers/api/v1.0/cs-devguide-20110125.pdf"
-                }, 
+                },
                 {
                     "rel": "describedby",
                     "type": "application/vnd.sun.wadl+xml",
@@ -62,7 +62,7 @@ VERSIONS = {
         },
     },
     "v1.1": {
-        "version" : { 
+        "version" : {
             "id": "v1.1",
             "status": "CURRENT",
             "updated": "2011-01-21T11:33:21Z",
@@ -76,7 +76,7 @@ VERSIONS = {
                     "type": "application/pdf",
                     "href": "http://docs.rackspacecloud.com/"
                         "servers/api/v1.1/cs-devguide-20110125.pdf"
-                }, 
+                },
                 {
                     "rel": "describedby",
                     "type": "application/vnd.sun.wadl+xml",
@@ -99,8 +99,6 @@ VERSIONS = {
 }
 
 
-
-
 class Versions(wsgi.Resource):
     @classmethod
     def factory(cls, global_config, **local_config):
@@ -192,7 +190,7 @@ class Versions(wsgi.Resource):
 
         builder = nova.api.openstack.views.versions.get_view_builder(request)
         choices = [
-            builder.build_choices(version, request) 
+            builder.build_choices(version, request)
             for version in version_objs]
 
         return dict(choices=choices)
@@ -207,6 +205,7 @@ class VersionV11(object):
     def show(self, req):
         return VERSIONS['v1.1']
 
+
 class VersionsRequestDeserializer(wsgi.RequestDeserializer):
     def get_action_args(self, request_environment):
         """Parse dictionary created by routes library."""
@@ -220,8 +219,8 @@ class VersionsRequestDeserializer(wsgi.RequestDeserializer):
 
 
 class VersionsXMLSerializer(wsgi.XMLDictSerializer):
-    #TODO(wwolf): this is temporary until we get rid of toprettyxml 
-    # in the base class (XMLDictSerializer), which I plan to do in 
+    #TODO(wwolf): this is temporary until we get rid of toprettyxml
+    # in the base class (XMLDictSerializer), which I plan to do in
     # another branch
     def to_xml_string(self, node, has_atom=False):
         self._add_xmlns(node, has_atom)
@@ -244,7 +243,7 @@ class VersionsXMLSerializer(wsgi.XMLDictSerializer):
             base.appendChild(node)
 
         return base
-            
+
     def _create_version_node(self, version, create_ns=False):
         version_node = self._xml_doc.createElement('version')
         if create_ns:
@@ -278,7 +277,7 @@ class VersionsXMLSerializer(wsgi.XMLDictSerializer):
 
         return self.to_xml_string(node)
 
-    def show(self,data):
+    def show(self, data):
         self._xml_doc = minidom.Document()
         node = self._create_version_node(data['version'], True)
 
@@ -292,8 +291,8 @@ class VersionsXMLSerializer(wsgi.XMLDictSerializer):
 
 
 class VersionsAtomSerializer(wsgi.XMLDictSerializer):
-    #TODO(wwolf): this is temporary until we get rid of toprettyxml 
-    # in the base class (XMLDictSerializer), which I plan to do in 
+    #TODO(wwolf): this is temporary until we get rid of toprettyxml
+    # in the base class (XMLDictSerializer), which I plan to do in
     # another branch
     def to_xml_string(self, node, has_atom=False):
         self._add_xmlns(node, has_atom)
@@ -455,7 +454,5 @@ def create_resource(version='1.0'):
     deserializer = wsgi.RequestDeserializer(
         supported_content_types=supported_content_types)
 
-
-
     return wsgi.Resource(controller, serializer=serializer,
                          deserializer=deserializer)
-- 
cgit 


From c95ee1625a6a88afdb77d305077d1ee7eeaae854 Mon Sep 17 00:00:00 2001
From: Anthony Young <sleepsonthefloor@gmail.com>
Date: Tue, 26 Jul 2011 16:20:31 -0700
Subject: fix for lp816713: In instance creation, when nova-api is passed
 imageRefs generated by itself, strip the url down to an id so that default
 glance connection params are used

---
 nova/api/openstack/create_instance_helper.py | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'nova/api')

diff --git a/nova/api/openstack/create_instance_helper.py b/nova/api/openstack/create_instance_helper.py
index f8317565e..0e6c0a87c 100644
--- a/nova/api/openstack/create_instance_helper.py
+++ b/nova/api/openstack/create_instance_helper.py
@@ -87,6 +87,10 @@ class CreateInstanceHelper(object):
             key_data = key_pair['public_key']
 
         image_href = self.controller._image_ref_from_req_data(body)
+        # If the image href was generated by nova api, strip image_href
+        # down to an id and use the default glance connection params
+        if image_href.startswith(req.application_url):
+            image_href = image_href.split('/').pop()
         try:
             image_service, image_id = nova.image.get_image_service(image_href)
             kernel_id, ramdisk_id = self._get_kernel_ramdisk_from_image(
-- 
cgit 


From 6b33d0dfbfea7ee66a47947973133573070303cd Mon Sep 17 00:00:00 2001
From: John Tran <jtran@attinteractive.com>
Date: Tue, 26 Jul 2011 23:03:16 -0700
Subject: code was checking for key in sqlalchemy instance but if floating_ip
 is a non-sqlalchemy dict instance instead, value=None will cause NoneType
 exception.

---
 nova/api/openstack/contrib/floating_ips.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/contrib/floating_ips.py b/nova/api/openstack/contrib/floating_ips.py
index b4a211857..a02f34b8c 100644
--- a/nova/api/openstack/contrib/floating_ips.py
+++ b/nova/api/openstack/contrib/floating_ips.py
@@ -27,7 +27,7 @@ from nova.api.openstack import extensions
 def _translate_floating_ip_view(floating_ip):
     result = {'id': floating_ip['id'],
               'ip': floating_ip['address']}
-    if 'fixed_ip' in floating_ip:
+    if 'fixed_ip' in floating_ip and floating_ip['fixed_ip']:
         result['fixed_ip'] = floating_ip['fixed_ip']['address']
     else:
         result['fixed_ip'] = None
-- 
cgit 


From 74e3218d2b6045457019c4de518ca4a869e37807 Mon Sep 17 00:00:00 2001
From: William Wolf <throughnothing@gmail.com>
Date: Wed, 27 Jul 2011 09:11:41 -0400
Subject: multi choice XML responses with tests

---
 nova/api/openstack/versions.py | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/versions.py b/nova/api/openstack/versions.py
index 58c767d5c..9909d8d0d 100644
--- a/nova/api/openstack/versions.py
+++ b/nova/api/openstack/versions.py
@@ -25,6 +25,7 @@ from nova.api.openstack import wsgi
 
 
 ATOM_XMLNS = "http://www.w3.org/2005/Atom"
+OS_XMLNS_BASE = "http://docs.openstack.org/common/api/"
 VERSIONS = {
     "v1.0": {
         "version" : {
@@ -226,8 +227,10 @@ class VersionsXMLSerializer(wsgi.XMLDictSerializer):
         self._add_xmlns(node, has_atom)
         return node.toxml(encoding='UTF-8')
 
-    def _versions_to_xml(self, versions):
-        root = self._xml_doc.createElement('versions')
+    def _versions_to_xml(self, versions, name="versions", xmlns=None):
+        root = self._xml_doc.createElement(name)
+        root.setAttribute("xmlns", "%sv1.0" % OS_XMLNS_BASE)
+        root.setAttribute("xmlns:atom", ATOM_XMLNS)
 
         for version in versions:
             root.appendChild(self._create_version_node(version))
@@ -247,14 +250,15 @@ class VersionsXMLSerializer(wsgi.XMLDictSerializer):
     def _create_version_node(self, version, create_ns=False):
         version_node = self._xml_doc.createElement('version')
         if create_ns:
-            xmlns = "http://docs.openstack.org/common/api/%s" % version['id']
+            xmlns = "%s%s" % (OS_XMLNS_BASE, version['id'])
             xmlns_atom = "http://www.w3.org/2005/Atom"
             version_node.setAttribute('xmlns', xmlns)
             version_node.setAttribute('xmlns:atom', xmlns_atom)
 
         version_node.setAttribute('id', version['id'])
         version_node.setAttribute('status', version['status'])
-        version_node.setAttribute('updated', version['updated'])
+        if 'updated' in version:
+            version_node.setAttribute('updated', version['updated'])
 
         if 'media-types' in version:
             media_types = self._create_media_types(version['media-types'])
@@ -285,7 +289,8 @@ class VersionsXMLSerializer(wsgi.XMLDictSerializer):
 
     def multi(self, data):
         self._xml_doc = minidom.Document()
-        node = self._versions_to_xml(data['versions'])
+        node = self._versions_to_xml(data['choices'], 'choices',
+                         xmlns="%sv1.0" % OS_XMLNS_BASE)
 
         return self.to_xml_string(node)
 
-- 
cgit 


From 5ca4d3a88f1dd758c4ab6133e26cf2f8b05a8339 Mon Sep 17 00:00:00 2001
From: William Wolf <throughnothing@gmail.com>
Date: Wed, 27 Jul 2011 12:50:52 -0400
Subject: pep8

---
 nova/api/openstack/versions.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/versions.py b/nova/api/openstack/versions.py
index 9909d8d0d..4d40274b3 100644
--- a/nova/api/openstack/versions.py
+++ b/nova/api/openstack/versions.py
@@ -28,7 +28,7 @@ ATOM_XMLNS = "http://www.w3.org/2005/Atom"
 OS_XMLNS_BASE = "http://docs.openstack.org/common/api/"
 VERSIONS = {
     "v1.0": {
-        "version" : {
+        "version": {
             "id": "v1.0",
             "status": "DEPRECATED",
             "updated": "2011-01-21T11:33:21Z",
@@ -52,18 +52,18 @@ VERSIONS = {
             ],
             "media-types": [
                 {
-                    "base" : "application/xml",
-                    "type" : "application/vnd.openstack.compute-v1.0+xml"
+                    "base": "application/xml",
+                    "type": "application/vnd.openstack.compute-v1.0+xml"
                 },
                 {
-                    "base" : "application/json",
-                    "type" : "application/vnd.openstack.compute-v1.0+json"
+                    "base": "application/json",
+                    "type": "application/vnd.openstack.compute-v1.0+json"
                 }
             ],
         },
     },
     "v1.1": {
-        "version" : {
+        "version": {
             "id": "v1.1",
             "status": "CURRENT",
             "updated": "2011-01-21T11:33:21Z",
@@ -87,12 +87,12 @@ VERSIONS = {
             ],
             "media-types": [
                 {
-                    "base" : "application/xml",
-                    "type" : "application/vnd.openstack.compute-v1.1+xml"
+                    "base": "application/xml",
+                    "type": "application/vnd.openstack.compute-v1.1+xml"
                 },
                 {
-                    "base" : "application/json",
-                    "type" : "application/vnd.openstack.compute-v1.1+json"
+                    "base": "application/json",
+                    "type": "application/vnd.openstack.compute-v1.1+json"
                 }
             ],
         },
-- 
cgit 


From 094b9845500e28d315f70aa1fbc37b75c143d0c0 Mon Sep 17 00:00:00 2001
From: John Tran <jtran@attinteractive.com>
Date: Wed, 27 Jul 2011 10:34:58 -0700
Subject: improved the code per peer review

---
 nova/api/openstack/contrib/floating_ips.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/contrib/floating_ips.py b/nova/api/openstack/contrib/floating_ips.py
index a02f34b8c..3d8049324 100644
--- a/nova/api/openstack/contrib/floating_ips.py
+++ b/nova/api/openstack/contrib/floating_ips.py
@@ -27,9 +27,9 @@ from nova.api.openstack import extensions
 def _translate_floating_ip_view(floating_ip):
     result = {'id': floating_ip['id'],
               'ip': floating_ip['address']}
-    if 'fixed_ip' in floating_ip and floating_ip['fixed_ip']:
+    try:
         result['fixed_ip'] = floating_ip['fixed_ip']['address']
-    else:
+    except (TypeError, KeyError):
         result['fixed_ip'] = None
     if 'instance' in floating_ip:
         result['instance_id'] = floating_ip['instance']['id']
-- 
cgit 


From 9a84b87ae04dc5220f95992d9a6c4e210fbc374f Mon Sep 17 00:00:00 2001
From: William Wolf <throughnothing@gmail.com>
Date: Wed, 27 Jul 2011 13:59:53 -0400
Subject: fixed issue with factory for Versions Resource

---
 nova/api/openstack/versions.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/versions.py b/nova/api/openstack/versions.py
index 4d40274b3..c39e9dae7 100644
--- a/nova/api/openstack/versions.py
+++ b/nova/api/openstack/versions.py
@@ -104,9 +104,7 @@ class Versions(wsgi.Resource):
     @classmethod
     def factory(cls, global_config, **local_config):
         """Paste factory."""
-        def _factory(app):
-            return cls(app, **local_config)
-        return _factory
+        return cls()
 
     def __init__(self):
         metadata = {
-- 
cgit 


From f1830708f823a9de9c2f1cd24af5bed80302788f Mon Sep 17 00:00:00 2001
From: Anthony Young <sleepsonthefloor@gmail.com>
Date: Wed, 27 Jul 2011 11:08:44 -0700
Subject: Some work on testing.  Two cases related to lp816713 have some
 coverage already: using an id as an imageRef
 (test_create_instance_v1_1_local_href), and using a nova href as a url
 (test_create_instance_v1_1)

---
 nova/api/openstack/create_instance_helper.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/create_instance_helper.py b/nova/api/openstack/create_instance_helper.py
index 0e6c0a87c..234c16bcc 100644
--- a/nova/api/openstack/create_instance_helper.py
+++ b/nova/api/openstack/create_instance_helper.py
@@ -89,7 +89,9 @@ class CreateInstanceHelper(object):
         image_href = self.controller._image_ref_from_req_data(body)
         # If the image href was generated by nova api, strip image_href
         # down to an id and use the default glance connection params
-        if image_href.startswith(req.application_url):
+        
+        if isinstance(image_href, basestring) and\
+                      image_href.startswith(req.application_url):
             image_href = image_href.split('/').pop()
         try:
             image_service, image_id = nova.image.get_image_service(image_href)
-- 
cgit 


From 22beaf8802fdc44242f4a96e291c4fbb60af0e3a Mon Sep 17 00:00:00 2001
From: William Wolf <throughnothing@gmail.com>
Date: Wed, 27 Jul 2011 14:24:35 -0400
Subject: make atom+xml accept header be ignored on 300 responses in the
 VersionsRequestDeserializer

---
 nova/api/openstack/versions.py | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'nova/api')

diff --git a/nova/api/openstack/versions.py b/nova/api/openstack/versions.py
index c39e9dae7..e063ff272 100644
--- a/nova/api/openstack/versions.py
+++ b/nova/api/openstack/versions.py
@@ -206,6 +206,14 @@ class VersionV11(object):
 
 
 class VersionsRequestDeserializer(wsgi.RequestDeserializer):
+    def get_expected_content_type(self, request):
+        supported_content_types = list(self.supported_content_types)
+        if request.path != '/':
+            # Remove atom+xml accept type for 300 responses
+            del supported_content_types[2]
+
+        return request.best_match_content_type(supported_content_types)
+
     def get_action_args(self, request_environment):
         """Parse dictionary created by routes library."""
         args = {}
-- 
cgit 


From c20a4845afc47d124017de698657c1713dc11e7f Mon Sep 17 00:00:00 2001
From: William Wolf <throughnothing@gmail.com>
Date: Wed, 27 Jul 2011 14:35:47 -0400
Subject: fixed xmlns issue

---
 nova/api/openstack/versions.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/versions.py b/nova/api/openstack/versions.py
index e063ff272..b38c48939 100644
--- a/nova/api/openstack/versions.py
+++ b/nova/api/openstack/versions.py
@@ -25,7 +25,7 @@ from nova.api.openstack import wsgi
 
 
 ATOM_XMLNS = "http://www.w3.org/2005/Atom"
-OS_XMLNS_BASE = "http://docs.openstack.org/common/api/"
+OS_XMLNS_BASE = "http://docs.openstack.org/common/api/v1.0"
 VERSIONS = {
     "v1.0": {
         "version": {
@@ -235,7 +235,7 @@ class VersionsXMLSerializer(wsgi.XMLDictSerializer):
 
     def _versions_to_xml(self, versions, name="versions", xmlns=None):
         root = self._xml_doc.createElement(name)
-        root.setAttribute("xmlns", "%sv1.0" % OS_XMLNS_BASE)
+        root.setAttribute("xmlns", OS_XMLNS_BASE)
         root.setAttribute("xmlns:atom", ATOM_XMLNS)
 
         for version in versions:
@@ -256,7 +256,7 @@ class VersionsXMLSerializer(wsgi.XMLDictSerializer):
     def _create_version_node(self, version, create_ns=False):
         version_node = self._xml_doc.createElement('version')
         if create_ns:
-            xmlns = "%s%s" % (OS_XMLNS_BASE, version['id'])
+            xmlns = OS_XMLNS_BASE
             xmlns_atom = "http://www.w3.org/2005/Atom"
             version_node.setAttribute('xmlns', xmlns)
             version_node.setAttribute('xmlns:atom', xmlns_atom)
@@ -296,7 +296,7 @@ class VersionsXMLSerializer(wsgi.XMLDictSerializer):
     def multi(self, data):
         self._xml_doc = minidom.Document()
         node = self._versions_to_xml(data['choices'], 'choices',
-                         xmlns="%sv1.0" % OS_XMLNS_BASE)
+                         xmlns=OS_XMLNS_BASE)
 
         return self.to_xml_string(node)
 
-- 
cgit 


From 2ac60cd773bb25e19b50c082e0860b1c495d1527 Mon Sep 17 00:00:00 2001
From: William Wolf <throughnothing@gmail.com>
Date: Wed, 27 Jul 2011 15:29:15 -0400
Subject: update everything to use global VERSIONS

---
 nova/api/openstack/versions.py | 49 +++++++++++++++---------------------------
 1 file changed, 17 insertions(+), 32 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/versions.py b/nova/api/openstack/versions.py
index b38c48939..32ee64339 100644
--- a/nova/api/openstack/versions.py
+++ b/nova/api/openstack/versions.py
@@ -143,20 +143,14 @@ class Versions(wsgi.Resource):
             return self._versions_multi_choice(request)
 
     def _versions_list(self, request):
-        version_objs = [
-            {
-                "id": "v1.1",
-                "status": "CURRENT",
-                #TODO(wwolf) get correct value for these
-                "updated": "2011-07-18T11:30:00Z",
-            },
-            {
-                "id": "v1.0",
-                "status": "DEPRECATED",
-                #TODO(wwolf) get correct value for these
-                "updated": "2010-10-09T11:30:00Z",
-            },
-        ]
+        version_objs = []
+        for version in VERSIONS:
+            version = VERSIONS[version]['version']
+            version_objs.append({
+                "id": version['id'],
+                "status": version['status'],
+                "updated": version['updated'],
+            })
 
         builder = nova.api.openstack.views.versions.get_view_builder(request)
         versions = [builder.build(version) for version in version_objs]
@@ -164,28 +158,19 @@ class Versions(wsgi.Resource):
 
     def _versions_multi_choice(self, request):
         #TODO
-        version_objs = [
-            {
-                "id": "v1.1",
-                "status": "CURRENT",
+        version_objs = []
+        for version in VERSIONS:
+            version = VERSIONS[version]['version']
+            version_objs.append({
+                "id": version['id'],
+                "status": version['status'],
                 "links": [
                     {
-                        "rel": "self",
+                        "rel": "self"
                     }
                 ],
-                "media-types": VERSIONS['v1.1']['version']['media-types'],
-            },
-            {
-                "id": "v1.0",
-                "status": "DEPRECATED",
-                "links": [
-                    {
-                        "rel": "self",
-                    }
-                ],
-                "media-types": VERSIONS['v1.0']['version']['media-types'],
-            },
-        ]
+                "media-types": version['media-types']
+            })
 
         builder = nova.api.openstack.views.versions.get_view_builder(request)
         choices = [
-- 
cgit 


From f2d8e91b83ff3a3bd1e2f3c53c25a418a578cd27 Mon Sep 17 00:00:00 2001
From: William Wolf <throughnothing@gmail.com>
Date: Wed, 27 Jul 2011 16:34:02 -0400
Subject: moved rest of build logic into builder

---
 nova/api/openstack/versions.py       | 42 +++-----------------------------
 nova/api/openstack/views/versions.py | 46 ++++++++++++++++++++++++------------
 2 files changed, 34 insertions(+), 54 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/versions.py b/nova/api/openstack/versions.py
index 32ee64339..fd0ee46b7 100644
--- a/nova/api/openstack/versions.py
+++ b/nova/api/openstack/versions.py
@@ -135,49 +135,13 @@ class Versions(wsgi.Resource):
 
     def dispatch(self, request, *args):
         """Respond to a request for all OpenStack API versions."""
+        builder = nova.api.openstack.views.versions.get_view_builder(request)
         if request.path == '/':
             # List Versions
-            return self._versions_list(request)
+            return builder.build(VERSIONS)
         else:
             # Versions Multiple Choice
-            return self._versions_multi_choice(request)
-
-    def _versions_list(self, request):
-        version_objs = []
-        for version in VERSIONS:
-            version = VERSIONS[version]['version']
-            version_objs.append({
-                "id": version['id'],
-                "status": version['status'],
-                "updated": version['updated'],
-            })
-
-        builder = nova.api.openstack.views.versions.get_view_builder(request)
-        versions = [builder.build(version) for version in version_objs]
-        return dict(versions=versions)
-
-    def _versions_multi_choice(self, request):
-        #TODO
-        version_objs = []
-        for version in VERSIONS:
-            version = VERSIONS[version]['version']
-            version_objs.append({
-                "id": version['id'],
-                "status": version['status'],
-                "links": [
-                    {
-                        "rel": "self"
-                    }
-                ],
-                "media-types": version['media-types']
-            })
-
-        builder = nova.api.openstack.views.versions.get_view_builder(request)
-        choices = [
-            builder.build_choices(version, request)
-            for version in version_objs]
-
-        return dict(choices=choices)
+            return builder.build_choices(VERSIONS, request)
 
 
 class VersionV10(object):
diff --git a/nova/api/openstack/views/versions.py b/nova/api/openstack/views/versions.py
index 97e35c983..87ec251e6 100644
--- a/nova/api/openstack/views/versions.py
+++ b/nova/api/openstack/views/versions.py
@@ -31,21 +31,37 @@ class ViewBuilder(object):
         """
         self.base_url = base_url
 
-    def build_choices(self, version_data, request):
-        version_data['links'][0]['href'] = self._build_versioned_link(request,
-                                             version_data['id'])
-        return version_data
-
-    def build(self, version_data):
-        """Generic method used to generate a version entity."""
-        version = {
-            "id": version_data["id"],
-            "status": version_data["status"],
-            "updated": version_data["updated"],
-            "links": self._build_links(version_data),
-        }
-
-        return version
+    def build_choices(self, VERSIONS, request):
+        version_objs = []
+        for version in VERSIONS:
+            version = VERSIONS[version]['version']
+            version_objs.append({
+                "id": version['id'],
+                "status": version['status'],
+                "links": [
+                    {
+                        "rel": "self",
+                        "href": self._build_versioned_link(request,
+                                                           version['id'])
+                    }
+                ],
+                "media-types": version['media-types']
+            })
+
+        return dict(choices=version_objs)
+
+    def build(self, VERSIONS):
+        version_objs = []
+        for version in VERSIONS:
+            version = VERSIONS[version]['version']
+            version_objs.append({
+                "id": version['id'],
+                "status": version['status'],
+                "updated": version['updated'],
+                "links": self._build_links(version),
+            })
+
+        return dict(versions=version_objs)
 
     def _build_versioned_link(self, req, version):
         return '%s://%s/%s%s' % (req.scheme, req.host, version, req.path)
-- 
cgit 


From 9c220b1c4547ad2cdd6110fa029b6f9478bae99f Mon Sep 17 00:00:00 2001
From: William Wolf <throughnothing@gmail.com>
Date: Wed, 27 Jul 2011 16:54:09 -0400
Subject: added test for accept header of atom+xml on 300 responses to make
 sure it defaults back to json, and reworked some of the logic to make how
 this happens clearer

---
 nova/api/openstack/versions.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/versions.py b/nova/api/openstack/versions.py
index fd0ee46b7..02b0e1df8 100644
--- a/nova/api/openstack/versions.py
+++ b/nova/api/openstack/versions.py
@@ -159,7 +159,8 @@ class VersionsRequestDeserializer(wsgi.RequestDeserializer):
         supported_content_types = list(self.supported_content_types)
         if request.path != '/':
             # Remove atom+xml accept type for 300 responses
-            del supported_content_types[2]
+            if 'application/atom+xml' in supported_content_types:
+                supported_content_types.remove('application/atom+xml')
 
         return request.best_match_content_type(supported_content_types)
 
-- 
cgit 


From 77d06c7c82bfafd956f1108b2adbcb378628511f Mon Sep 17 00:00:00 2001
From: William Wolf <throughnothing@gmail.com>
Date: Wed, 27 Jul 2011 17:09:17 -0400
Subject: utilize _create_link_nodes base class function

---
 nova/api/openstack/versions.py | 11 +++--------
 nova/api/openstack/wsgi.py     |  2 ++
 2 files changed, 5 insertions(+), 8 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/versions.py b/nova/api/openstack/versions.py
index 02b0e1df8..928cf467a 100644
--- a/nova/api/openstack/versions.py
+++ b/nova/api/openstack/versions.py
@@ -220,14 +220,9 @@ class VersionsXMLSerializer(wsgi.XMLDictSerializer):
             media_types = self._create_media_types(version['media-types'])
             version_node.appendChild(media_types)
 
-        for link in version['links']:
-            link_node = self._xml_doc.createElement('atom:link')
-            link_node.setAttribute('rel', link['rel'])
-            link_node.setAttribute('href', link['href'])
-            if 'type' in link:
-                link_node.setAttribute('type', link['type'])
-
-            version_node.appendChild(link_node)
+        link_nodes = self._create_link_nodes(self._xml_doc, version['links'])
+        for link in link_nodes:
+            version_node.appendChild(link)
 
         return version_node
 
diff --git a/nova/api/openstack/wsgi.py b/nova/api/openstack/wsgi.py
index a28443d12..ca502021d 100644
--- a/nova/api/openstack/wsgi.py
+++ b/nova/api/openstack/wsgi.py
@@ -387,6 +387,8 @@ class XMLDictSerializer(DictSerializer):
             link_node = xml_doc.createElement('atom:link')
             link_node.setAttribute('rel', link['rel'])
             link_node.setAttribute('href', link['href'])
+            if 'type' in link:
+                link_node.setAttribute('type', link['type'])
             link_nodes.append(link_node)
         return link_nodes
 
-- 
cgit 


From 03aac3ffd546ab1528b73ee36c8632f30ed8af2f Mon Sep 17 00:00:00 2001
From: William Wolf <throughnothing@gmail.com>
Date: Wed, 27 Jul 2011 18:07:01 -0400
Subject: use ATOM_XMLNS everywhere

---
 nova/api/openstack/versions.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/versions.py b/nova/api/openstack/versions.py
index 928cf467a..95681b788 100644
--- a/nova/api/openstack/versions.py
+++ b/nova/api/openstack/versions.py
@@ -207,7 +207,7 @@ class VersionsXMLSerializer(wsgi.XMLDictSerializer):
         version_node = self._xml_doc.createElement('version')
         if create_ns:
             xmlns = OS_XMLNS_BASE
-            xmlns_atom = "http://www.w3.org/2005/Atom"
+            xmlns_atom = ATOM_XMLNS
             version_node.setAttribute('xmlns', xmlns)
             version_node.setAttribute('xmlns:atom', xmlns_atom)
 
-- 
cgit 


From 71414e65333692956023647b55be06de6a73f11f Mon Sep 17 00:00:00 2001
From: William Wolf <throughnothing@gmail.com>
Date: Thu, 28 Jul 2011 14:59:28 -0400
Subject: use wsgi XMLNS/ATOM vars

---
 nova/api/openstack/versions.py | 14 ++++++--------
 nova/api/openstack/wsgi.py     |  1 +
 2 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/versions.py b/nova/api/openstack/versions.py
index 95681b788..292043b94 100644
--- a/nova/api/openstack/versions.py
+++ b/nova/api/openstack/versions.py
@@ -24,8 +24,6 @@ import nova.api.openstack.views.versions
 from nova.api.openstack import wsgi
 
 
-ATOM_XMLNS = "http://www.w3.org/2005/Atom"
-OS_XMLNS_BASE = "http://docs.openstack.org/common/api/v1.0"
 VERSIONS = {
     "v1.0": {
         "version": {
@@ -185,8 +183,8 @@ class VersionsXMLSerializer(wsgi.XMLDictSerializer):
 
     def _versions_to_xml(self, versions, name="versions", xmlns=None):
         root = self._xml_doc.createElement(name)
-        root.setAttribute("xmlns", OS_XMLNS_BASE)
-        root.setAttribute("xmlns:atom", ATOM_XMLNS)
+        root.setAttribute("xmlns", wsgi.XMLNS_V11)
+        root.setAttribute("xmlns:atom", wsgi.XMLNS_ATOM)
 
         for version in versions:
             root.appendChild(self._create_version_node(version))
@@ -206,8 +204,8 @@ class VersionsXMLSerializer(wsgi.XMLDictSerializer):
     def _create_version_node(self, version, create_ns=False):
         version_node = self._xml_doc.createElement('version')
         if create_ns:
-            xmlns = OS_XMLNS_BASE
-            xmlns_atom = ATOM_XMLNS
+            xmlns = wsgi.XMLNS_V11
+            xmlns_atom = wsgi.XMLNS_ATOM
             version_node.setAttribute('xmlns', xmlns)
             version_node.setAttribute('xmlns:atom', xmlns_atom)
 
@@ -241,7 +239,7 @@ class VersionsXMLSerializer(wsgi.XMLDictSerializer):
     def multi(self, data):
         self._xml_doc = minidom.Document()
         node = self._versions_to_xml(data['choices'], 'choices',
-                         xmlns=OS_XMLNS_BASE)
+                         xmlns=wsgi.XMLNS_V11)
 
         return self.to_xml_string(node)
 
@@ -257,7 +255,7 @@ class VersionsAtomSerializer(wsgi.XMLDictSerializer):
     def __init__(self, metadata=None, xmlns=None):
         self.metadata = metadata or {}
         if not xmlns:
-            self.xmlns = ATOM_XMLNS
+            self.xmlns = wsgi.XMLNS_ATOM
         else:
             self.xmlns = xmlns
 
diff --git a/nova/api/openstack/wsgi.py b/nova/api/openstack/wsgi.py
index ca502021d..c6ece7d45 100644
--- a/nova/api/openstack/wsgi.py
+++ b/nova/api/openstack/wsgi.py
@@ -13,6 +13,7 @@ from nova import wsgi
 
 XMLNS_V10 = 'http://docs.rackspacecloud.com/servers/api/v1.0'
 XMLNS_V11 = 'http://docs.openstack.org/compute/api/v1.1'
+
 XMLNS_ATOM = 'http://www.w3.org/2005/Atom'
 
 LOG = logging.getLogger('nova.api.openstack.wsgi')
-- 
cgit 


From 1c2ac1e7646d1432f57104c6ee3d1fa434387741 Mon Sep 17 00:00:00 2001
From: William Wolf <throughnothing@gmail.com>
Date: Thu, 28 Jul 2011 15:48:30 -0400
Subject: refactoring and make self links correct (not hard coded)

---
 nova/api/openstack/versions.py       | 136 +++++++++++++++++------------------
 nova/api/openstack/views/versions.py |  33 +++++----
 2 files changed, 88 insertions(+), 81 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/versions.py b/nova/api/openstack/versions.py
index 292043b94..b546462d4 100644
--- a/nova/api/openstack/versions.py
+++ b/nova/api/openstack/versions.py
@@ -26,74 +26,70 @@ from nova.api.openstack import wsgi
 
 VERSIONS = {
     "v1.0": {
-        "version": {
-            "id": "v1.0",
-            "status": "DEPRECATED",
-            "updated": "2011-01-21T11:33:21Z",
-            "links": [
-                {
-                    "rel": "self",
-                    "href": "http://servers.api.openstack.org/v1.0/"
-                },
-                {
-                    "rel": "describedby",
-                    "type": "application/pdf",
-                    "href": "http://docs.rackspacecloud.com/"
-                    "servers/api/v1.0/cs-devguide-20110125.pdf"
-                },
-                {
-                    "rel": "describedby",
-                    "type": "application/vnd.sun.wadl+xml",
-                    "href": "http://docs.rackspacecloud.com/"
-                    "servers/api/v1.0/application.wadl"
-                },
-            ],
-            "media-types": [
-                {
-                    "base": "application/xml",
-                    "type": "application/vnd.openstack.compute-v1.0+xml"
-                },
-                {
-                    "base": "application/json",
-                    "type": "application/vnd.openstack.compute-v1.0+json"
-                }
-            ],
-        },
+        "id": "v1.0",
+        "status": "DEPRECATED",
+        "updated": "2011-01-21T11:33:21Z",
+        "links": [
+            {
+                "rel": "self",
+                "href": ""
+            },
+            {
+                "rel": "describedby",
+                "type": "application/pdf",
+                "href": "http://docs.rackspacecloud.com/"
+                "servers/api/v1.0/cs-devguide-20110125.pdf"
+            },
+            {
+                "rel": "describedby",
+                "type": "application/vnd.sun.wadl+xml",
+                "href": "http://docs.rackspacecloud.com/"
+                "servers/api/v1.0/application.wadl"
+            },
+        ],
+        "media-types": [
+            {
+                "base": "application/xml",
+                "type": "application/vnd.openstack.compute-v1.0+xml"
+            },
+            {
+                "base": "application/json",
+                "type": "application/vnd.openstack.compute-v1.0+json"
+            }
+        ],
     },
     "v1.1": {
-        "version": {
-            "id": "v1.1",
-            "status": "CURRENT",
-            "updated": "2011-01-21T11:33:21Z",
-            "links": [
-                {
-                    "rel": "self",
-                    "href": "http://servers.api.openstack.org/v1.1/"
-                },
-                {
-                    "rel": "describedby",
-                    "type": "application/pdf",
-                    "href": "http://docs.rackspacecloud.com/"
-                        "servers/api/v1.1/cs-devguide-20110125.pdf"
-                },
-                {
-                    "rel": "describedby",
-                    "type": "application/vnd.sun.wadl+xml",
-                    "href": "http://docs.rackspacecloud.com/"
-                        "servers/api/v1.1/application.wadl"
-                },
-            ],
-            "media-types": [
-                {
-                    "base": "application/xml",
-                    "type": "application/vnd.openstack.compute-v1.1+xml"
-                },
-                {
-                    "base": "application/json",
-                    "type": "application/vnd.openstack.compute-v1.1+json"
-                }
-            ],
-        },
+        "id": "v1.1",
+        "status": "CURRENT",
+        "updated": "2011-01-21T11:33:21Z",
+        "links": [
+            {
+                "rel": "self",
+                "href": ""
+            },
+            {
+                "rel": "describedby",
+                "type": "application/pdf",
+                "href": "http://docs.rackspacecloud.com/"
+                    "servers/api/v1.1/cs-devguide-20110125.pdf"
+            },
+            {
+                "rel": "describedby",
+                "type": "application/vnd.sun.wadl+xml",
+                "href": "http://docs.rackspacecloud.com/"
+                    "servers/api/v1.1/application.wadl"
+            },
+        ],
+        "media-types": [
+            {
+                "base": "application/xml",
+                "type": "application/vnd.openstack.compute-v1.1+xml"
+            },
+            {
+                "base": "application/json",
+                "type": "application/vnd.openstack.compute-v1.1+json"
+            }
+        ],
     },
 }
 
@@ -136,7 +132,7 @@ class Versions(wsgi.Resource):
         builder = nova.api.openstack.views.versions.get_view_builder(request)
         if request.path == '/':
             # List Versions
-            return builder.build(VERSIONS)
+            return builder.build_versions(VERSIONS)
         else:
             # Versions Multiple Choice
             return builder.build_choices(VERSIONS, request)
@@ -144,12 +140,14 @@ class Versions(wsgi.Resource):
 
 class VersionV10(object):
     def show(self, req):
-        return VERSIONS['v1.0']
+        builder = nova.api.openstack.views.versions.get_view_builder(req)
+        return builder.build_version(VERSIONS['v1.0'])
 
 
 class VersionV11(object):
     def show(self, req):
-        return VERSIONS['v1.1']
+        builder = nova.api.openstack.views.versions.get_view_builder(req)
+        return builder.build_version(VERSIONS['v1.1'])
 
 
 class VersionsRequestDeserializer(wsgi.RequestDeserializer):
diff --git a/nova/api/openstack/views/versions.py b/nova/api/openstack/views/versions.py
index 87ec251e6..7673ffe9e 100644
--- a/nova/api/openstack/views/versions.py
+++ b/nova/api/openstack/views/versions.py
@@ -31,18 +31,17 @@ class ViewBuilder(object):
         """
         self.base_url = base_url
 
-    def build_choices(self, VERSIONS, request):
+    def build_choices(self, VERSIONS, req):
         version_objs = []
         for version in VERSIONS:
-            version = VERSIONS[version]['version']
+            version = VERSIONS[version]
             version_objs.append({
                 "id": version['id'],
                 "status": version['status'],
                 "links": [
                     {
                         "rel": "self",
-                        "href": self._build_versioned_link(request,
-                                                           version['id'])
+                        "href": self.generate_href(version['id'], req.path)
                     }
                 ],
                 "media-types": version['media-types']
@@ -50,10 +49,10 @@ class ViewBuilder(object):
 
         return dict(choices=version_objs)
 
-    def build(self, VERSIONS):
+    def build_versions(self, versions):
         version_objs = []
-        for version in VERSIONS:
-            version = VERSIONS[version]['version']
+        for version in versions:
+            version = versions[version]
             version_objs.append({
                 "id": version['id'],
                 "status": version['status'],
@@ -63,8 +62,13 @@ class ViewBuilder(object):
 
         return dict(versions=version_objs)
 
-    def _build_versioned_link(self, req, version):
-        return '%s://%s/%s%s' % (req.scheme, req.host, version, req.path)
+    def build_version(self, version):
+        
+        for link in version['links']:
+            if link['rel'] == 'self':
+                link['href'] = self.base_url.rstrip('/') + '/'
+
+        return dict(version=version)
 
     def _build_links(self, version_data):
         """Generate a container of links that refer to the provided version."""
@@ -73,12 +77,17 @@ class ViewBuilder(object):
         links = [
             {
                 "rel": "self",
-                "href": href,
+                "href": href
             },
         ]
 
         return links
 
-    def generate_href(self, version_number):
+    def generate_href(self, version_number, path=None):
         """Create an url that refers to a specific version_number."""
-        return os.path.join(self.base_url, version_number) + '/'
+        version_number = version_number.strip('/')
+        if path:
+            path = path.strip('/')
+            return os.path.join(self.base_url, version_number, path)
+        else:
+            return os.path.join(self.base_url, version_number) + '/'
-- 
cgit 


From 8141ef4139fbf8512150ce970cea4dc4bee22e1a Mon Sep 17 00:00:00 2001
From: Brian Waldon <brian.waldon@rackspace.com>
Date: Thu, 28 Jul 2011 16:21:12 -0400
Subject: moving server backup to /servers/<id>/action instead of POST /images

---
 nova/api/openstack/create_instance_helper.py |  12 ++-
 nova/api/openstack/images.py                 | 112 +++-------------------
 nova/api/openstack/servers.py                | 133 +++++++++++++++++----------
 3 files changed, 111 insertions(+), 146 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/create_instance_helper.py b/nova/api/openstack/create_instance_helper.py
index 73ff191e8..e165899e7 100644
--- a/nova/api/openstack/create_instance_helper.py
+++ b/nova/api/openstack/create_instance_helper.py
@@ -300,6 +300,7 @@ class ServerXMLDeserializer(wsgi.MetadataXMLDeserializer):
 
         action_deserializer = {
             'createImage': self._action_create_image,
+            'createBackup': self._action_create_image,
         }.get(action_name, self.default)
 
         action_data = action_deserializer(action_node)
@@ -308,7 +309,16 @@ class ServerXMLDeserializer(wsgi.MetadataXMLDeserializer):
 
     def _action_create_image(self, node):
         data = {}
-        attributes = ['name', 'image_type', 'backup_type', 'rotation']
+        value = node.getAttribute('name')
+        if value:
+            data['name'] = value
+        metadata_node = self.find_first_child_named(node, 'metadata')
+        data['metadata'] = self.extract_metadata(metadata_node)
+        return data
+
+    def _action_create_image(self, node):
+        data = {}
+        attributes = ['name', 'backup_type', 'rotation']
         for attribute in attributes:
             value = node.getAttribute(attribute)
             if value:
diff --git a/nova/api/openstack/images.py b/nova/api/openstack/images.py
index 517a51662..b3e16c997 100644
--- a/nova/api/openstack/images.py
+++ b/nova/api/openstack/images.py
@@ -102,72 +102,27 @@ class Controller(object):
         """Indicates that you must use a Controller subclass."""
         raise NotImplementedError()
 
-    def _server_id_from_req(self, req, data):
-        raise NotImplementedError()
-
-    def _get_extra_properties(self, req, data):
-        return {}
-
 
 class ControllerV10(Controller):
     """Version 1.0 specific controller logic."""
 
     def create(self, req, body):
-        """Snapshot or backup a server instance and save the image.
-
-        Images now have an `image_type` associated with them, which can be
-        'snapshot' or the backup type, like 'daily' or 'weekly'.
-
-        If the image_type is backup-like, then the rotation factor can be
-        included and that will cause the oldest backups that exceed the
-        rotation factor to be deleted.
-
-        :param req: `wsgi.Request` object
-        """
-        def get_param(param):
-            try:
-                return body["image"][param]
-            except KeyError:
-                raise webob.exc.HTTPBadRequest(explanation="Missing required "
-                        "param: %s" % param)
-
-        context = req.environ['nova.context']
-        content_type = req.get_content_type()
-
-        if not body:
-            raise webob.exc.HTTPBadRequest()
-
-        image_type = body["image"].get("image_type", "snapshot")
+        """Snapshot a server instance and save the image."""
+        try:
+            image = body["image"]
+        except (KeyError, TypeError):
+            msg = _("Invalid image entity")
+            raise webob.exc.HTTPBadRequest(explanation=msg)
 
         try:
-            server_id = self._server_id_from_req(req, body)
-        except KeyError:
-            raise webob.exc.HTTPBadRequest()
-
-        image_name = get_param("name")
-        props = self._get_extra_properties(req, body)
-
-        if image_type == "snapshot":
-            image = self._compute_service.snapshot(
-                        context, server_id, image_name,
-                        extra_properties=props)
-        elif image_type == "backup":
-            # NOTE(sirp): Unlike snapshot, backup is not a customer facing
-            # API call; rather, it's used by the internal backup scheduler
-            if not FLAGS.allow_admin_api:
-                raise webob.exc.HTTPBadRequest(
-                        explanation="Admin API Required")
-
-            backup_type = get_param("backup_type")
-            rotation = int(get_param("rotation"))
-
-            image = self._compute_service.backup(
-                        context, server_id, image_name,
-                        backup_type, rotation, extra_properties=props)
-        else:
-            LOG.error(_("Invalid image_type '%s' passed") % image_type)
-            raise webob.exc.HTTPBadRequest(explanation="Invalue image_type: "
-                   "%s" % image_type)
+            image_name = image["name"]
+            server_id = image["serverId"]
+        except KeyError as missing_key:
+            msg = _("Image entity requires %s") % missing_key
+            raise webob.exc.HTTPBadRequest(explanation=msg)
+
+        context = req.environ["nova.context"]
+        image = self._compute_service.snapshot(context, server_id, image_name)
 
         return dict(image=self.get_builder(req).build(image, detail=True))
 
@@ -202,13 +157,6 @@ class ControllerV10(Controller):
         builder = self.get_builder(req).build
         return dict(images=[builder(image, detail=True) for image in images])
 
-    def _server_id_from_req(self, req, data):
-        try:
-            return data['image']['serverId']
-        except KeyError:
-            msg = _("Expected serverId attribute on server entity.")
-            raise webob.exc.HTTPBadRequest(explanation=msg)
-
 
 class ControllerV11(Controller):
     """Version 1.1 specific controller logic."""
@@ -246,38 +194,6 @@ class ControllerV11(Controller):
         builder = self.get_builder(req).build
         return dict(images=[builder(image, detail=True) for image in images])
 
-    def _server_id_from_req(self, req, data):
-        try:
-            server_ref = data['image']['serverRef']
-        except KeyError:
-            msg = _("Expected serverRef attribute on server entity.")
-            raise webob.exc.HTTPBadRequest(explanation=msg)
-
-        if not server_ref.startswith('http'):
-            return server_ref
-
-        passed = urlparse.urlparse(server_ref)
-        expected = urlparse.urlparse(req.application_url)
-        version = expected.path.split('/')[1]
-        expected_prefix = "/%s/servers/" % version
-        _empty, _sep, server_id = passed.path.partition(expected_prefix)
-        scheme_ok = passed.scheme == expected.scheme
-        host_ok = passed.hostname == expected.hostname
-        port_ok = (passed.port == expected.port or
-                   passed.port == FLAGS.osapi_port)
-        if not (scheme_ok and port_ok and host_ok and server_id):
-            msg = _("serverRef must match request url")
-            raise webob.exc.HTTPBadRequest(explanation=msg)
-
-        return server_id
-
-    def _get_extra_properties(self, req, data):
-        server_ref = data['image']['serverRef']
-        if not server_ref.startswith('http'):
-            server_ref = os.path.join(req.application_url, 'servers',
-                                      server_ref)
-        return {'instance_ref': server_ref}
-
     def create(self, *args, **kwargs):
         raise webob.exc.HTTPMethodNotAllowed()
 
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index 0cc81009b..fafde1c15 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -166,11 +166,79 @@ class Controller(object):
             'createImage': self._action_create_image,
         }
 
+        if FLAGS.allow_admin_api:
+            admin_actions = {
+                'createBackup': self._action_create_backup,
+            }
+            self.actions.update(admin_actions)
+
         for key in self.actions.keys():
             if key in body:
                 return self.actions[key](body, req, id)
+
         raise exc.HTTPNotImplemented()
 
+    def _action_create_backup(self, input_dict, req, instance_id):
+        """Backup a server instance.
+
+        Images now have an `image_type` associated with them, which can be
+        'snapshot' or the backup type, like 'daily' or 'weekly'.
+
+        If the image_type is backup-like, then the rotation factor can be
+        included and that will cause the oldest backups that exceed the
+        rotation factor to be deleted.
+
+        """
+        entity = input_dict["createBackup"]
+
+        try:
+            image_name = entity["name"]
+            backup_type = entity["backup_type"]
+            rotation = entity["rotation"]
+
+        except KeyError as missing_key:
+            msg = _("createBackup entity requires %s attribute") % missing_key
+            raise webob.exc.HTTPBadRequest(explanation=msg)
+
+        except TypeError:
+            msg = _("Malformed createBackup entity")
+            raise webob.exc.HTTPBadRequest(explanation=msg)
+
+        try:
+            rotation = int(rotation)
+        except ValueError:
+            msg = _("createBackup attribute 'rotation' must be an integer")
+            raise webob.exc.HTTPBadRequest(explanation=msg)
+
+        # preserve link to server in image properties
+        server_ref = os.path.join(req.application_url,
+                                  'servers',
+                                  str(instance_id))
+        props = {'instance_ref': server_ref}
+
+        metadata = entity.get('metadata', {})
+        try:
+            props.update(metadata)
+        except ValueError:
+            msg = _("Invalid metadata")
+            raise webob.exc.HTTPBadRequest(explanation=msg)
+
+        context = req.environ["nova.context"]
+        image = self.compute_api.backup(context,
+                                        instance_id,
+                                        image_name,
+                                        backup_type,
+                                        rotation,
+                                        extra_properties=props)
+
+        # build location of newly-created image entity
+        image_id = str(image['id'])
+        image_ref = os.path.join(req.application_url, 'images', image_id)
+
+        resp = webob.Response(status_int=202)
+        resp.headers['Location'] = image_ref
+        return resp
+
     def _action_create_image(self, input_dict, req, id):
         return exc.HTTPNotImplemented()
 
@@ -599,30 +667,22 @@ class ControllerV11(Controller):
 
         return webob.Response(status_int=202)
 
-    def _action_create_image(self, input_dict, req, instance_id):
-        """Snapshot or backup a server instance and save the image.
-
-        Images now have an `image_type` associated with them, which can be
-        'snapshot' or the backup type, like 'daily' or 'weekly'.
 
-        If the image_type is backup-like, then the rotation factor can be
-        included and that will cause the oldest backups that exceed the
-        rotation factor to be deleted.
 
-        """
-        entity = input_dict.get('createImage', {})
+    def _action_create_image(self, input_dict, req, instance_id):
+        """Snapshot a server instance."""
+        entity = input_dict.get("createImage", {})
 
-        def get_param(param):
-            try:
-                return entity[param]
-            except KeyError:
-                msg = _("Missing required param: %s") % param
-                raise webob.exc.HTTPBadRequest(explanation=msg)
+        try:
+            image_name = entity["name"]
 
-        context = req.environ['nova.context']
+        except KeyError:
+            msg = _("createImage entity requires name attribute")
+            raise webob.exc.HTTPBadRequest(explanation=msg)
 
-        image_name = get_param("name")
-        image_type = entity.get("image_type", "snapshot")
+        except TypeError:
+            msg = _("Malformed createImage entity")
+            raise webob.exc.HTTPBadRequest(explanation=msg)
 
         # preserve link to server in image properties
         server_ref = os.path.join(req.application_url,
@@ -637,36 +697,15 @@ class ControllerV11(Controller):
             msg = _("Invalid metadata")
             raise webob.exc.HTTPBadRequest(explanation=msg)
 
-        if image_type == "snapshot":
-            image = self.compute_api.snapshot(context,
-                                              instance_id,
-                                              image_name,
-                                              extra_properties=props)
-
-        elif image_type == "backup":
-            # NOTE(sirp): Unlike snapshot, backup is not a customer facing
-            # API call; rather, it's used by the internal backup scheduler
-            if not FLAGS.allow_admin_api:
-                msg = _("Admin API Required")
-                raise webob.exc.HTTPBadRequest(explanation=msg)
-
-            backup_type = get_param("backup_type")
-            rotation = int(get_param("rotation"))
-
-            image = self.compute_api.backup(context,
-                                            instance_id,
-                                            image_name,
-                                            backup_type,
-                                            rotation,
-                                            extra_properties=props)
-        else:
-            msg = _("Invalid image_type '%s'") % image_type
-            raise webob.exc.HTTPBadRequest(explanation=msg)
+        context = req.environ['nova.context']
+        image = self.compute_api.snapshot(context,
+                                          instance_id,
+                                          image_name,
+                                          extra_properties=props)
 
         # build location of newly-created image entity
-        image_ref = os.path.join(req.application_url,
-                                 'images',
-                                 str(image['id']))
+        image_id = str(image['id'])
+        image_ref = os.path.join(req.application_url, 'images', image_id)
 
         resp = webob.Response(status_int=202)
         resp.headers['Location'] = image_ref
-- 
cgit 


From 0a7e19481849f451f04063d3d2fc45b8f3328119 Mon Sep 17 00:00:00 2001
From: Brian Waldon <brian.waldon@rackspace.com>
Date: Thu, 28 Jul 2011 16:33:14 -0400
Subject: pep8

---
 nova/api/openstack/servers.py | 2 --
 1 file changed, 2 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index fafde1c15..636d79b66 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -667,8 +667,6 @@ class ControllerV11(Controller):
 
         return webob.Response(status_int=202)
 
-
-
     def _action_create_image(self, input_dict, req, instance_id):
         """Snapshot a server instance."""
         entity = input_dict.get("createImage", {})
-- 
cgit 


From 54f652bbffaf8edf9ccfe35e1e1b15c20327340a Mon Sep 17 00:00:00 2001
From: William Wolf <throughnothing@gmail.com>
Date: Thu, 28 Jul 2011 20:59:07 -0400
Subject: fixed pep8 issues and removed unnecessary factory function

---
 nova/api/openstack/versions.py       | 15 +++++----------
 nova/api/openstack/views/versions.py |  3 +--
 2 files changed, 6 insertions(+), 12 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/versions.py b/nova/api/openstack/versions.py
index b546462d4..40e966c5f 100644
--- a/nova/api/openstack/versions.py
+++ b/nova/api/openstack/versions.py
@@ -38,13 +38,13 @@ VERSIONS = {
                 "rel": "describedby",
                 "type": "application/pdf",
                 "href": "http://docs.rackspacecloud.com/"
-                "servers/api/v1.0/cs-devguide-20110125.pdf"
+                        "servers/api/v1.0/cs-devguide-20110125.pdf"
             },
             {
                 "rel": "describedby",
                 "type": "application/vnd.sun.wadl+xml",
                 "href": "http://docs.rackspacecloud.com/"
-                "servers/api/v1.0/application.wadl"
+                        "servers/api/v1.0/application.wadl"
             },
         ],
         "media-types": [
@@ -71,13 +71,13 @@ VERSIONS = {
                 "rel": "describedby",
                 "type": "application/pdf",
                 "href": "http://docs.rackspacecloud.com/"
-                    "servers/api/v1.1/cs-devguide-20110125.pdf"
+                        "servers/api/v1.1/cs-devguide-20110125.pdf"
             },
             {
                 "rel": "describedby",
                 "type": "application/vnd.sun.wadl+xml",
                 "href": "http://docs.rackspacecloud.com/"
-                    "servers/api/v1.1/application.wadl"
+                        "servers/api/v1.1/application.wadl"
             },
         ],
         "media-types": [
@@ -95,12 +95,7 @@ VERSIONS = {
 
 
 class Versions(wsgi.Resource):
-    @classmethod
-    def factory(cls, global_config, **local_config):
-        """Paste factory."""
-        return cls()
-
-    def __init__(self):
+    eef __init__(self):
         metadata = {
             "attributes": {
                 "version": ["status", "id"],
diff --git a/nova/api/openstack/views/versions.py b/nova/api/openstack/views/versions.py
index 7673ffe9e..cdf758b77 100644
--- a/nova/api/openstack/views/versions.py
+++ b/nova/api/openstack/views/versions.py
@@ -63,7 +63,6 @@ class ViewBuilder(object):
         return dict(versions=version_objs)
 
     def build_version(self, version):
-        
         for link in version['links']:
             if link['rel'] == 'self':
                 link['href'] = self.base_url.rstrip('/') + '/'
@@ -77,7 +76,7 @@ class ViewBuilder(object):
         links = [
             {
                 "rel": "self",
-                "href": href
+                "href": href,
             },
         ]
 
-- 
cgit 


From ad8d33165f52ddf14dc9bd745db00eb039d74af7 Mon Sep 17 00:00:00 2001
From: William Wolf <throughnothing@gmail.com>
Date: Thu, 28 Jul 2011 21:00:55 -0400
Subject: fixed typo

---
 nova/api/openstack/versions.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/versions.py b/nova/api/openstack/versions.py
index 40e966c5f..607cf6a81 100644
--- a/nova/api/openstack/versions.py
+++ b/nova/api/openstack/versions.py
@@ -95,7 +95,7 @@ VERSIONS = {
 
 
 class Versions(wsgi.Resource):
-    eef __init__(self):
+    def __init__(self):
         metadata = {
             "attributes": {
                 "version": ["status", "id"],
-- 
cgit 


From eca19199bdfcc64948f41d7e6b1728cb17b3baa2 Mon Sep 17 00:00:00 2001
From: William Wolf <throughnothing@gmail.com>
Date: Fri, 29 Jul 2011 10:08:20 -0400
Subject: fix more spacing issues, and removed self link from versions template
 data

---
 nova/api/openstack/versions.py       |  8 --------
 nova/api/openstack/views/versions.py | 12 +++++++-----
 2 files changed, 7 insertions(+), 13 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/versions.py b/nova/api/openstack/versions.py
index 607cf6a81..3ef72b7f6 100644
--- a/nova/api/openstack/versions.py
+++ b/nova/api/openstack/versions.py
@@ -30,10 +30,6 @@ VERSIONS = {
         "status": "DEPRECATED",
         "updated": "2011-01-21T11:33:21Z",
         "links": [
-            {
-                "rel": "self",
-                "href": ""
-            },
             {
                 "rel": "describedby",
                 "type": "application/pdf",
@@ -63,10 +59,6 @@ VERSIONS = {
         "status": "CURRENT",
         "updated": "2011-01-21T11:33:21Z",
         "links": [
-            {
-                "rel": "self",
-                "href": ""
-            },
             {
                 "rel": "describedby",
                 "type": "application/pdf",
diff --git a/nova/api/openstack/views/versions.py b/nova/api/openstack/views/versions.py
index cdf758b77..547289034 100644
--- a/nova/api/openstack/views/versions.py
+++ b/nova/api/openstack/views/versions.py
@@ -15,6 +15,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import copy
 import os
 
 
@@ -63,11 +64,12 @@ class ViewBuilder(object):
         return dict(versions=version_objs)
 
     def build_version(self, version):
-        for link in version['links']:
-            if link['rel'] == 'self':
-                link['href'] = self.base_url.rstrip('/') + '/'
-
-        return dict(version=version)
+        reval = copy.deepcopy(version)
+        reval['links'].insert(0, {
+            "rel": "self",
+            "href": self.base_url.rstrip('/') + '/',
+        })
+        return dict(version=reval)
 
     def _build_links(self, version_data):
         """Generate a container of links that refer to the provided version."""
-- 
cgit 


From 055a422643fc229ec0e7db3f6dcba9904c5a4f5d Mon Sep 17 00:00:00 2001
From: Brian Lamar <brian.lamar@rackspace.com>
Date: Fri, 29 Jul 2011 18:05:31 -0400
Subject: Created exceptions for accepting in OSAPI, and handled them
 appropriately.

---
 nova/api/openstack/servers.py | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index 30169d450..e62e4e4f8 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -405,6 +405,24 @@ class Controller(object):
                 error=item.error))
         return dict(actions=actions)
 
+    def resize(self, req, instance_id, flavor_id):
+        """Begin the resize process with given instance/flavor."""
+        context = req.environ["nova.context"]
+
+        try:
+            self.compute_api.resize(context, instance_id, flavor_id)
+        except exception.FlavorDoesNotExist:
+            msg = _("Unable to locate requested flavor.")
+            raise exc.HTTPBadRequest(explanation=msg)
+        except exception.CannotResizeToSameSize:
+            msg = _("Resize requires a change in size.")
+            raise exc.HTTPBadRequest(explanation=msg)
+        except exception.CannotResizeToSmallerSize:
+            msg = _("Resizing to a smaller size is not supported.")
+            raise exc.HTTPBadRequest(explanation=msg)
+
+        return webob.Response(status_int=202)
+
 
 class ControllerV10(Controller):
 
@@ -444,16 +462,7 @@ class ControllerV10(Controller):
             msg = _("Resize requests require 'flavorId' attribute.")
             raise exc.HTTPBadRequest(explanation=msg)
 
-        try:
-            i_type = instance_types.get_instance_type_by_flavor_id(flavor_id)
-        except exception.FlavorNotFound:
-            msg = _("Unable to locate requested flavor.")
-            raise exc.HTTPBadRequest(explanation=msg)
-
-        context = req.environ["nova.context"]
-        self.compute_api.resize(context, id, i_type["id"])
-
-        return webob.Response(status_int=202)
+        return Controller.resize(self, req, id, flavor_id)
 
     def _action_rebuild(self, info, request, instance_id):
         context = request.environ['nova.context']
@@ -568,16 +577,7 @@ class ControllerV11(Controller):
             msg = _("Resize requests require 'flavorRef' attribute.")
             raise exc.HTTPBadRequest(explanation=msg)
 
-        try:
-            i_type = instance_types.get_instance_type_by_flavor_id(flavor_ref)
-        except exception.FlavorNotFound:
-            msg = _("Unable to locate requested flavor.")
-            raise exc.HTTPBadRequest(explanation=msg)
-
-        context = req.environ["nova.context"]
-        self.compute_api.resize(context, id, i_type["id"])
-
-        return webob.Response(status_int=202)
+        return Controller.resize(self, req, id, flavor_ref)
 
     def _action_rebuild(self, info, request, instance_id):
         context = request.environ['nova.context']
-- 
cgit 


From a7f0eb04236b15a026654346b47bc434886b9d97 Mon Sep 17 00:00:00 2001
From: Brian Lamar <brian.lamar@rackspace.com>
Date: Fri, 29 Jul 2011 18:13:28 -0400
Subject: FlavorNotFound already existed, no need to create another exception.

---
 nova/api/openstack/servers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index e62e4e4f8..f35eec884 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -411,7 +411,7 @@ class Controller(object):
 
         try:
             self.compute_api.resize(context, instance_id, flavor_id)
-        except exception.FlavorDoesNotExist:
+        except exception.FlavorNotFound:
             msg = _("Unable to locate requested flavor.")
             raise exc.HTTPBadRequest(explanation=msg)
         except exception.CannotResizeToSameSize:
-- 
cgit 


From 25a831fd449dbbb7f0c2cdac404d7600a6da9f27 Mon Sep 17 00:00:00 2001
From: Brian Lamar <brian.lamar@rackspace.com>
Date: Mon, 1 Aug 2011 18:01:04 -0400
Subject: Controller -> self

---
 nova/api/openstack/servers.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index f35eec884..8d2ccc2ad 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -462,7 +462,7 @@ class ControllerV10(Controller):
             msg = _("Resize requests require 'flavorId' attribute.")
             raise exc.HTTPBadRequest(explanation=msg)
 
-        return Controller.resize(self, req, id, flavor_id)
+        return self.resize(req, id, flavor_id)
 
     def _action_rebuild(self, info, request, instance_id):
         context = request.environ['nova.context']
@@ -577,7 +577,7 @@ class ControllerV11(Controller):
             msg = _("Resize requests require 'flavorRef' attribute.")
             raise exc.HTTPBadRequest(explanation=msg)
 
-        return Controller.resize(self, req, id, flavor_ref)
+        return self.resize(req, id, flavor_ref)
 
     def _action_rebuild(self, info, request, instance_id):
         context = request.environ['nova.context']
-- 
cgit 


From 0e5b2b0bfb7f6b0af7f2c962a963830a8691410e Mon Sep 17 00:00:00 2001
From: Anthony Young <sleepsonthefloor@gmail.com>
Date: Mon, 1 Aug 2011 18:56:16 -0700
Subject: avoid explicit type checking, per brian waldon's comment

---
 nova/api/openstack/create_instance_helper.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/create_instance_helper.py b/nova/api/openstack/create_instance_helper.py
index 234c16bcc..b414b2173 100644
--- a/nova/api/openstack/create_instance_helper.py
+++ b/nova/api/openstack/create_instance_helper.py
@@ -90,8 +90,7 @@ class CreateInstanceHelper(object):
         # If the image href was generated by nova api, strip image_href
         # down to an id and use the default glance connection params
         
-        if isinstance(image_href, basestring) and\
-                      image_href.startswith(req.application_url):
+        if str(image_href).startswith(req.application_url):
             image_href = image_href.split('/').pop()
         try:
             image_service, image_id = nova.image.get_image_service(image_href)
-- 
cgit 


From 804bbc7656080597880e9705532ac161d3124aa4 Mon Sep 17 00:00:00 2001
From: Brian Waldon <brian.waldon@rackspace.com>
Date: Tue, 2 Aug 2011 10:21:36 -0400
Subject: fixing method naming problem

---
 nova/api/openstack/create_instance_helper.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/create_instance_helper.py b/nova/api/openstack/create_instance_helper.py
index 5a745ded3..ea5d4af73 100644
--- a/nova/api/openstack/create_instance_helper.py
+++ b/nova/api/openstack/create_instance_helper.py
@@ -303,7 +303,7 @@ class ServerXMLDeserializer(wsgi.MetadataXMLDeserializer):
 
         action_deserializer = {
             'createImage': self._action_create_image,
-            'createBackup': self._action_create_image,
+            'createBackup': self._action_create_backup,
         }.get(action_name, self.default)
 
         action_data = action_deserializer(action_node)
@@ -319,7 +319,7 @@ class ServerXMLDeserializer(wsgi.MetadataXMLDeserializer):
         data['metadata'] = self.extract_metadata(metadata_node)
         return data
 
-    def _action_create_image(self, node):
+    def _action_create_backup(self, node):
         data = {}
         attributes = ['name', 'backup_type', 'rotation']
         for attribute in attributes:
-- 
cgit 


From 1fc4c4cb9bdfca2cf6a931cec44fa25ee76c502d Mon Sep 17 00:00:00 2001
From: Brian Waldon <brian.waldon@rackspace.com>
Date: Tue, 2 Aug 2011 10:24:23 -0400
Subject: abstraction of xml deserialization

---
 nova/api/openstack/create_instance_helper.py | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/create_instance_helper.py b/nova/api/openstack/create_instance_helper.py
index ea5d4af73..b0f422655 100644
--- a/nova/api/openstack/create_instance_helper.py
+++ b/nova/api/openstack/create_instance_helper.py
@@ -311,18 +311,15 @@ class ServerXMLDeserializer(wsgi.MetadataXMLDeserializer):
         return {'body': {action_name: action_data}}
 
     def _action_create_image(self, node):
-        data = {}
-        value = node.getAttribute('name')
-        if value:
-            data['name'] = value
-        metadata_node = self.find_first_child_named(node, 'metadata')
-        data['metadata'] = self.extract_metadata(metadata_node)
-        return data
+        return self._deserialize_image_action(node, ('name',))
 
     def _action_create_backup(self, node):
+        attributes = ('name', 'backup_type', 'rotation')
+        return self._deserialize_image_action(node, attributes)
+
+    def _deserialize_image_action(self, node, allowed_attribtues):
         data = {}
-        attributes = ['name', 'backup_type', 'rotation']
-        for attribute in attributes:
+        for attribute in allowed_attributes:
             value = node.getAttribute(attribute)
             if value:
                 data[attribute] = value
-- 
cgit 


From b65c7e2378d8344d1948fe4cf0dde66ef34b7204 Mon Sep 17 00:00:00 2001
From: Brian Waldon <brian.waldon@rackspace.com>
Date: Tue, 2 Aug 2011 13:32:14 -0400
Subject: fixing typo

---
 nova/api/openstack/create_instance_helper.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/create_instance_helper.py b/nova/api/openstack/create_instance_helper.py
index b0f422655..53e814cd5 100644
--- a/nova/api/openstack/create_instance_helper.py
+++ b/nova/api/openstack/create_instance_helper.py
@@ -317,7 +317,7 @@ class ServerXMLDeserializer(wsgi.MetadataXMLDeserializer):
         attributes = ('name', 'backup_type', 'rotation')
         return self._deserialize_image_action(node, attributes)
 
-    def _deserialize_image_action(self, node, allowed_attribtues):
+    def _deserialize_image_action(self, node, allowed_attributes):
         data = {}
         for attribute in allowed_attributes:
             value = node.getAttribute(attribute)
-- 
cgit 


From 1c2bb5bf81e384a2e833dfb172cdaf72b6ecdbae Mon Sep 17 00:00:00 2001
From: "matt.dietz@rackspace.com" <>
Date: Tue, 2 Aug 2011 13:56:58 -0500
Subject: Changed migration to be an admin only method and updated the tests

---
 nova/api/openstack/__init__.py |  1 +
 nova/api/openstack/servers.py  | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 10 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/__init__.py b/nova/api/openstack/__init__.py
index 868b98a31..05baa0721 100644
--- a/nova/api/openstack/__init__.py
+++ b/nova/api/openstack/__init__.py
@@ -96,6 +96,7 @@ class APIRouter(base_wsgi.Router):
             server_members['suspend'] = 'POST'
             server_members['resume'] = 'POST'
             server_members['rescue'] = 'POST'
+            server_members['migrate'] = 'POST'
             server_members['unrescue'] = 'POST'
             server_members['reset_network'] = 'POST'
             server_members['inject_network_info'] = 'POST'
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index 8d2ccc2ad..78e650c88 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -163,8 +163,7 @@ class Controller(object):
             'resize': self._action_resize,
             'confirmResize': self._action_confirm_resize,
             'revertResize': self._action_revert_resize,
-            'rebuild': self._action_rebuild,
-            'migrate': self._action_migrate}
+            'rebuild': self._action_rebuild,}
 
         for key in actions.keys():
             if key in body:
@@ -208,14 +207,6 @@ class Controller(object):
             raise exc.HTTPUnprocessableEntity()
         return webob.Response(status_int=202)
 
-    def _action_migrate(self, input_dict, req, id):
-        try:
-            self.compute_api.resize(req.environ['nova.context'], id)
-        except Exception, e:
-            LOG.exception(_("Error in migrate %s"), e)
-            raise exc.HTTPBadRequest()
-        return webob.Response(status_int=202)
-
     @scheduler_api.redirect_handler
     def lock(self, req, id):
         """
@@ -341,6 +332,15 @@ class Controller(object):
             raise exc.HTTPUnprocessableEntity()
         return webob.Response(status_int=202)
 
+    @scheduler_api.redirect_handler
+    def migrate(self, req, id):
+        try:
+            self.compute_api.resize(req.environ['nova.context'], id)
+        except Exception, e:
+            LOG.exception(_("Error in migrate %s"), e)
+            raise exc.HTTPBadRequest()
+        return webob.Response(status_int=202)
+
     @scheduler_api.redirect_handler
     def rescue(self, req, id):
         """Permit users to rescue the server."""
-- 
cgit 


From 0d8942fc5f47a5f434115ac0c1444b6485c6ba1f Mon Sep 17 00:00:00 2001
From: Matt Dietz <matt.dietz@rackspace.com>
Date: Tue, 2 Aug 2011 20:23:12 +0000
Subject: Bad merge res

---
 nova/api/openstack/servers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index 070b89a60..002b47edb 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -163,7 +163,7 @@ class Controller(object):
             'resize': self._action_resize,
             'confirmResize': self._action_confirm_resize,
             'revertResize': self._action_revert_resize,
-            'rebuild': self._action_rebuild,}
+            'rebuild': self._action_rebuild,
             'createImage': self._action_create_image,
         }
 
-- 
cgit