From 4b49df7e7232dfd3e187faac52b9eb72773be360 Mon Sep 17 00:00:00 2001
From: Brian Lamar <brian.lamar@rackspace.com>
Date: Tue, 15 Mar 2011 16:49:19 -0400
Subject: Major cosmetic changes to limits, but little-to-no functional
 changes. MUCH better testability now, no more relying on system time to tick
 by for limit testing.

---
 nova/api/openstack/__init__.py |   6 +
 nova/api/openstack/faults.py   |  21 +++
 nova/api/openstack/limits.py   | 342 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 369 insertions(+)
 create mode 100644 nova/api/openstack/limits.py

(limited to 'nova/api')

diff --git a/nova/api/openstack/__init__.py b/nova/api/openstack/__init__.py
index ce3cff337..db2dff8d5 100644
--- a/nova/api/openstack/__init__.py
+++ b/nova/api/openstack/__init__.py
@@ -33,6 +33,7 @@ from nova.api.openstack import backup_schedules
 from nova.api.openstack import consoles
 from nova.api.openstack import flavors
 from nova.api.openstack import images
+from nova.api.openstack import limits
 from nova.api.openstack import servers
 from nova.api.openstack import shared_ip_groups
 from nova.api.openstack import users
@@ -114,12 +115,17 @@ class APIRouter(wsgi.Router):
 
         mapper.resource("image", "images", controller=images.Controller(),
                         collection={'detail': 'GET'})
+
         mapper.resource("flavor", "flavors", controller=flavors.Controller(),
                         collection={'detail': 'GET'})
+
         mapper.resource("shared_ip_group", "shared_ip_groups",
                         collection={'detail': 'GET'},
                         controller=shared_ip_groups.Controller())
 
+        _limits = limits.LimitsController()
+        mapper.resource("limit", "limits", controller=_limits)
+
         super(APIRouter, self).__init__(mapper)
 
 
diff --git a/nova/api/openstack/faults.py b/nova/api/openstack/faults.py
index 2fd733299..6ed9322de 100644
--- a/nova/api/openstack/faults.py
+++ b/nova/api/openstack/faults.py
@@ -61,3 +61,24 @@ class Fault(webob.exc.HTTPException):
         content_type = req.best_match_content_type()
         self.wrapped_exc.body = serializer.serialize(fault_data, content_type)
         return self.wrapped_exc
+
+
+class OverLimitFault(webob.exc.HTTPException):
+    """
+    Rate-limited request response.
+    """
+
+    wrapped_exc = webob.exc.HTTPForbidden()
+
+    def __init__(self, message, details, retry_time):
+        """
+        Initialize new `OverLimitFault` with relevant information.
+        """
+        self.message = message
+        self.details = details
+        self.retry_time = retry_time
+
+    @webob.dec.wsgify(RequestClass=wsgi.Request)
+    def __call__(self, request):
+        """Currently just return the wrapped exception."""
+        return self.wrapped_exc
diff --git a/nova/api/openstack/limits.py b/nova/api/openstack/limits.py
new file mode 100644
index 000000000..4f64cab3c
--- /dev/null
+++ b/nova/api/openstack/limits.py
@@ -0,0 +1,342 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2010 OpenStack LLC.
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.import datetime
+
+"""
+Module dedicated functions/classes dealing with rate limiting requests.
+"""
+
+import copy
+import httplib
+import json
+import math
+import re
+import time
+import urllib
+import webob.exc
+
+from collections import defaultdict
+
+from webob.dec import wsgify
+
+from nova import wsgi
+from nova.api.openstack import faults
+from nova.wsgi import Controller
+from nova.wsgi import Middleware
+
+
+# Convenience constants for the limits dictionary passed to Limiter().
+PER_SECOND = 1
+PER_MINUTE = 60
+PER_HOUR = 60 * 60
+PER_DAY = 60 * 60 * 24
+
+
+class LimitsController(Controller):
+    """
+    Controller for accessing limits in the OpenStack API.
+    """
+
+    def index(self, req):
+        """
+        Return all global and rate limit information.
+        """
+        abs_limits = {}
+        rate_limits = req.environ.get("nova.limits", {})
+
+        return {
+            "limits" : {
+                "rate" : rate_limits,
+                "absolute" : abs_limits,
+            },
+        }
+        
+
+class Limit(object):
+    """
+    Stores information about a limit for HTTP requets.
+    """
+
+    UNITS = {
+        1 : "SECOND",
+        60 : "MINUTE",
+        60 * 60 : "HOUR",
+        60 * 60 * 24 : "DAY",
+    }
+
+    def __init__(self, verb, uri, regex, value, unit):
+        """
+        Initialize a new `Limit`.
+
+        @param verb: HTTP verb (POST, PUT, etc.)
+        @param uri: Human-readable URI
+        @param regex: Regular expression format for this limit
+        @param value: Integer number of requests which can be made
+        @param unit: Unit of measure for the value parameter
+        """
+        self.verb = verb
+        self.uri = uri
+        self.regex = regex
+        self.value = int(value)
+        self.unit = unit
+        self.remaining = int(value)
+
+        if value <= 0:
+            raise ValueError("Limit value must be > 0")
+
+        self.last_request = None
+        self.next_request = None
+
+        self.water_level = 0
+        self.capacity = float(self.unit)
+        self.request_value = float(self.capacity) / float(self.value)
+
+    def __call__(self, verb, url):
+        """
+        Represents a call to this limit from a relevant request.
+
+        @param verb: string http verb (POST, GET, etc.)
+        @param url: string URL
+        """
+        if self.verb != verb or not re.match(self.regex, url):
+            return
+
+        now = self._get_time()
+
+        if self.last_request is None:
+            self.last_request = now
+
+        leak_value = now - self.last_request
+
+        self.water_level -= leak_value
+        self.water_level = max(self.water_level, 0)
+        self.water_level += self.request_value
+
+        difference = self.water_level - self.capacity
+
+        self.last_request = now
+
+        if difference > 0:
+            self.water_level -= self.request_value
+            self.next_request = now + difference
+            return difference
+
+        cap = self.capacity
+        water = self.water_level
+        val = self.value
+ 
+        self.remaining = math.floor((cap - water) / cap * val)
+        print "Remaining:", self.remaining
+        self.next_request = now
+
+    def _get_time(self):
+        """Retrieve the current time. Broken out for testability."""
+        return time.time() 
+
+    def display_unit(self):
+        """Display the string name of the unit."""
+        return self.UNITS.get(self.unit, "UNKNOWN")
+
+    def display(self):
+        """Return a useful representation of this class."""
+        return {
+            "verb" : self.verb,
+            "uri" : self.uri,
+            "regex" : self.regex,
+            "value" : self.value,
+            "remaining" : int(self.remaining),
+            "unit" : self.display_unit(),
+            "resetTime" : int(self.next_request or self._get_time()),
+        }
+
+
+
+# "Limit" format is a dictionary with the HTTP verb, human-readable URI,
+# a regular-expression to match, value and unit of measure (PER_DAY, etc.)
+
+DEFAULT_LIMITS = [
+    Limit("POST", "*", ".*", 10, PER_MINUTE),
+    Limit("POST", "*/servers", "^/servers", 50, PER_DAY),
+    Limit("PUT", "*", ".*", 10, PER_MINUTE),
+    Limit("GET", "*changes-since*", ".*changes-since.*", 3, PER_MINUTE),
+    Limit("DELETE", "*", ".*", 100, PER_MINUTE),
+]
+
+
+class RateLimitingMiddleware(Middleware):
+    """
+    Rate-limits requests passing through this middleware. All limit information
+    is stored in memory for this implementation.
+    """
+
+    def __init__(self, application, limits=None):
+        """
+        Initialize new `RateLimitingMiddleware`, which wraps the given WSGI
+        application and sets up the given limits.
+
+        @param application: WSGI application to wrap
+        @param limits: List of dictionaries describing limits
+        """
+        Middleware.__init__(self, application)
+        self._limiter = Limiter(limits or DEFAULT_LIMITS)
+
+    @wsgify(RequestClass=wsgi.Request)
+    def __call__(self, req):
+        """
+        Represents a single call through this middleware. We should record the
+        request if we have a limit relevant to it. If no limit is relevant to
+        the request, ignore it.
+
+        If the request should be rate limited, return a fault telling the user
+        they are over the limit and need to retry later.
+        """
+        verb = req.method
+        url = req.url
+        username = req.environ["nova.context"].user_id
+
+        delay = self._limiter.check_for_delay(verb, url, username)
+
+        if delay:
+            msg = "This request was rate-limited."
+            details = "Error details."
+            retry = time.time() + delay
+            return faults.OverLimitFault(msg, details, retry)
+
+        req.environ["nova.limits"] = self._limiter.get_limits(username)
+
+        return self.application
+
+
+class Limiter(object):
+    """
+    Rate-limit checking class which handles limits in memory.
+    """
+
+    def __init__(self, limits):
+        """
+        Initialize the new `Limiter`.
+
+        @param limits: List of `Limit` objects
+        """
+        self.limits = copy.deepcopy(limits)
+        self.levels = defaultdict(lambda: copy.deepcopy(limits))
+
+    def get_limits(self, username=None):
+        """
+        Return the limits for a given user.
+        """
+        return [limit.display() for limit in self.levels[username]]
+
+    def check_for_delay(self, verb, url, username=None):
+        """
+        Check the given verb/user/user triplet for limit.
+        """
+        def _get_delay_list():
+            """Yield limit delays."""
+            for limit in self.levels[username]:
+                delay = limit(verb, url)
+                if delay:
+                    yield delay
+
+        delays = list(_get_delay_list())
+
+        if delays:
+            delays.sort()
+            return delays[0]
+
+
+class WsgiLimiter(object):
+    """
+    Rate-limit checking from a WSGI application. Uses an in-memory `Limiter`.
+
+    To use:
+        POST /<username> with JSON data such as:
+        {
+            "verb" : GET,
+            "path" : "/servers"
+        }
+
+    and receive a 204 No Content, or a 403 Forbidden with an X-Wait-Seconds
+    header containing the number of seconds to wait before the action would
+    succeed.
+    """
+
+    def __init__(self, limits=None):
+        """
+        Initialize the new `WsgiLimiter`.
+
+        @param limits: List of `Limit` objects
+        """
+        self._limiter = Limiter(limits or DEFAULT_LIMITS)
+
+    @wsgify(RequestClass=wsgi.Request)
+    def __call__(self, request):
+        """
+        Handles a call to this application. Returns 204 if the request is
+        acceptable to the limiter, else a 403 is returned with a relevant
+        header indicating when the request *will* succeed.
+        """
+        if request.method != "POST":
+            raise webob.exc.HTTPMethodNotAllowed()
+
+        try:
+            info = dict(json.loads(request.body))
+        except ValueError:
+            raise webob.exc.HTTPBadRequest()
+
+        username = request.path_info_pop()
+        verb = info.get("verb")
+        path = info.get("path")
+
+        delay = self._limiter.check_for_delay(verb, path, username)
+
+        if delay:
+            headers = {"X-Wait-Seconds": "%.2f" % delay}
+            return webob.exc.HTTPForbidden(headers=headers)
+        else:
+            return webob.exc.HTTPNoContent()
+
+
+class WsgiLimiterProxy(object):
+    """
+    Rate-limit requests based on answers from a remote source.
+    """
+
+    def __init__(self, limiter_address):
+        """
+        Initialize the new `WsgiLimiterProxy`.
+
+        @param limiter_address: IP/port combination of where to request limit
+        """
+        self.limiter_address = limiter_address
+
+    def check_for_delay(self, verb, path, username=None):
+        body = json.dumps({"verb":verb,"path":path})
+        headers = {"Content-Type" : "application/json"}
+
+        conn = httplib.HTTPConnection(self.limiter_address)
+        
+        if username:
+            conn.request("POST", "/%s" % (username), body, headers)
+        else:
+            conn.request("POST", "/", body, headers)
+
+        resp = conn.getresponse()
+
+        if 200 >= resp.status < 300:
+            return None
+
+        return resp.getheader("X-Wait-Seconds")
-- 
cgit 


From 1b477c2225816ea8f05595a8812932d516828e01 Mon Sep 17 00:00:00 2001
From: Brian Lamar <brian.lamar@rackspace.com>
Date: Tue, 15 Mar 2011 17:47:34 -0400
Subject: pep8 fixes

---
 nova/api/openstack/limits.py | 43 ++++++++++++++++++++-----------------------
 1 file changed, 20 insertions(+), 23 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/limits.py b/nova/api/openstack/limits.py
index 4f64cab3c..b1e633330 100644
--- a/nova/api/openstack/limits.py
+++ b/nova/api/openstack/limits.py
@@ -58,12 +58,12 @@ class LimitsController(Controller):
         rate_limits = req.environ.get("nova.limits", {})
 
         return {
-            "limits" : {
-                "rate" : rate_limits,
-                "absolute" : abs_limits,
+            "limits": {
+                "rate": rate_limits,
+                "absolute": abs_limits,
             },
         }
-        
+
 
 class Limit(object):
     """
@@ -71,10 +71,10 @@ class Limit(object):
     """
 
     UNITS = {
-        1 : "SECOND",
-        60 : "MINUTE",
-        60 * 60 : "HOUR",
-        60 * 60 * 24 : "DAY",
+        1: "SECOND",
+        60: "MINUTE",
+        60 * 60: "HOUR",
+        60 * 60 * 24: "DAY",
     }
 
     def __init__(self, verb, uri, regex, value, unit):
@@ -137,14 +137,13 @@ class Limit(object):
         cap = self.capacity
         water = self.water_level
         val = self.value
- 
+
         self.remaining = math.floor((cap - water) / cap * val)
-        print "Remaining:", self.remaining
         self.next_request = now
 
     def _get_time(self):
         """Retrieve the current time. Broken out for testability."""
-        return time.time() 
+        return time.time()
 
     def display_unit(self):
         """Display the string name of the unit."""
@@ -153,17 +152,15 @@ class Limit(object):
     def display(self):
         """Return a useful representation of this class."""
         return {
-            "verb" : self.verb,
-            "uri" : self.uri,
-            "regex" : self.regex,
-            "value" : self.value,
-            "remaining" : int(self.remaining),
-            "unit" : self.display_unit(),
-            "resetTime" : int(self.next_request or self._get_time()),
+            "verb": self.verb,
+            "uri": self.uri,
+            "regex": self.regex,
+            "value": self.value,
+            "remaining": int(self.remaining),
+            "unit": self.display_unit(),
+            "resetTime": int(self.next_request or self._get_time()),
         }
 
-
-
 # "Limit" format is a dictionary with the HTTP verb, human-readable URI,
 # a regular-expression to match, value and unit of measure (PER_DAY, etc.)
 
@@ -324,11 +321,11 @@ class WsgiLimiterProxy(object):
         self.limiter_address = limiter_address
 
     def check_for_delay(self, verb, path, username=None):
-        body = json.dumps({"verb":verb,"path":path})
-        headers = {"Content-Type" : "application/json"}
+        body = json.dumps({"verb": verb, "path": path})
+        headers = {"Content-Type": "application/json"}
 
         conn = httplib.HTTPConnection(self.limiter_address)
-        
+
         if username:
             conn.request("POST", "/%s" % (username), body, headers)
         else:
-- 
cgit 


From 5e45d0ba921566e98817cb9e62e383f84c30c5f6 Mon Sep 17 00:00:00 2001
From: Brian Lamar <brian.lamar@rackspace.com>
Date: Tue, 15 Mar 2011 20:51:17 -0400
Subject: Limits controller and testing with XML and JSON serialization.

---
 nova/api/openstack/limits.py | 42 +++++++++++++++++++++++++++++++-----------
 1 file changed, 31 insertions(+), 11 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/limits.py b/nova/api/openstack/limits.py
index b1e633330..57e6bfcc2 100644
--- a/nova/api/openstack/limits.py
+++ b/nova/api/openstack/limits.py
@@ -50,12 +50,24 @@ class LimitsController(Controller):
     Controller for accessing limits in the OpenStack API.
     """
 
+    _serialization_metadata = {
+        "application/xml": {
+            "attributes": {
+                "limit": ["verb", "URI", "regex", "value", "unit",
+                    "resetTime", "remaining", "name"],
+            },
+            "plurals" : {
+                "rate" : "limit",
+            },
+        },
+    }
+
     def index(self, req):
         """
         Return all global and rate limit information.
         """
         abs_limits = {}
-        rate_limits = req.environ.get("nova.limits", {})
+        rate_limits = req.environ.get("nova.limits", [])
 
         return {
             "limits": {
@@ -92,6 +104,7 @@ class Limit(object):
         self.regex = regex
         self.value = int(value)
         self.unit = unit
+        self.unit_string = self.display_unit().lower()
         self.remaining = int(value)
 
         if value <= 0:
@@ -101,8 +114,10 @@ class Limit(object):
         self.next_request = None
 
         self.water_level = 0
-        self.capacity = float(self.unit)
+        self.capacity = self.unit
         self.request_value = float(self.capacity) / float(self.value)
+        self.error_message = _("Only %(value)s %(verb)s request(s) can be "\
+            "made to %(uri)s every %(unit_string)s." % self.__dict__)
 
     def __call__(self, verb, url):
         """
@@ -153,7 +168,7 @@ class Limit(object):
         """Return a useful representation of this class."""
         return {
             "verb": self.verb,
-            "uri": self.uri,
+            "URI": self.uri,
             "regex": self.regex,
             "value": self.value,
             "remaining": int(self.remaining),
@@ -204,13 +219,12 @@ class RateLimitingMiddleware(Middleware):
         url = req.url
         username = req.environ["nova.context"].user_id
 
-        delay = self._limiter.check_for_delay(verb, url, username)
+        delay, error = self._limiter.check_for_delay(verb, url, username)
 
         if delay:
             msg = "This request was rate-limited."
-            details = "Error details."
             retry = time.time() + delay
-            return faults.OverLimitFault(msg, details, retry)
+            return faults.OverLimitFault(msg, error, retry)
 
         req.environ["nova.limits"] = self._limiter.get_limits(username)
 
@@ -240,13 +254,15 @@ class Limiter(object):
     def check_for_delay(self, verb, url, username=None):
         """
         Check the given verb/user/user triplet for limit.
+
+        @return: Tuple of delay (in seconds) and error message (or None, None)
         """
         def _get_delay_list():
             """Yield limit delays."""
             for limit in self.levels[username]:
                 delay = limit(verb, url)
                 if delay:
-                    yield delay
+                    yield delay, limit.error_message
 
         delays = list(_get_delay_list())
 
@@ -254,6 +270,8 @@ class Limiter(object):
             delays.sort()
             return delays[0]
 
+        return None, None
+
 
 class WsgiLimiter(object):
     """
@@ -298,11 +316,11 @@ class WsgiLimiter(object):
         verb = info.get("verb")
         path = info.get("path")
 
-        delay = self._limiter.check_for_delay(verb, path, username)
+        delay, error = self._limiter.check_for_delay(verb, path, username)
 
         if delay:
             headers = {"X-Wait-Seconds": "%.2f" % delay}
-            return webob.exc.HTTPForbidden(headers=headers)
+            return webob.exc.HTTPForbidden(headers=headers, explanation=error)
         else:
             return webob.exc.HTTPNoContent()
 
@@ -333,7 +351,9 @@ class WsgiLimiterProxy(object):
 
         resp = conn.getresponse()
 
+        print resp
+
         if 200 >= resp.status < 300:
-            return None
+            return None, None
 
-        return resp.getheader("X-Wait-Seconds")
+        return resp.getheader("X-Wait-Seconds"), resp.read() or None
-- 
cgit 


From 5ba3e21875d3cf3b71082477311902891706eee4 Mon Sep 17 00:00:00 2001
From: Brian Lamar <brian.lamar@rackspace.com>
Date: Tue, 15 Mar 2011 21:09:26 -0400
Subject: Removed VIM specific stuff and changed copyright from 2010 to 2011.

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

(limited to 'nova/api')

diff --git a/nova/api/openstack/limits.py b/nova/api/openstack/limits.py
index 57e6bfcc2..3ecd46377 100644
--- a/nova/api/openstack/limits.py
+++ b/nova/api/openstack/limits.py
@@ -1,6 +1,4 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 2010 OpenStack LLC.
+# Copyright 2011 OpenStack LLC.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
-- 
cgit 


From be9a218e2e4b01fe19722fb0073731d8ae6a7eea Mon Sep 17 00:00:00 2001
From: Brian Lamar <brian.lamar@rackspace.com>
Date: Tue, 15 Mar 2011 23:13:05 -0400
Subject: Added tests back for RateLimitingMiddleware which now throw correctly
 serialized errors with correct error codes.

Removed some error printing, and simplified some other parts of the code with
suggestions from teammates.
---
 nova/api/openstack/faults.py | 22 ++++++++++++++++++----
 nova/api/openstack/limits.py | 25 +++++++++++++------------
 2 files changed, 31 insertions(+), 16 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/faults.py b/nova/api/openstack/faults.py
index 6ed9322de..d05c61fc7 100644
--- a/nova/api/openstack/faults.py
+++ b/nova/api/openstack/faults.py
@@ -68,17 +68,31 @@ class OverLimitFault(webob.exc.HTTPException):
     Rate-limited request response.
     """
 
-    wrapped_exc = webob.exc.HTTPForbidden()
+    _serialization_metadata = {
+        "application/xml": {
+            "attributes": {
+                "overLimitFault": "code"
+            }
+        }
+    }
 
     def __init__(self, message, details, retry_time):
         """
         Initialize new `OverLimitFault` with relevant information.
         """
-        self.message = message
-        self.details = details
-        self.retry_time = retry_time
+        self.wrapped_exc = webob.exc.HTTPForbidden()
+        self.content = {
+            "overLimitFault": {
+                "code": self.wrapped_exc.status_int,
+                "message": message,
+                "details": details,
+            },
+        }
 
     @webob.dec.wsgify(RequestClass=wsgi.Request)
     def __call__(self, request):
         """Currently just return the wrapped exception."""
+        serializer = wsgi.Serializer(self._serialization_metadata)
+        content_type = request.best_match_content_type()
+        self.wrapped_exc.body = serializer.serialize(self.content, content_type)
         return self.wrapped_exc
diff --git a/nova/api/openstack/limits.py b/nova/api/openstack/limits.py
index 3ecd46377..c4e04e9d9 100644
--- a/nova/api/openstack/limits.py
+++ b/nova/api/openstack/limits.py
@@ -54,8 +54,8 @@ class LimitsController(Controller):
                 "limit": ["verb", "URI", "regex", "value", "unit",
                     "resetTime", "remaining", "name"],
             },
-            "plurals" : {
-                "rate" : "limit",
+            "plurals": {
+                "rate": "limit",
             },
         },
     }
@@ -215,7 +215,12 @@ class RateLimitingMiddleware(Middleware):
         """
         verb = req.method
         url = req.url
-        username = req.environ["nova.context"].user_id
+        context = req.environ.get("nova.context")
+
+        if context:
+            username = context.user_id
+        else:
+            username = None
 
         delay, error = self._limiter.check_for_delay(verb, url, username)
 
@@ -255,14 +260,12 @@ class Limiter(object):
 
         @return: Tuple of delay (in seconds) and error message (or None, None)
         """
-        def _get_delay_list():
-            """Yield limit delays."""
-            for limit in self.levels[username]:
-                delay = limit(verb, url)
-                if delay:
-                    yield delay, limit.error_message
+        delays = []
 
-        delays = list(_get_delay_list())
+        for limit in self.levels[username]:
+            delay = limit(verb, url)
+            if delay:
+                delays.append((delay, limit.error_message))
 
         if delays:
             delays.sort()
@@ -349,8 +352,6 @@ class WsgiLimiterProxy(object):
 
         resp = conn.getresponse()
 
-        print resp
-
         if 200 >= resp.status < 300:
             return None, None
 
-- 
cgit 


From 659cb8bd43e2091c61f44dacf21274a677ea3146 Mon Sep 17 00:00:00 2001
From: Brian Waldon <brian.waldon@rackspace.com>
Date: Tue, 15 Mar 2011 23:35:44 -0400
Subject: openstack api 1.0 flavors resource now implemented; adding flavors
 request value testing

---
 nova/api/openstack/flavors.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/flavors.py b/nova/api/openstack/flavors.py
index f3d040ba3..c99b945fb 100644
--- a/nova/api/openstack/flavors.py
+++ b/nova/api/openstack/flavors.py
@@ -22,6 +22,7 @@ from nova import context
 from nova.api.openstack import faults
 from nova.api.openstack import common
 from nova.compute import instance_types
+from nova.api.openstack.views import flavors as flavors_views
 from nova import wsgi
 import nova.api.openstack
 
@@ -47,13 +48,18 @@ class Controller(wsgi.Controller):
     def show(self, req, id):
         """Return data about the given flavor id."""
         ctxt = req.environ['nova.context']
-        values = db.instance_type_get_by_flavor_id(ctxt, id)
+        flavor = db.api.instance_type_get_by_flavor_id(ctxt, id)
+        values = {
+            "id": flavor["flavorid"],
+            "name": flavor["name"],
+            "ram": flavor["memory_mb"],
+            "disk": flavor["local_gb"],
+        }
         return dict(flavor=values)
-        raise faults.Fault(exc.HTTPNotFound())
 
     def _all_ids(self, req):
         """Return the list of all flavorids."""
         ctxt = req.environ['nova.context']
-        inst_types = db.instance_type_get_all(ctxt)
+        inst_types = db.api.instance_type_get_all(ctxt)
         flavor_ids = [inst_types[i]['flavorid'] for i in inst_types.keys()]
         return sorted(flavor_ids)
-- 
cgit 


From a586714557e38116b6b4f473aa21ac54ff0223e7 Mon Sep 17 00:00:00 2001
From: Brian Lamar <brian.lamar@rackspace.com>
Date: Wed, 16 Mar 2011 10:10:58 -0400
Subject: Added i18n to error message.

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

(limited to 'nova/api')

diff --git a/nova/api/openstack/limits.py b/nova/api/openstack/limits.py
index c4e04e9d9..1fe519f8a 100644
--- a/nova/api/openstack/limits.py
+++ b/nova/api/openstack/limits.py
@@ -225,7 +225,7 @@ class RateLimitingMiddleware(Middleware):
         delay, error = self._limiter.check_for_delay(verb, url, username)
 
         if delay:
-            msg = "This request was rate-limited."
+            msg = _("This request was rate-limited.")
             retry = time.time() + delay
             return faults.OverLimitFault(msg, error, retry)
 
-- 
cgit 


From 7de1ef791296d547c2691454d5cb5451087cd76b Mon Sep 17 00:00:00 2001
From: Justin Santa Barbara <justin@fathomdb.com>
Date: Wed, 16 Mar 2011 12:15:57 -0700
Subject: User ids are strings, and are not necessarily == name.  Also fix so
 that non-existent user gives a 404, not a 500.

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

(limited to 'nova/api')

diff --git a/nova/api/openstack/users.py b/nova/api/openstack/users.py
index ebd0f4512..d3ab3d553 100644
--- a/nova/api/openstack/users.py
+++ b/nova/api/openstack/users.py
@@ -13,13 +13,14 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import common
+from webob import exc
 
 from nova import exception
 from nova import flags
 from nova import log as logging
 from nova import wsgi
-
+from nova.api.openstack import common
+from nova.api.openstack import faults
 from nova.auth import manager
 
 FLAGS = flags.FLAGS
@@ -63,7 +64,17 @@ class Controller(wsgi.Controller):
 
     def show(self, req, id):
         """Return data about the given user id"""
-        user = self.manager.get_user(id)
+
+        #NOTE(justinsb): The drivers are a little inconsistent in how they
+        #  deal with "NotFound" - some throw, some return None.
+        try:
+            user = self.manager.get_user(id)
+        except exception.NotFound:
+            user = None
+
+        if user is None:
+            raise faults.Fault(exc.HTTPNotFound())
+
         return dict(user=_translate_keys(user))
 
     def delete(self, req, id):
-- 
cgit 


From 732633c93f8d8cf71875d2caf096c9efbcf9dbce Mon Sep 17 00:00:00 2001
From: Dan Prince <dan.prince@rackspace.com>
Date: Thu, 17 Mar 2011 09:55:41 -0400
Subject: Update the Openstack API to handle case where personality is set but
 null in the request to create a server.

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

(limited to 'nova/api')

diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index 3ecd4fb01..bf21ed17f 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -220,6 +220,11 @@ class Controller(wsgi.Controller):
         underlying compute service.
         """
         injected_files = []
+
+        # NOTE(dprince): handle case where 'personality: null' is in JSON req
+        if not personality:
+            return injected_files
+
         for item in personality:
             try:
                 path = item['path']
-- 
cgit 


From f8aa9485fe2048ff916d9dd40478ef0b1486077f Mon Sep 17 00:00:00 2001
From: Dan Prince <dan.prince@rackspace.com>
Date: Thu, 17 Mar 2011 10:45:46 -0400
Subject: Switch back to 'is not None' for personality_files check. (makes mark
 happy)

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

(limited to 'nova/api')

diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index bf21ed17f..6dd66a9a5 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -221,7 +221,6 @@ class Controller(wsgi.Controller):
         """
         injected_files = []
 
-        # NOTE(dprince): handle case where 'personality: null' is in JSON req
         if not personality:
             return injected_files
 
-- 
cgit 


From d31e0f0ad048fbd0374170ea76968859a4c6df34 Mon Sep 17 00:00:00 2001
From: Brian Lamar <brian.lamar@rackspace.com>
Date: Thu, 17 Mar 2011 12:39:09 -0400
Subject: Fixed pep8 violation.

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

(limited to 'nova/api')

diff --git a/nova/api/openstack/faults.py b/nova/api/openstack/faults.py
index d05c61fc7..56f5b8e7e 100644
--- a/nova/api/openstack/faults.py
+++ b/nova/api/openstack/faults.py
@@ -94,5 +94,6 @@ class OverLimitFault(webob.exc.HTTPException):
         """Currently just return the wrapped exception."""
         serializer = wsgi.Serializer(self._serialization_metadata)
         content_type = request.best_match_content_type()
-        self.wrapped_exc.body = serializer.serialize(self.content, content_type)
+        content = serializer.serialize(self.content, content_type)
+        self.wrapped_exc.body = content
         return self.wrapped_exc
-- 
cgit 


From 686e113188aaf8195aed7bea8bf70c21b6bff498 Mon Sep 17 00:00:00 2001
From: Cerberus <matt.dietz@rackspace.com>
Date: Thu, 17 Mar 2011 12:04:49 -0500
Subject: Mapping the resize status

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

(limited to 'nova/api')

diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index 47ed254ec..59234b0de 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -61,7 +61,13 @@ def _translate_detail_keys(inst):
     for k, v in mapped_keys.iteritems():
         inst_dict[k] = inst[v]
 
-    inst_dict['status'] = power_mapping[inst_dict['status']]
+    context = req.environ['nova.context'].elevated()
+    migration = self.db.migrate_get_by_instance_and_status(context,
+            inst['id'], 'finished') 
+    if migration:
+        inst_dict['status'] = 'resize-confirm'
+    else
+        inst_dict['status'] = power_mapping[inst_dict['status']]
     inst_dict['addresses'] = dict(public=[], private=[])
 
     # grab single private fixed ip
-- 
cgit 


From 3afeb8466fa9f005edc9da182b1e0af6ffb00ade Mon Sep 17 00:00:00 2001
From: Cerberus <matt.dietz@rackspace.com>
Date: Thu, 17 Mar 2011 12:05:43 -0500
Subject: Mapping the resize status

---
 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 59234b0de..fd835c247 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -66,7 +66,7 @@ def _translate_detail_keys(inst):
             inst['id'], 'finished') 
     if migration:
         inst_dict['status'] = 'resize-confirm'
-    else
+    else:
         inst_dict['status'] = power_mapping[inst_dict['status']]
     inst_dict['addresses'] = dict(public=[], private=[])
 
-- 
cgit 


From f96dea3da633fc71f16de1bdb95e88249b316e29 Mon Sep 17 00:00:00 2001
From: Brian Lamar <brian.lamar@rackspace.com>
Date: Thu, 17 Mar 2011 13:11:40 -0400
Subject: Pep8 error, oddly specific to pep8 v0.5 < x > v0.6

---
 nova/api/openstack/faults.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/faults.py b/nova/api/openstack/faults.py
index 56f5b8e7e..ccccbd3d2 100644
--- a/nova/api/openstack/faults.py
+++ b/nova/api/openstack/faults.py
@@ -71,9 +71,9 @@ class OverLimitFault(webob.exc.HTTPException):
     _serialization_metadata = {
         "application/xml": {
             "attributes": {
-                "overLimitFault": "code"
-            }
-        }
+                "overLimitFault": "code",
+            },
+        },
     }
 
     def __init__(self, message, details, retry_time):
-- 
cgit 


From 25c407b6ade499dd0bdd470e7fd46682c34a98b7 Mon Sep 17 00:00:00 2001
From: "matt.dietz@rackspace.com" <>
Date: Thu, 17 Mar 2011 19:13:09 +0000
Subject: Get the migration out

---
 nova/api/openstack/servers.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index fd835c247..601a68508 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -20,6 +20,8 @@ import traceback
 from webob import exc
 
 from nova import compute
+from nova import context
+from nova import db
 from nova import exception
 from nova import flags
 from nova import log as logging
@@ -61,12 +63,12 @@ def _translate_detail_keys(inst):
     for k, v in mapped_keys.iteritems():
         inst_dict[k] = inst[v]
 
-    context = req.environ['nova.context'].elevated()
-    migration = self.db.migrate_get_by_instance_and_status(context,
-            inst['id'], 'finished') 
-    if migration:
+    ctxt = context.get_admin_context()
+    try:
+        migration = db.migration_get_by_instance_and_status(ctxt,
+                inst['id'], 'finished') 
         inst_dict['status'] = 'resize-confirm'
-    else:
+    except Exception, e:
         inst_dict['status'] = power_mapping[inst_dict['status']]
     inst_dict['addresses'] = dict(public=[], private=[])
 
-- 
cgit 


From ca267d0e52ed721f1236dc4b6030433fe92d0d51 Mon Sep 17 00:00:00 2001
From: Dan Prince <dan.prince@rackspace.com>
Date: Thu, 17 Mar 2011 15:27:20 -0400
Subject: Move the check for None personalities into the create method.

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

(limited to 'nova/api')

diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index 6dd66a9a5..c6422add4 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -172,8 +172,10 @@ class Controller(wsgi.Controller):
             for k, v in env['server']['metadata'].items():
                 metadata.append({'key': k, 'value': v})
 
-        personality = env['server'].get('personality', [])
-        injected_files = self._get_injected_files(personality)
+        personality = env['server'].get('personality')
+        injected_files = []
+        if personality:
+            injected_files = self._get_injected_files(personality)
 
         try:
             instances = self.compute_api.create(
@@ -221,9 +223,6 @@ class Controller(wsgi.Controller):
         """
         injected_files = []
 
-        if not personality:
-            return injected_files
-
         for item in personality:
             try:
                 path = item['path']
-- 
cgit 


From 3628f50b4ecd2db0377fd9c158248d3b7e8e98ff Mon Sep 17 00:00:00 2001
From: Brian Lamar <brian.lamar@rackspace.com>
Date: Thu, 17 Mar 2011 16:26:52 -0400
Subject: Better comment for fault. Improved readability of two small sections.

---
 nova/api/openstack/faults.py | 5 ++++-
 nova/api/openstack/limits.py | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/faults.py b/nova/api/openstack/faults.py
index ccccbd3d2..0e9c4b26f 100644
--- a/nova/api/openstack/faults.py
+++ b/nova/api/openstack/faults.py
@@ -91,7 +91,10 @@ class OverLimitFault(webob.exc.HTTPException):
 
     @webob.dec.wsgify(RequestClass=wsgi.Request)
     def __call__(self, request):
-        """Currently just return the wrapped exception."""
+        """
+        Return the wrapped exception with a serialized body conforming to our
+        error format.
+        """
         serializer = wsgi.Serializer(self._serialization_metadata)
         content_type = request.best_match_content_type()
         content = serializer.serialize(self.content, content_type)
diff --git a/nova/api/openstack/limits.py b/nova/api/openstack/limits.py
index 1fe519f8a..efc7d193d 100644
--- a/nova/api/openstack/limits.py
+++ b/nova/api/openstack/limits.py
@@ -151,7 +151,7 @@ class Limit(object):
         water = self.water_level
         val = self.value
 
-        self.remaining = math.floor((cap - water) / cap * val)
+        self.remaining = math.floor(((cap - water) / cap) * val)
         self.next_request = now
 
     def _get_time(self):
-- 
cgit 


From f7d5dea09568c6440918264d97ecdbcc316c0ec4 Mon Sep 17 00:00:00 2001
From: Cerberus <matt.dietz@rackspace.com>
Date: Thu, 17 Mar 2011 15:31:48 -0500
Subject: pep8

---
 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 b0e355232..050450457 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -69,7 +69,7 @@ def _translate_detail_keys(inst):
     ctxt = context.get_admin_context()
     try:
         migration = db.migration_get_by_instance_and_status(ctxt,
-                inst['id'], 'finished') 
+                inst['id'], 'finished')
         inst_dict['status'] = 'resize-confirm'
     except Exception, e:
         inst_dict['status'] = power_mapping[inst_dict['status']]
-- 
cgit 


From a50deeb264ff721584d5b0a6ace749d8e2c44842 Mon Sep 17 00:00:00 2001
From: Dan Prince <dan.prince@rackspace.com>
Date: Fri, 18 Mar 2011 10:10:46 -0400
Subject: Change cloud.id_to_ec2_id to ec2utils.id_to_ec2_id. Fixes EC2 API
 error handling when invalid instances and volume names are specified.

---
 nova/api/ec2/__init__.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/ec2/__init__.py b/nova/api/ec2/__init__.py
index fccebca5d..20701cfa8 100644
--- a/nova/api/ec2/__init__.py
+++ b/nova/api/ec2/__init__.py
@@ -31,7 +31,7 @@ from nova import log as logging
 from nova import utils
 from nova import wsgi
 from nova.api.ec2 import apirequest
-from nova.api.ec2 import cloud
+from nova.api.ec2 import ec2utils
 from nova.auth import manager
 
 
@@ -319,13 +319,13 @@ class Executor(wsgi.Application):
         except exception.InstanceNotFound as ex:
             LOG.info(_('InstanceNotFound raised: %s'), unicode(ex),
                      context=context)
-            ec2_id = cloud.id_to_ec2_id(ex.instance_id)
+            ec2_id = ec2utils.id_to_ec2_id(ex.instance_id)
             message = _('Instance %s not found') % ec2_id
             return self._error(req, context, type(ex).__name__, message)
         except exception.VolumeNotFound as ex:
             LOG.info(_('VolumeNotFound raised: %s'), unicode(ex),
                      context=context)
-            ec2_id = cloud.id_to_ec2_id(ex.volume_id, 'vol-%08x')
+            ec2_id = ec2utils.id_to_ec2_id(ex.volume_id, 'vol-%08x')
             message = _('Volume %s not found') % ec2_id
             return self._error(req, context, type(ex).__name__, message)
         except exception.NotFound as ex:
-- 
cgit 


From 2f4c1802c7e482a447d348f049ff429b3d1a640c Mon Sep 17 00:00:00 2001
From: Mark Washenberger <mark.washenberger@rackspace.com>
Date: Fri, 18 Mar 2011 16:06:43 -0400
Subject: fix date formatting in images controller show

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

(limited to 'nova/api')

diff --git a/nova/api/openstack/images.py b/nova/api/openstack/images.py
index 98f0dd96b..94e05823e 100644
--- a/nova/api/openstack/images.py
+++ b/nova/api/openstack/images.py
@@ -143,6 +143,7 @@ class Controller(wsgi.Controller):
 
         image = self._service.show(req.environ['nova.context'], image_id)
         _convert_image_id_to_hash(image)
+        self._format_image_dates(image)
         return dict(image=image)
 
     def delete(self, req, id):
@@ -164,3 +165,8 @@ class Controller(wsgi.Controller):
         # Users may not modify public images, and that's all that
         # we support for now.
         raise faults.Fault(exc.HTTPNotFound())
+
+    def _format_image_dates(self, image):
+        for attr in ['created_at', 'updated_at', 'deleted_at']:
+            if image[attr] is not None:
+                image[attr] = image[attr].strftime('%Y-%m-%dT%H:%M:%SZ')
-- 
cgit 


From 85f50cf496e2c193ddc715f3019b4a4769ab5bd9 Mon Sep 17 00:00:00 2001
From: Brian Waldon <brian.waldon@rackspace.com>
Date: Mon, 21 Mar 2011 15:14:24 -0400
Subject: pep8; various fixes

---
 nova/api/openstack/servers.py       | 1 +
 nova/api/openstack/views/servers.py | 5 ++---
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index e3141934b..dafc096ba 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -513,6 +513,7 @@ class Controller(wsgi.Controller):
 
         return kernel_id, ramdisk_id
 
+
 class ControllerV10(Controller):
     def _image_id_from_req_data(self, data):
         return data['server']['imageId']
diff --git a/nova/api/openstack/views/servers.py b/nova/api/openstack/views/servers.py
index 8d47ac757..078d5d484 100644
--- a/nova/api/openstack/views/servers.py
+++ b/nova/api/openstack/views/servers.py
@@ -67,9 +67,8 @@ class ViewBuilder(object):
 
         # Return the metadata as a dictionary
         metadata = {}
-        if 'metadata' in inst:
-            for item in inst['metadata']:
-                metadata[item['key']] = item['value']
+        for item in inst.get('metadata', []):
+            metadata[item['key']] = item['value']
         inst_dict['metadata'] = metadata
 
         inst_dict['hostId'] = ''
-- 
cgit 


From 39783f386a473ed28c786bb72a29e8403503c40c Mon Sep 17 00:00:00 2001
From: Mark Washenberger <mark.washenberger@rackspace.com>
Date: Mon, 21 Mar 2011 17:09:53 -0400
Subject: make bcwaldon happy

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

(limited to 'nova/api')

diff --git a/nova/api/openstack/images.py b/nova/api/openstack/images.py
index 94e05823e..99c14275a 100644
--- a/nova/api/openstack/images.py
+++ b/nova/api/openstack/images.py
@@ -168,5 +168,5 @@ class Controller(wsgi.Controller):
 
     def _format_image_dates(self, image):
         for attr in ['created_at', 'updated_at', 'deleted_at']:
-            if image[attr] is not None:
+            if image.get(attr) is not None:
                 image[attr] = image[attr].strftime('%Y-%m-%dT%H:%M:%SZ')
-- 
cgit 


From 4b8ed5afd1fd3e616eda0015f9bf16c7097f5476 Mon Sep 17 00:00:00 2001
From: Todd Willey <todd@ansolabs.com>
Date: Tue, 22 Mar 2011 03:13:12 -0400
Subject: vpn changes

---
 nova/api/ec2/admin.py | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/ec2/admin.py b/nova/api/ec2/admin.py
index d9a4ef999..208fe5c4f 100644
--- a/nova/api/ec2/admin.py
+++ b/nova/api/ec2/admin.py
@@ -28,6 +28,7 @@ from nova import exception
 from nova import flags
 from nova import log as logging
 from nova import utils
+from nova.api.ec2 import ec2utils
 from nova.auth import manager
 
 
@@ -92,15 +93,18 @@ def vpn_dict(project, vpn_instance):
           'public_ip': project.vpn_ip,
           'public_port': project.vpn_port}
     if vpn_instance:
-        rv['instance_id'] = vpn_instance['ec2_id']
+        rv['instance_id'] = ec2utils.id_to_ec2_id(vpn_instance['id'])
         rv['created_at'] = utils.isotime(vpn_instance['created_at'])
         address = vpn_instance.get('fixed_ip', None)
         if address:
             rv['internal_ip'] = address['address']
-        if utils.vpn_ping(project.vpn_ip, project.vpn_port):
-            rv['state'] = 'running'
+        if project.vpn_ip and project.vpn_port:
+            if utils.vpn_ping(project.vpn_ip, project.vpn_port):
+                rv['state'] = 'running'
+            else:
+                rv['state'] = 'down'
         else:
-            rv['state'] = 'down'
+            rv['state'] = 'down - invalid project vpn config'
     else:
         rv['state'] = 'pending'
     return rv
@@ -279,7 +283,7 @@ class AdminController(object):
                                          ", ensure it isn't running, and try "
                                          "again in a few minutes")
             instance = self._vpn_for(context, project)
-        return {'instance_id': instance['ec2_id']}
+        return {'instance_id': ec2utils.id_to_ec2_id(instance['id'])}
 
     def describe_vpns(self, context):
         vpns = []
-- 
cgit 


From 4e33ab9fc16d580fbcf57da8e6e2228ad27cc1af Mon Sep 17 00:00:00 2001
From: Naveed Massjouni <naveedm9@gmail.com>
Date: Tue, 22 Mar 2011 11:46:00 -0400
Subject: Adding more docstrings. image_id and instance_type fields of an
 instance will always exist, so no reason to check if keys exist.

---
 nova/api/openstack/__init__.py      |  4 ++++
 nova/api/openstack/views/servers.py | 25 ++++++++++++-------------
 2 files changed, 16 insertions(+), 13 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/__init__.py b/nova/api/openstack/__init__.py
index 35b04f863..21d354f1c 100644
--- a/nova/api/openstack/__init__.py
+++ b/nova/api/openstack/__init__.py
@@ -131,6 +131,8 @@ class APIRouter(wsgi.Router):
 
 
 class APIRouterV10(APIRouter):
+    ''' Defines routes specific to OpenStack API V1.0 '''
+
     def _setup_routes(self, mapper):
         APIRouter._setup_routes(self, mapper)
         mapper.resource("server", "servers",
@@ -140,6 +142,8 @@ class APIRouterV10(APIRouter):
 
 
 class APIRouterV11(APIRouter):
+    ''' Defines routes specific to OpenStack API V1.1 '''
+
     def _setup_routes(self, mapper):
         APIRouter._setup_routes(self, mapper)
         mapper.resource("server", "servers",
diff --git a/nova/api/openstack/views/servers.py b/nova/api/openstack/views/servers.py
index 078d5d484..3100c46b5 100644
--- a/nova/api/openstack/views/servers.py
+++ b/nova/api/openstack/views/servers.py
@@ -34,19 +34,18 @@ class ViewBuilder(object):
         self.addresses_builder = addresses_builder
 
     def build(self, inst, is_detail):
-        """
-        Coerces into dictionary format, mapping everything to
-        Rackspace-like attributes for return
-        """
+        ''' Returns a dict that represenst a server '''
         if is_detail:
             return self._build_detail(inst)
         else:
             return self._build_simple(inst)
 
     def _build_simple(self, inst):
-            return dict(server=dict(id=inst['id'], name=inst['display_name']))
+        ''' Returns a simple model of a server '''
+        return dict(server=dict(id=inst['id'], name=inst['display_name']))
 
     def _build_detail(self, inst):
+        ''' Returns a detailed model of a server '''
         power_mapping = {
             None: 'build',
             power_state.NOSTATE: 'build',
@@ -81,36 +80,36 @@ class ViewBuilder(object):
         return dict(server=inst_dict)
 
     def _build_image(self, response, inst):
+        ''' Returns the image sub-resource of a server '''
         raise NotImplementedError()
 
     def _build_flavor(self, response, inst):
+        ''' Returns the flavor sub-resource of a server '''
         raise NotImplementedError()
 
 
 class ViewBuilderV10(ViewBuilder):
+    ''' Models an Openstack API V1.0 server response '''
+
     def _build_image(self, response, inst):
-        if inst.get('image_id') != None:
-            response['imageId'] = inst['image_id']
+        response['imageId'] = inst['image_id']
 
     def _build_flavor(self, response, inst):
-        if inst.get('instance_type') != None:
-            response['flavorId'] = inst['instance_type']
+        response['flavorId'] = inst['instance_type']
 
 
 class ViewBuilderV11(ViewBuilder):
+    ''' Models an Openstack API V1.0 server response '''
+
     def __init__(self, addresses_builder, flavor_builder, image_builder):
         ViewBuilder.__init__(self, addresses_builder)
         self.flavor_builder = flavor_builder
         self.image_builder = image_builder
 
     def _build_image(self, response, inst):
-        if inst.get('image_id') == None:
-            return
         image_id = inst["image_id"]
         response["imageRef"] = self.image_builder.generate_href(image_id)
 
     def _build_flavor(self, response, inst):
-        if inst.get('instance_type') == None:
-            return
         flavor_id = inst["instance_type"]
         response["flavorRef"] = self.flavor_builder.generate_href(flavor_id)
-- 
cgit 


From 493e87976b7eb273f4115d46c91ad73671abb796 Mon Sep 17 00:00:00 2001
From: Naveed Massjouni <naveedm9@gmail.com>
Date: Tue, 22 Mar 2011 13:18:08 -0400
Subject: Now using urlparse to parse a url to grab id out of it.

---
 nova/api/openstack/common.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/common.py b/nova/api/openstack/common.py
index b224cbfb4..99fba8fef 100644
--- a/nova/api/openstack/common.py
+++ b/nova/api/openstack/common.py
@@ -17,6 +17,7 @@
 
 import re
 from nova import exception
+from urlparse import urlparse
 from webob import exc
 import webob.exc
 
@@ -78,7 +79,7 @@ def get_image_id_from_image_hash(image_service, context, image_hash):
 
 
 def get_id_from_href(href):
-    m = re.match(r'http.+/.+/(\d)+$', href)
-    if not m:
+    try:
+        return int(urlparse(href).path.split('/')[-1])
+    except:
         raise exc.HTTPBadRequest(_('could not parse id from href'))
-    return int(m.group(1))
-- 
cgit 


From 116c0d52d21ebd6ed55a61467aac5d8c06a4b086 Mon Sep 17 00:00:00 2001
From: "matt.dietz@rackspace.com" <>
Date: Tue, 22 Mar 2011 17:46:17 +0000
Subject: Merge stuff

---
 nova/api/openstack/servers.py       | 4 ++--
 nova/api/openstack/views/servers.py | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index db5942e92..f3367e118 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -36,7 +36,7 @@ from nova.api.openstack.views import addresses as addresses_views
 from nova.auth import manager as auth_manager
 from nova.compute import instance_types
 from nova.compute import power_state
-prom nova.quota import QuotaError
+from nova.quota import QuotaError
 import nova.api.openstack
 
 
@@ -44,7 +44,7 @@ LOG = logging.getLogger('server')
 FLAGS = flags.FLAGS
 
 
-plass Controller(wsgi.Controller):
+class Controller(wsgi.Controller):
     """ The Server API controller for the OpenStack API """
 
     _serialization_metadata = {
diff --git a/nova/api/openstack/views/servers.py b/nova/api/openstack/views/servers.py
index 6d54a7a7e..9fd25999a 100644
--- a/nova/api/openstack/views/servers.py
+++ b/nova/api/openstack/views/servers.py
@@ -89,8 +89,9 @@ class ViewBuilder(object):
             migration = db.migration_get_by_instance_and_status(ctxt,
                     inst['id'], 'finished')
             inst_dict['status'] = 'resize-confirm'
-        except Exception, e:
-            inst_dict['status'] = power_mapping[inst_dict['status']]
+        except:
+            pass
+
         inst_dict['addresses'] = self.addresses_builder.build(inst)
 
         # Return the metadata as a dictionary
-- 
cgit 


From 8792383dfbd630388e6a51a76910e73203a3793f Mon Sep 17 00:00:00 2001
From: "matt.dietz@rackspace.com" <>
Date: Tue, 22 Mar 2011 18:24:00 +0000
Subject: Tweak

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

(limited to 'nova/api')

diff --git a/nova/api/openstack/views/servers.py b/nova/api/openstack/views/servers.py
index 9fd25999a..709052f22 100644
--- a/nova/api/openstack/views/servers.py
+++ b/nova/api/openstack/views/servers.py
@@ -16,7 +16,10 @@
 #    under the License.
 
 import hashlib
+
 from nova.compute import power_state
+import nova.context
+from nova import db
 from nova.api.openstack import common
 from nova.api.openstack.views import addresses as addresses_view
 from nova.api.openstack.views import flavors as flavors_view
@@ -86,6 +89,7 @@ class ViewBuilder(object):
 
         inst_dict['status'] = power_mapping[inst_dict['status']]
         try:
+            ctxt = nova.context.get_admin_context()
             migration = db.migration_get_by_instance_and_status(ctxt,
                     inst['id'], 'finished')
             inst_dict['status'] = 'resize-confirm'
-- 
cgit 


From ca37b31d64f9c5cf32ca7e6015176ef36e702dce Mon Sep 17 00:00:00 2001
From: Naveed Massjouni <naveedm9@gmail.com>
Date: Tue, 22 Mar 2011 16:04:27 -0400
Subject: Updating doc strings in accordance with PEP 257. Fixing order of
 imports in common.py.

---
 nova/api/openstack/__init__.py      |  4 ++--
 nova/api/openstack/common.py        | 16 +++++++++++-----
 nova/api/openstack/views/servers.py | 22 ++++++++++++----------
 3 files changed, 25 insertions(+), 17 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/__init__.py b/nova/api/openstack/__init__.py
index 21d354f1c..5f9648210 100644
--- a/nova/api/openstack/__init__.py
+++ b/nova/api/openstack/__init__.py
@@ -131,7 +131,7 @@ class APIRouter(wsgi.Router):
 
 
 class APIRouterV10(APIRouter):
-    ''' Defines routes specific to OpenStack API V1.0 '''
+    """Define routes specific to OpenStack API V1.0."""
 
     def _setup_routes(self, mapper):
         APIRouter._setup_routes(self, mapper)
@@ -142,7 +142,7 @@ class APIRouterV10(APIRouter):
 
 
 class APIRouterV11(APIRouter):
-    ''' Defines routes specific to OpenStack API V1.1 '''
+    """Define routes specific to OpenStack API V1.1."""
 
     def _setup_routes(self, mapper):
         APIRouter._setup_routes(self, mapper)
diff --git a/nova/api/openstack/common.py b/nova/api/openstack/common.py
index 99fba8fef..21ceec45e 100644
--- a/nova/api/openstack/common.py
+++ b/nova/api/openstack/common.py
@@ -15,11 +15,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import re
-from nova import exception
 from urlparse import urlparse
-from webob import exc
-import webob.exc
+
+import webob
+
+from nova import exception
 
 
 def limited(items, request, max_limit=1000):
@@ -79,7 +79,13 @@ def get_image_id_from_image_hash(image_service, context, image_hash):
 
 
 def get_id_from_href(href):
+    """Return the id portion of a url.
+
+    Given: http://www.foo.com/bar/123?q=4
+    Returns: 4
+
+    """
     try:
         return int(urlparse(href).path.split('/')[-1])
     except:
-        raise exc.HTTPBadRequest(_('could not parse id from href'))
+        raise webob.exc.HTTPBadRequest(_('could not parse id from href'))
diff --git a/nova/api/openstack/views/servers.py b/nova/api/openstack/views/servers.py
index 3100c46b5..fad361bd4 100644
--- a/nova/api/openstack/views/servers.py
+++ b/nova/api/openstack/views/servers.py
@@ -25,27 +25,29 @@ from nova import utils
 
 
 class ViewBuilder(object):
-    '''
-    Models a server response as a python dictionary.
+    """Model a server response as a python dictionary.
+
+    Public methods: build
     Abstract methods: _build_image, _build_flavor
-    '''
+
+    """
 
     def __init__(self, addresses_builder):
         self.addresses_builder = addresses_builder
 
     def build(self, inst, is_detail):
-        ''' Returns a dict that represenst a server '''
+        """Return a dict that represenst a server."""
         if is_detail:
             return self._build_detail(inst)
         else:
             return self._build_simple(inst)
 
     def _build_simple(self, inst):
-        ''' Returns a simple model of a server '''
+        """Return a simple model of a server."""
         return dict(server=dict(id=inst['id'], name=inst['display_name']))
 
     def _build_detail(self, inst):
-        ''' Returns a detailed model of a server '''
+        """Returns a detailed model of a server."""
         power_mapping = {
             None: 'build',
             power_state.NOSTATE: 'build',
@@ -80,16 +82,16 @@ class ViewBuilder(object):
         return dict(server=inst_dict)
 
     def _build_image(self, response, inst):
-        ''' Returns the image sub-resource of a server '''
+        """Return the image sub-resource of a server."""
         raise NotImplementedError()
 
     def _build_flavor(self, response, inst):
-        ''' Returns the flavor sub-resource of a server '''
+        """Return the flavor sub-resource of a server."""
         raise NotImplementedError()
 
 
 class ViewBuilderV10(ViewBuilder):
-    ''' Models an Openstack API V1.0 server response '''
+    """Model an Openstack API V1.0 server response."""
 
     def _build_image(self, response, inst):
         response['imageId'] = inst['image_id']
@@ -99,7 +101,7 @@ class ViewBuilderV10(ViewBuilder):
 
 
 class ViewBuilderV11(ViewBuilder):
-    ''' Models an Openstack API V1.0 server response '''
+    """Model an Openstack API V1.0 server response."""
 
     def __init__(self, addresses_builder, flavor_builder, image_builder):
         ViewBuilder.__init__(self, addresses_builder)
-- 
cgit 


From d06bce4b64b57551a722688a4038a4eaffa34278 Mon Sep 17 00:00:00 2001
From: Todd Willey <todd@ansolabs.com>
Date: Tue, 22 Mar 2011 16:34:02 -0400
Subject: typo fix.

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

(limited to 'nova/api')

diff --git a/nova/api/ec2/admin.py b/nova/api/ec2/admin.py
index d9a4ef999..f32d0804f 100644
--- a/nova/api/ec2/admin.py
+++ b/nova/api/ec2/admin.py
@@ -60,7 +60,7 @@ def project_dict(project):
 
 def host_dict(host, compute_service, instances, volume_service, volumes, now):
     """Convert a host model object to a result dict"""
-    rv = {'hostanme': host, 'instance_count': len(instances),
+    rv = {'hostname': host, 'instance_count': len(instances),
           'volume_count': len(volumes)}
     if compute_service:
         latest = compute_service['updated_at'] or compute_service['created_at']
-- 
cgit 


From 846b09925da07c2858052143d5fff4766a782cf1 Mon Sep 17 00:00:00 2001
From: Anthony Young <sleepsonthefloor@gmail.com>
Date: Tue, 22 Mar 2011 22:54:34 -0700
Subject: Fix for lp740742 - format describe_instance_output correctly to
 prevent errors in dashboard

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

(limited to 'nova/api')

diff --git a/nova/api/ec2/admin.py b/nova/api/ec2/admin.py
index 037184b40..d8d90ad83 100644
--- a/nova/api/ec2/admin.py
+++ b/nova/api/ec2/admin.py
@@ -120,7 +120,8 @@ class AdminController(object):
 
     def describe_instance_types(self, context, **_kwargs):
         """Returns all active instance types data (vcpus, memory, etc.)"""
-        return {'instanceTypeSet': [db.instance_type_get_all(context)]}
+        return {'instanceTypeSet': [instance_dict(v) for v in
+                                   db.instance_type_get_all(context).values()]}
 
     def describe_user(self, _context, name, **_kwargs):
         """Returns user data, including access and secret keys."""
-- 
cgit 


From ea92a88b727814698dbc4ebf5dc705677d636445 Mon Sep 17 00:00:00 2001
From: Naveed Massjouni <naveedm9@gmail.com>
Date: Wed, 23 Mar 2011 14:05:21 -0400
Subject: Using super to call parent _setup_routes in APIRouter subclasses.

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

(limited to 'nova/api')

diff --git a/nova/api/openstack/__init__.py b/nova/api/openstack/__init__.py
index 5f9648210..e68110bc4 100644
--- a/nova/api/openstack/__init__.py
+++ b/nova/api/openstack/__init__.py
@@ -134,7 +134,7 @@ class APIRouterV10(APIRouter):
     """Define routes specific to OpenStack API V1.0."""
 
     def _setup_routes(self, mapper):
-        APIRouter._setup_routes(self, mapper)
+        super(APIRouterV10, self)._setup_routes(mapper)
         mapper.resource("server", "servers",
                         controller=servers.ControllerV10(),
                         collection={'detail': 'GET'},
@@ -145,7 +145,7 @@ class APIRouterV11(APIRouter):
     """Define routes specific to OpenStack API V1.1."""
 
     def _setup_routes(self, mapper):
-        APIRouter._setup_routes(self, mapper)
+        super(APIRouterV11, self)._setup_routes(mapper)
         mapper.resource("server", "servers",
                         controller=servers.ControllerV11(),
                         collection={'detail': 'GET'},
-- 
cgit 


From c3d47689a762bfa4aa38c7d4700bb1969d37d1d1 Mon Sep 17 00:00:00 2001
From: "matt.dietz@rackspace.com" <>
Date: Wed, 23 Mar 2011 18:56:23 +0000
Subject: merge prop changes

---
 nova/api/openstack/views/servers.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/views/servers.py b/nova/api/openstack/views/servers.py
index 709052f22..a21a6e7ff 100644
--- a/nova/api/openstack/views/servers.py
+++ b/nova/api/openstack/views/servers.py
@@ -18,6 +18,7 @@
 import hashlib
 
 from nova.compute import power_state
+import nova.compute.api
 import nova.context
 from nova import db
 from nova.api.openstack import common
@@ -87,14 +88,10 @@ class ViewBuilder(object):
         for k, v in mapped_keys.iteritems():
             inst_dict[k] = inst[v]
 
+        ctxt = nova.context.get_admin_context()
         inst_dict['status'] = power_mapping[inst_dict['status']]
-        try:
-            ctxt = nova.context.get_admin_context()
-            migration = db.migration_get_by_instance_and_status(ctxt,
-                    inst['id'], 'finished')
+        if nova.compute.api.has_finished_migration(ctxt, inst['id']):
             inst_dict['status'] = 'resize-confirm'
-        except:
-            pass
 
         inst_dict['addresses'] = self.addresses_builder.build(inst)
 
-- 
cgit 


From 5a5c7d22e7a00c9a3b34f8c08db70b644eee2d92 Mon Sep 17 00:00:00 2001
From: "matt.dietz@rackspace.com" <>
Date: Wed, 23 Mar 2011 19:16:03 +0000
Subject: Unit test cleanup

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

(limited to 'nova/api')

diff --git a/nova/api/openstack/views/servers.py b/nova/api/openstack/views/servers.py
index a21a6e7ff..18d31a29d 100644
--- a/nova/api/openstack/views/servers.py
+++ b/nova/api/openstack/views/servers.py
@@ -18,7 +18,7 @@
 import hashlib
 
 from nova.compute import power_state
-import nova.compute.api
+import nova.compute
 import nova.context
 from nova import db
 from nova.api.openstack import common
@@ -90,7 +90,8 @@ class ViewBuilder(object):
 
         ctxt = nova.context.get_admin_context()
         inst_dict['status'] = power_mapping[inst_dict['status']]
-        if nova.compute.api.has_finished_migration(ctxt, inst['id']):
+        compute_api = nova.compute.API()
+        if compute_api.has_finished_migration(ctxt, inst['id']):
             inst_dict['status'] = 'resize-confirm'
 
         inst_dict['addresses'] = self.addresses_builder.build(inst)
-- 
cgit 


From 8eab4f6ecaf51221b335e76d9e532a1f159c2f2d Mon Sep 17 00:00:00 2001
From: "matt.dietz@rackspace.com" <>
Date: Wed, 23 Mar 2011 19:44:32 +0000
Subject: Forgot extraneous module import

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

(limited to 'nova/api')

diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index f3367e118..d392ab57f 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -23,7 +23,6 @@ from webob import exc
 
 from nova import compute
 from nova import context
-from nova import db
 from nova import exception
 from nova import flags
 from nova import log as logging
-- 
cgit 


From 0218a11bb1d5275d5b99c98aea1edba0f45f56e2 Mon Sep 17 00:00:00 2001
From: "matt.dietz@rackspace.com" <>
Date: Wed, 23 Mar 2011 19:48:26 +0000
Subject: Forgot extraneous module import again

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

(limited to 'nova/api')

diff --git a/nova/api/openstack/views/servers.py b/nova/api/openstack/views/servers.py
index 18d31a29d..68f712e56 100644
--- a/nova/api/openstack/views/servers.py
+++ b/nova/api/openstack/views/servers.py
@@ -20,7 +20,6 @@ import hashlib
 from nova.compute import power_state
 import nova.compute
 import nova.context
-from nova import db
 from nova.api.openstack import common
 from nova.api.openstack.views import addresses as addresses_view
 from nova.api.openstack.views import flavors as flavors_view
-- 
cgit 


From 0d677a9b63ed9b4612379494bf8a58af1c090331 Mon Sep 17 00:00:00 2001
From: Naveed Massjouni <naveedm9@gmail.com>
Date: Wed, 23 Mar 2011 16:51:30 -0400
Subject: Should not call super __init__ twice in APIRouter

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

(limited to 'nova/api')

diff --git a/nova/api/openstack/__init__.py b/nova/api/openstack/__init__.py
index e68110bc4..143b1d2b2 100644
--- a/nova/api/openstack/__init__.py
+++ b/nova/api/openstack/__init__.py
@@ -127,8 +127,6 @@ class APIRouter(wsgi.Router):
         _limits = limits.LimitsController()
         mapper.resource("limit", "limits", controller=_limits)
 
-        super(APIRouter, self).__init__(mapper)
-
 
 class APIRouterV10(APIRouter):
     """Define routes specific to OpenStack API V1.0."""
-- 
cgit 


From f52a2a8a440b303e5289815ab4f6c2d24bfdc59f Mon Sep 17 00:00:00 2001
From: Naveed Massjouni <naveedm9@gmail.com>
Date: Thu, 24 Mar 2011 01:41:38 -0400
Subject: Fixed the docstring for common.get_id_from_href

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

(limited to 'nova/api')

diff --git a/nova/api/openstack/common.py b/nova/api/openstack/common.py
index 21ceec45e..bff050347 100644
--- a/nova/api/openstack/common.py
+++ b/nova/api/openstack/common.py
@@ -79,10 +79,10 @@ def get_image_id_from_image_hash(image_service, context, image_hash):
 
 
 def get_id_from_href(href):
-    """Return the id portion of a url.
+    """Return the id portion of a url as an int.
 
     Given: http://www.foo.com/bar/123?q=4
-    Returns: 4
+    Returns: 123
 
     """
     try:
-- 
cgit