Merge lp:~smoser/nova/lp849160 into lp:~hudson-openstack/nova/trunk

[Scott Moser]

Adding flavor extra data extension.

[Devin Carlen (devcamcar)]

yay, lgtm

review: Approve

[Brian Waldon (bcwaldon)]

I'm not against exposing these properties, but we need to do it properly:

1) We need to register this as an extension. Just an ExtensionDescriptor is necessary, this doesn't need to be an optional extension
2) The tests need to be updated. Currently, they do not pass.

review: Needs Fixing

[lp:~smoser/nova/lp849160]

1557. By Scott Moser on 2011-09-13

make tests pass

1558. By Scott Moser on 2011-09-14

add extension description for FlavorExtraData

1559. By Scott Moser on 2011-09-14

fix test_extensions test to know of new extension FlavorExtraData

1560. By Scott Moser on 2011-09-14

fix white space for pep8

1561. By Scott Moser on 2011-09-14

add attributes to xml api

1562. By Scott Moser on 2011-09-14

resolve conflicts / merge with trunk revno 1569

1563. By Scott Moser on 2011-09-14

update variable name after merge: flavor_node -> flavor_elem

1564. By Scott Moser on 2011-09-14

make xml-api tests pass

1565. By Scott Moser on 2011-09-14

flavor_elem.setAttribute -> flavor_elem.set, flavor -> flavor_dict

1566. By Scott Moser on 2011-09-14

add necessary fields to flavor.rng schema

1567. By Scott Moser on 2011-09-14

fix pep8 whitespace error

[Scott Moser (smoser)]

Ok, i'm finally at the point where all the tests pass and the json and xml output now has these additional fields.
I've updated the flavor.rng schema to match the new output also.

In short, I think this is now *actually* ready for review.

[Brian Waldon (bcwaldon)]

This is great, Scott. One very minor thing I would like you to change is line 22 in the diff. Can you remove "vcpus" from that module-level comment? Once you fix that, I'll approve.

[Scott Moser (smoser)]

On Wed, 14 Sep 2011, Brian Waldon wrote:

> This is great, Scott. One very minor thing I would like you to change is line 22 in the diff. Can you remove "vcpus" from that module-level comment? Once you fix that, I'll approve.

I assume you're meaning:
  The Flavor extra data extension
  Openstack API version 1.1 lists "name", "ram", "disk", "vcpus" as flavor
  attributes. This extension adds to that list:
    rxtx_cap
    rxtx_quota
    swap

I explicitly listed 'vcpus' there as they *are* listed in the 1.1 spec
that I read (os-compute-devguide-cactus.pdf).

I'm definitely OK to move that to the 'adds' list, if thats where it
should go.

[Brian Waldon (bcwaldon)]

Thanks, Scott. Sorry for the confusion!

review: Approve

=== added file 'nova/api/openstack/contrib/flavorextradata.py'
--- nova/api/openstack/contrib/flavorextradata.py	1970-01-01 00:00:00 +0000
+++ nova/api/openstack/contrib/flavorextradata.py	2011-09-14 19:00:25 +0000
@@ -0,0 +1,46 @@
+# Copyright 2011 Canonical Ltd.
+# 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.
+
+"""
+The Flavor extra data extension
+Openstack API version 1.1 lists "name", "ram", "disk", "vcpus" as flavor
+attributes.  This extension adds to that list:
+   rxtx_cap
+   rxtx_quota
+   swap
+"""
+
+from nova.api.openstack import extensions
+
+
+class Flavorextradata(extensions.ExtensionDescriptor):
+    """The Flavor extra data extension for the OpenStack API."""
+
+    def get_name(self):
+        return "FlavorExtraData"
+
+    def get_alias(self):
+        return "os-flavor-extra-data"
+
+    def get_description(self):
+        return "Provide additional data for flavors"
+
+    def get_namespace(self):
+        return "http://docs.openstack.org/ext/flavor_extra_data/api/v1.1"
+
+    def get_updated(self):
+        return "2011-09-14T00:00:00+00:00"
+
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
=== modified file 'nova/api/openstack/flavors.py'
--- nova/api/openstack/flavors.py	2011-08-25 20:35:04 +0000
+++ nova/api/openstack/flavors.py	2011-09-14 19:00:25 +0000
@@ -92,6 +92,10 @@
         if detailed:
             flavor_elem.set('ram', str(flavor_dict['ram']))
             flavor_elem.set('disk', str(flavor_dict['disk']))
+
+            for attr in ("vcpus", "swap", "rxtx_quota", "rxtx_cap"):
+                flavor_elem.set(attr, str(flavor_dict.get(attr, "")))
+
         for link in flavor_dict.get('links', []):
             elem = etree.SubElement(flavor_elem,
                                     '{%s}link' % xmlutil.XMLNS_ATOM)
 
=== modified file 'nova/api/openstack/schemas/v1.1/flavor.rng'
--- nova/api/openstack/schemas/v1.1/flavor.rng	2011-08-24 18:08:25 +0000
+++ nova/api/openstack/schemas/v1.1/flavor.rng	2011-09-14 19:00:25 +0000
@@ -4,6 +4,10 @@
   <attribute name="id">      <text/> </attribute>
   <attribute name="ram"> <text/> </attribute>
   <attribute name="disk">   <text/> </attribute>
+  <attribute name="rxtx_cap">   <text/> </attribute>
+  <attribute name="rxtx_quota">   <text/> </attribute>
+  <attribute name="swap">   <text/> </attribute>
+  <attribute name="vcpus">   <text/> </attribute>
   <zeroOrMore>
     <externalRef href="../atom-link.rng"/>
   </zeroOrMore>
 
=== modified file 'nova/api/openstack/views/flavors.py'
--- nova/api/openstack/views/flavors.py	2011-08-09 23:26:35 +0000
+++ nova/api/openstack/views/flavors.py	2011-09-14 19:00:25 +0000
@@ -50,6 +50,9 @@
             "disk": flavor_obj["local_gb"],
         }
 
+        for key in ("vcpus", "swap", "rxtx_quota", "rxtx_cap"):
+            detail[key] = flavor_obj.get(key, "")
+
         detail.update(simple)
 
         return detail
 
=== modified file 'nova/tests/api/openstack/test_extensions.py'
--- nova/tests/api/openstack/test_extensions.py	2011-08-30 19:41:30 +0000
+++ nova/tests/api/openstack/test_extensions.py	2011-09-14 19:00:25 +0000
@@ -87,6 +87,7 @@
         self.ext_list = [
             "Createserverext",
             "FlavorExtraSpecs",
+            "FlavorExtraData",
             "Floating_ips",
             "Fox In Socks",
             "Hosts",
 
=== modified file 'nova/tests/api/openstack/test_flavors.py'
--- nova/tests/api/openstack/test_flavors.py	2011-08-25 20:35:04 +0000
+++ nova/tests/api/openstack/test_flavors.py	2011-09-14 19:00:25 +0000
@@ -112,12 +112,20 @@
                 "name": "flavor 1",
                 "ram": "256",
                 "disk": "10",
+                "rxtx_cap": "",
+                "rxtx_quota": "",
+                "swap": "",
+                "vcpus": "",
             },
             {
                 "id": "2",
                 "name": "flavor 2",
                 "ram": "256",
                 "disk": "10",
+                "rxtx_cap": "",
+                "rxtx_quota": "",
+                "swap": "",
+                "vcpus": "",
             },
         ]
         self.assertEqual(flavors, expected)
@@ -132,6 +140,10 @@
             "name": "flavor 12",
             "ram": "256",
             "disk": "10",
+            "rxtx_cap": "",
+            "rxtx_quota": "",
+            "swap": "",
+            "vcpus": "",
         }
         self.assertEqual(flavor, expected)
 
@@ -154,6 +166,10 @@
                 "name": "flavor 12",
                 "ram": "256",
                 "disk": "10",
+                "rxtx_cap": "",
+                "rxtx_quota": "",
+                "swap": "",
+                "vcpus": "",
                 "links": [
                     {
                         "rel": "self",
@@ -221,6 +237,10 @@
                     "name": "flavor 1",
                     "ram": "256",
                     "disk": "10",
+                    "rxtx_cap": "",
+                    "rxtx_quota": "",
+                    "swap": "",
+                    "vcpus": "",
                     "links": [
                         {
                             "rel": "self",
@@ -237,6 +257,10 @@
                     "name": "flavor 2",
                     "ram": "256",
                     "disk": "10",
+                    "rxtx_cap": "",
+                    "rxtx_quota": "",
+                    "swap": "",
+                    "vcpus": "",
                     "links": [
                         {
                             "rel": "self",
@@ -276,6 +300,10 @@
                 "name": "asdf",
                 "ram": "256",
                 "disk": "10",
+                "rxtx_cap": "",
+                "rxtx_quota": "",
+                "swap": "",
+                "vcpus": "",
                 "links": [
                     {
                         "rel": "self",
@@ -303,6 +331,10 @@
                 "name": "asdf",
                 "ram": "256",
                 "disk": "10",
+                "rxtx_cap": "",
+                "rxtx_quota": "",
+                "swap": "",
+                "vcpus": "",
                 "links": [
                     {
                         "rel": "self",
@@ -340,6 +372,10 @@
                 "name": "asdf",
                 "ram": 256,
                 "disk": 10,
+                "rxtx_cap": "",
+                "rxtx_quota": "",
+                "swap": "",
+                "vcpus": "",
                 "links": [
                     {
                         "rel": "self",
@@ -378,6 +414,10 @@
                     "name": "flavor 23",
                     "ram": "512",
                     "disk": "20",
+                    "rxtx_cap": "",
+                    "rxtx_quota": "",
+                    "swap": "",
+                    "vcpus": "",
                     "links": [
                         {
                             "rel": "self",
@@ -393,6 +433,10 @@
                     "name": "flavor 13",
                     "ram": "256",
                     "disk": "10",
+                    "rxtx_cap": "",
+                    "rxtx_quota": "",
+                    "swap": "",
+                    "vcpus": "",
                     "links": [
                         {
                             "rel": "self",
@@ -435,6 +479,10 @@
                     "name": "flavor 23",
                     "ram": "512",
                     "disk": "20",
+                    "rxtx_cap": "",
+                    "rxtx_quota": "",
+                    "swap": "",
+                    "vcpus": "",
                     "links": [
                         {
                             "rel": "self",
@@ -450,6 +498,10 @@
                     "name": "flavor 13",
                     "ram": "256",
                     "disk": "10",
+                    "rxtx_cap": "",
+                    "rxtx_quota": "",
+                    "swap": "",
+                    "vcpus": "",
                     "links": [
                         {
                             "rel": "self",