Merge lp:~ken-pepple/nova/dynamicinstancetypes into lp:~hudson-openstack/nova/trunk

[Ken Pepple]

merges dynamic instance types blueprint (http://wiki.openstack.org/ConfigureInstanceTypesDynamically) and bundles blueprint (https://blueprints.launchpad.net/nova/+spec/flavors)

This allows admins to manipulate instance types at runtime via the nova-manage command.

See http://wiki.openstack.org/ConfigureInstanceTypesDynamically the full spec.

[Devin Carlen (devcamcar)]

There are a few merge conflicts that need resolving.

review: Needs Fixing

[Ken Pepple (ken-pepple)]

> There are a few merge conflicts that need resolving.

sorry ... we merged yesterday but didn't see the zones blueprint come in.
i've merged but now we are deadlocked on migration numbering ... 005- has been taken by justinsb but hasn't merged yet, so our DB won't migrate (we are 006-) and tests don't run. going to go against the usual rule of "don't commit/push if tests don't run" ...

[Jay Pipes (jaypipes)]

Hi Ken,

Are you currently working on this branch? If so, please set the merge proposal status to Work In Progress, and then, after bzr push'ing any changes to LP, set the merge proposal status back to Needs Review. This will trigger emails to reviewers to re-review the branch.

Cheers!
jay

[Ken Pepple (ken-pepple)]

> Are you currently working on this branch? If so, please set the merge proposal
> status to Work In Progress, and then, after bzr push'ing any changes to LP,
> set the merge proposal status back to Needs Review. This will trigger emails
> to reviewers to re-review the branch.

I think I did the "wip" to "needs review" flip in the wrong order ... this should be ready for code review at revno 670.

thanks
/k

[Ken Pepple (ken-pepple)]

updated and should be ready for review at revno 682

[Josh Kearney (jk0)]

Looks good - I just have one little nit: the copyright headers in the new files should have a name and year in them (someone correct me if this is not true).

[Ken Pepple (ken-pepple)]

soooo ... i have questions about the copyrights: many of the files have NASA copyrights. i haven't included them on the new files as i don't work for NASA and have no standing to assign them copyright. what is the standard here ?

[Josh Kearney (jk0)]

> soooo ... i have questions about the copyrights: many of the files have NASA
> copyrights. i haven't included them on the new files as i don't work for NASA
> and have no standing to assign them copyright. what is the standard here ?

We've been using "Copyright 2011 OpenStack LLC".

[Eric Day (eday)]

Each file has it's own copyright. If you've written it from scratch,
you put Copyright 2011 <name> (name will be a person or some other
legal entity such as a company, depending on who's time it is). If
you make significant changes to existing files, you can also add a
copyright line to those files (never remove a line though).

-Eric

On Tue, Mar 01, 2011 at 06:08:14PM -0000, Ken Pepple wrote:
> soooo ... i have questions about the copyrights: many of the files have NASA copyrights. i haven't included them on the new files as i don't work for NASA and have no standing to assign them copyright. what is the standard here ?
> --
> https://code.launchpad.net/~ken-pepple/nova/dynamicinstancetypes/+merge/50257
> Your team Nova Core is requested to review the proposed merge of lp:~ken-pepple/nova/dynamicinstancetypes into lp:nova.

[Eric Day (eday)]

On Tue, Mar 01, 2011 at 06:12:28PM -0000, Josh Kearney wrote:
> We've been using "Copyright 2011 OpenStack LLC".

This really only applies to Rackspace employees for now, or folks who
wish to (and have the ability to) transfer all copyright ownership
to OpenStack LLC.

-Eric

[Josh Kearney (jk0)]

> On Tue, Mar 01, 2011 at 06:12:28PM -0000, Josh Kearney wrote:
> > We've been using "Copyright 2011 OpenStack LLC".
>
> This really only applies to Rackspace employees for now, or folks who
> wish to (and have the ability to) transfer all copyright ownership
> to OpenStack LLC.
>
> -Eric

Ah, that makes sense.

So Ken, feel free to use your name. :)

[Ken Pepple (ken-pepple)]

okay, i am going to add "Copyright 2011 Ken Pepple <email address hidden>" to the following files:

 - doc/source/runnova/managing.instance.types.rst
 - nova/db/sqlalchemy/migrate_repo/versions/007_add_instance_types.py
 - nova/compute/instance_types.py (leaving the current ones also)
 - nova/tests/test_instance_types.py

i'll wait to push this until others have weighed in.

[Eric Day (eday)]

Just one little thing, you shouldn't put your email address in the
copyright line. Email addresses should go in the Authors file. :)

-Eric

On Tue, Mar 01, 2011 at 06:27:57PM -0000, Ken Pepple wrote:
> okay, i am going to add "Copyright 2011 Ken Pepple <email address hidden>" to the following files:
>
> - doc/source/runnova/managing.instance.types.rst
> - nova/db/sqlalchemy/migrate_repo/versions/007_add_instance_types.py
> - nova/compute/instance_types.py (leaving the current ones also)
> - nova/tests/test_instance_types.py
>
> i'll wait to push this until others have weighed in.
> --
> https://code.launchpad.net/~ken-pepple/nova/dynamicinstancetypes/+merge/50257
> Your team Nova Core is requested to review the proposed merge of lp:~ken-pepple/nova/dynamicinstancetypes into lp:nova.

[Ken Pepple (ken-pepple)]

ok, "Copyright 2011 Ken Pepple" it is.

[Josh Kearney (jk0)]

Looks great, thanks Ken!

review: Approve

[Devin Carlen (devcamcar)]

33 + def create(
34 + self,
35 + name,
36 + memory,
37 + vcpus,
38 + local_gb,
39 + flavorid,
40 + swap=0,
41 + rxtx_quota=0,
42 + rxtx_cap=0):

Style nit. Nova uses this style:

def create(self, name, ...
           etc, etc, etc=0)

640 def describe_instance_types(self, _context, **_kwargs):

Change _context to context. _ is used to indicate that a variable isn't being used.

160 -source/api/nova..adminclient.rst
161 -source/api/nova..api.direct.rst
162 -source/api/nova..api.ec2.admin.rst
163 -source/api/nova..api.ec2.apirequest.rst
164 -source/api/nova..api.ec2.cloud.rst
165 -source/api/nova..api.ec2.metadatarequesthandler.rst

Why are all of these removed? There are a lot more.

697 + def create(self, req):
698 + """Create a flavor."""
699 + #TODO(jk0): Finish this later

Probably better to raise a NotImplemented here rather than give a false positive to the user.

723 + flavor_ids = [inst_types[i]['flavorid'] for i in inst_types.keys()]

We should sort this somehow. inst_types.keys() will be pretty much random because of the way python handles dicts. Wrapping in a sorted() is probably good enough.

797 + dict(
798 + name=name,

Style nit, use dict(name=name,
                    ...

806 + except exception.DBError:
807 + raise exception.ApiError(_("Cannot create instance type: %s"),
808 + name)

We are losing the original exception completely in this case. Let's at least have a log.exception() before the re-raise.

687 + # FIXME(kpepple) do we really need admin context here ?
688 + ctxt = context.get_admin_context()

Use req.environ['nova.context'] for context in OpenStack API.

807 + raise exception.ApiError(_("Cannot create instance type: %s"),
808 + name)

This looks odd somehow. Is name supposed to be a param to _() or ApiError()?

954 +def instance_type_create(context, values):

When context isn't used, prefix it with _. In general if a variable on a function isn't used for some reason, it gets prefixed with a _.

review: Needs Fixing

[Devin Carlen (devcamcar)]

lgtm

review: Approve

[OpenStack Infra (hudson-openstack)]

The attempt to merge lp:~ken-pepple/nova/dynamicinstancetypes into lp:nova failed. Below is the output from the failed tests.

ERROR

======================================================================
ERROR: <nose.suite.ContextSuite context=nova.tests>
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/lib/pymodules/python2.6/nose/suite.py", line 183, in run
    self.setUp()
  File "/usr/lib/pymodules/python2.6/nose/suite.py", line 264, in setUp
    self.setupContext(ancestor)
  File "/usr/lib/pymodules/python2.6/nose/suite.py", line 287, in setupContext
    try_run(context, names)
  File "/usr/lib/pymodules/python2.6/nose/util.py", line 487, in try_run
    return func()
  File "/tmp/tmpuJJxJt/nova/tests/__init__.py", line 54, in setup
    migration.db_sync()
  File "/tmp/tmpuJJxJt/nova/db/migration.py", line 33, in db_sync
    return IMPL.db_sync(version=version)
  File "/tmp/tmpuJJxJt/nova/db/sqlalchemy/migration.py", line 41, in db_sync
    db_version()
  File "/tmp/tmpuJJxJt/nova/db/sqlalchemy/migration.py", line 49, in db_version
    return versioning_api.db_version(FLAGS.sql_connection, repo_path)
  File "<string>", line 2, in db_version
  File "/usr/lib/pymodules/python2.6/migrate/versioning/util/__init__.py", line 160, in with_engine
    return f(*a, **kw)
  File "/usr/lib/pymodules/python2.6/migrate/versioning/api.py", line 147, in db_version
    schema = ControlledSchema(engine, repository)
  File "/usr/lib/pymodules/python2.6/migrate/versioning/schema.py", line 26, in __init__
    repository = Repository(repository)
  File "/usr/lib/pymodules/python2.6/migrate/versioning/repository.py", line 80, in __init__
    self._versions))
  File "/usr/lib/pymodules/python2.6/migrate/versioning/version.py", line 83, in __init__
    self.versions[VerNum(num)] = Version(num, path, files)
  File "/usr/lib/pymodules/python2.6/migrate/versioning/version.py", line 153, in __init__
    self.add_script(os.path.join(path, script))
  File "/usr/lib/pymodules/python2.6/migrate/versioning/version.py", line 174, in add_script
    self._add_script_py(path)
  File "/usr/lib/pymodules/python2.6/migrate/versioning/version.py", line 197, in _add_script_py
    'per version, but you have: %s and %s' % (self.python, path))
ScriptError: You can only have one Python script per version, but you have: /tmp/tmpuJJxJt/nova/db/sqlalchemy/migrate_repo/versions/007_add_instance_types.py and /tmp/tmpuJJxJt/nova/db/sqlalchemy/migrate_repo/versions/007_add_ipv6_to_fixed_ips.py
-------------------- >> begin captured logging << --------------------
2011-03-03 01:47:27,391 DEBUG nova.utils [-] backend <module 'nova.db.sqlalchemy.migration' from '/tmp/tmpuJJxJt/nova/db/sqlalchemy/migration.py'> from (pid=20562) __get_backend /tmp/tmpuJJxJt/nova/utils.py:376
2011-03-03 01:47:27,391 DEBUG migrate.versioning.util [-] Constructing engine from (pid=20562) construct_engine /usr/lib/pymodules/python2.6/migrate/versioning/util/__init__.py:138
2011-03-03 01:47:27,396 DEBUG migrate.versioning.repository [-] Loading repository /tmp/tmpuJJxJt/nova/db/sqlalchemy/migrate_repo... from (pid=20562) __init__ /usr/lib/pymodules...

[lp:~ken-pepple/nova/dynamicinstancetypes]

698. By Ken Pepple on 2011-03-03

merged trunk

699. By Ken Pepple on 2011-03-03

moved migration to 008 (sigh)

=== modified file 'bin/nova-manage'
--- bin/nova-manage	2011-02-26 09:05:03 +0000
+++ bin/nova-manage	2011-03-03 01:57:15 +0000
@@ -84,6 +84,7 @@
 from nova.api.ec2.cloud import ec2_id_to_id
 from nova.auth import manager
 from nova.cloudpipe import pipelib
+from nova.compute import instance_types
 from nova.db import migration
 
 FLAGS = flags.FLAGS
@@ -661,6 +662,79 @@
                            "mountpoint": volume['mountpoint']}})
 
 
+class InstanceTypeCommands(object):
+    """Class for managing instance types / flavors."""
+
+    def _print_instance_types(self, n, val):
+        deleted = ('', ', inactive')[val["deleted"] == 1]
+        print ("%s: Memory: %sMB, VCPUS: %s, Storage: %sGB, FlavorID: %s, "
+            "Swap: %sGB, RXTX Quota: %sGB, RXTX Cap: %sMB%s") % (
+            n, val["memory_mb"], val["vcpus"], val["local_gb"],
+            val["flavorid"], val["swap"], val["rxtx_quota"],
+            val["rxtx_cap"], deleted)
+
+    def create(self, name, memory, vcpus, local_gb, flavorid,
+               swap=0, rxtx_quota=0, rxtx_cap=0):
+        """Creates instance types / flavors
+           arguments: name memory vcpus local_gb flavorid [swap] [rxtx_quota]
+                      [rxtx_cap]
+        """
+        try:
+            instance_types.create(name, memory, vcpus, local_gb,
+                                  flavorid, swap, rxtx_quota, rxtx_cap)
+        except exception.InvalidInputException:
+            print "Must supply valid parameters to create instance type"
+            print e
+            sys.exit(1)
+        except exception.DBError, e:
+            print "DB Error: %s" % e
+            sys.exit(2)
+        except:
+            print "Unknown error"
+            sys.exit(3)
+        else:
+            print "%s created" % name
+
+    def delete(self, name, purge=None):
+        """Marks instance types / flavors as deleted
+        arguments: name"""
+        try:
+            if purge == "--purge":
+                instance_types.purge(name)
+                verb = "purged"
+            else:
+                instance_types.destroy(name)
+                verb = "deleted"
+        except exception.ApiError:
+            print "Valid instance type name is required"
+            sys.exit(1)
+        except exception.DBError, e:
+            print "DB Error: %s" % e
+            sys.exit(2)
+        except:
+            sys.exit(3)
+        else:
+            print "%s %s" % (name, verb)
+
+    def list(self, name=None):
+        """Lists all active or specific instance types / flavors
+        arguments: [name]"""
+        try:
+            if name == None:
+                inst_types = instance_types.get_all_types()
+            elif name == "--all":
+                inst_types = instance_types.get_all_types(1)
+            else:
+                inst_types = instance_types.get_instance_type(name)
+        except exception.DBError, e:
+            _db_error(e)
+        if isinstance(inst_types.values()[0], dict):
+            for k, v in inst_types.iteritems():
+                self._print_instance_types(k, v)
+        else:
+            self._print_instance_types(name, inst_types)
+
+
 CATEGORIES = [
     ('user', UserCommands),
     ('project', ProjectCommands),
@@ -673,7 +747,9 @@
     ('service', ServiceCommands),
     ('log', LogCommands),
     ('db', DbCommands),
-    ('volume', VolumeCommands)]
+    ('volume', VolumeCommands),
+    ('instance_type', InstanceTypeCommands),
+    ('flavor', InstanceTypeCommands)]
 
 
 def lazy_match(name, key_value_tuples):

=== modified file 'doc/.autogenerated'
--- doc/.autogenerated	2011-02-21 20:30:20 +0000
+++ doc/.autogenerated	2011-03-03 01:57:15 +0000
@@ -40,6 +40,9 @@
 source/api/nova..db.sqlalchemy.migrate_repo.versions.002_bexar.rst
 source/api/nova..db.sqlalchemy.migrate_repo.versions.003_add_label_to_networks.rst
 source/api/nova..db.sqlalchemy.migrate_repo.versions.004_add_zone_tables.rst
+source/api/nova..db.sqlalchemy.migrate_repo.versions.005_add_instance_metadata.rst
+source/api/nova..db.sqlalchemy.migrate_repo.versions.006_add_provider_data_to_volumes.rst
+source/api/nova..db.sqlalchemy.migrate_repo.versions.007_add_instance_types.rst
 source/api/nova..db.sqlalchemy.migration.rst
 source/api/nova..db.sqlalchemy.models.rst
 source/api/nova..db.sqlalchemy.session.rst
@@ -98,6 +101,7 @@
 source/api/nova..tests.test_console.rst
 source/api/nova..tests.test_direct.rst
 source/api/nova..tests.test_flags.rst
+source/api/nova..tests.test_instance_types.rst
 source/api/nova..tests.test_localization.rst
 source/api/nova..tests.test_log.rst
 source/api/nova..tests.test_middleware.rst
@@ -107,7 +111,9 @@
 source/api/nova..tests.test_rpc.rst
 source/api/nova..tests.test_scheduler.rst
 source/api/nova..tests.test_service.rst
+source/api/nova..tests.test_test.rst
 source/api/nova..tests.test_twistd.rst
+source/api/nova..tests.test_utils.rst
 source/api/nova..tests.test_virt.rst
 source/api/nova..tests.test_volume.rst
 source/api/nova..tests.test_xenapi.rst
@@ -176,209 +182,80 @@
 source/api/nova..db.sqlalchemy.migrate_repo.versions.002_bexar.rst
 source/api/nova..db.sqlalchemy.migrate_repo.versions.003_add_label_to_networks.rst
 source/api/nova..db.sqlalchemy.migrate_repo.versions.004_add_zone_tables.rst
-source/api/nova..db.sqlalchemy.migration.rst
-source/api/nova..db.sqlalchemy.models.rst
-source/api/nova..db.sqlalchemy.session.rst
-source/api/nova..exception.rst
-source/api/nova..fakememcache.rst
-source/api/nova..fakerabbit.rst
-source/api/nova..flags.rst
-source/api/nova..image.glance.rst
-source/api/nova..image.local.rst
-source/api/nova..image.s3.rst
-source/api/nova..image.service.rst
-source/api/nova..log.rst
-source/api/nova..manager.rst
-source/api/nova..network.api.rst
-source/api/nova..network.linux_net.rst
-source/api/nova..network.manager.rst
-source/api/nova..objectstore.bucket.rst
-source/api/nova..objectstore.handler.rst
-source/api/nova..objectstore.image.rst
-source/api/nova..objectstore.stored.rst
-source/api/nova..quota.rst
-source/api/nova..rpc.rst
-source/api/nova..scheduler.chance.rst
-source/api/nova..scheduler.driver.rst
-source/api/nova..scheduler.manager.rst
-source/api/nova..scheduler.simple.rst
-source/api/nova..scheduler.zone.rst
-source/api/nova..service.rst
-source/api/nova..test.rst
-source/api/nova..tests.api.openstack.fakes.rst
-source/api/nova..tests.api.openstack.test_adminapi.rst
-source/api/nova..tests.api.openstack.test_api.rst
-source/api/nova..tests.api.openstack.test_auth.rst
-source/api/nova..tests.api.openstack.test_common.rst
-source/api/nova..tests.api.openstack.test_faults.rst
-source/api/nova..tests.api.openstack.test_flavors.rst
-source/api/nova..tests.api.openstack.test_images.rst
-source/api/nova..tests.api.openstack.test_ratelimiting.rst
-source/api/nova..tests.api.openstack.test_servers.rst
-source/api/nova..tests.api.openstack.test_shared_ip_groups.rst
-source/api/nova..tests.api.openstack.test_zones.rst
-source/api/nova..tests.api.test_wsgi.rst
-source/api/nova..tests.db.fakes.rst
-source/api/nova..tests.declare_flags.rst
-source/api/nova..tests.fake_flags.rst
-source/api/nova..tests.glance.stubs.rst
-source/api/nova..tests.hyperv_unittest.rst
-source/api/nova..tests.objectstore_unittest.rst
-source/api/nova..tests.real_flags.rst
-source/api/nova..tests.runtime_flags.rst
-source/api/nova..tests.test_access.rst
-source/api/nova..tests.test_api.rst
-source/api/nova..tests.test_auth.rst
-source/api/nova..tests.test_cloud.rst
-source/api/nova..tests.test_compute.rst
-source/api/nova..tests.test_console.rst
-source/api/nova..tests.test_direct.rst
-source/api/nova..tests.test_flags.rst
-source/api/nova..tests.test_localization.rst
-source/api/nova..tests.test_log.rst
-source/api/nova..tests.test_middleware.rst
-source/api/nova..tests.test_misc.rst
-source/api/nova..tests.test_network.rst
-source/api/nova..tests.test_quota.rst
-source/api/nova..tests.test_rpc.rst
-source/api/nova..tests.test_scheduler.rst
-source/api/nova..tests.test_service.rst
-source/api/nova..tests.test_twistd.rst
-source/api/nova..tests.test_virt.rst
-source/api/nova..tests.test_volume.rst
-source/api/nova..tests.test_xenapi.rst
-source/api/nova..tests.xenapi.stubs.rst
-source/api/nova..twistd.rst
-source/api/nova..utils.rst
-source/api/nova..version.rst
-source/api/nova..virt.connection.rst
-source/api/nova..virt.disk.rst
-source/api/nova..virt.fake.rst
-source/api/nova..virt.hyperv.rst
-source/api/nova..virt.images.rst
-source/api/nova..virt.libvirt_conn.rst
-source/api/nova..virt.xenapi.fake.rst
-source/api/nova..virt.xenapi.network_utils.rst
-source/api/nova..virt.xenapi.vm_utils.rst
-source/api/nova..virt.xenapi.vmops.rst
-source/api/nova..virt.xenapi.volume_utils.rst
-source/api/nova..virt.xenapi.volumeops.rst
-source/api/nova..virt.xenapi_conn.rst
-source/api/nova..volume.api.rst
-source/api/nova..volume.driver.rst
-source/api/nova..volume.manager.rst
-source/api/nova..volume.san.rst
-source/api/nova..wsgi.rst
-source/api/nova..adminclient.rst
-source/api/nova..api.direct.rst
-source/api/nova..api.ec2.admin.rst
-source/api/nova..api.ec2.apirequest.rst
-source/api/nova..api.ec2.cloud.rst
-source/api/nova..api.ec2.metadatarequesthandler.rst
-source/api/nova..api.openstack.auth.rst
-source/api/nova..api.openstack.backup_schedules.rst
-source/api/nova..api.openstack.common.rst
-source/api/nova..api.openstack.consoles.rst
-source/api/nova..api.openstack.faults.rst
-source/api/nova..api.openstack.flavors.rst
-source/api/nova..api.openstack.images.rst
-source/api/nova..api.openstack.servers.rst
-source/api/nova..api.openstack.shared_ip_groups.rst
-source/api/nova..api.openstack.zones.rst
-source/api/nova..auth.dbdriver.rst
-source/api/nova..auth.fakeldap.rst
-source/api/nova..auth.ldapdriver.rst
-source/api/nova..auth.manager.rst
-source/api/nova..auth.signer.rst
-source/api/nova..cloudpipe.pipelib.rst
-source/api/nova..compute.api.rst
-source/api/nova..compute.instance_types.rst
-source/api/nova..compute.manager.rst
-source/api/nova..compute.monitor.rst
-source/api/nova..compute.power_state.rst
-source/api/nova..console.api.rst
-source/api/nova..console.fake.rst
-source/api/nova..console.manager.rst
-source/api/nova..console.xvp.rst
-source/api/nova..context.rst
-source/api/nova..crypto.rst
-source/api/nova..db.api.rst
-source/api/nova..db.base.rst
-source/api/nova..db.migration.rst
-source/api/nova..db.sqlalchemy.api.rst
-source/api/nova..db.sqlalchemy.migrate_repo.manage.rst
-source/api/nova..db.sqlalchemy.migrate_repo.versions.001_austin.rst
-source/api/nova..db.sqlalchemy.migrate_repo.versions.002_bexar.rst
-source/api/nova..db.sqlalchemy.migrate_repo.versions.003_add_label_to_networks.rst
-source/api/nova..db.sqlalchemy.migrate_repo.versions.004_add_zone_tables.rst
-source/api/nova..db.sqlalchemy.migration.rst
-source/api/nova..db.sqlalchemy.models.rst
-source/api/nova..db.sqlalchemy.session.rst
-source/api/nova..exception.rst
-source/api/nova..fakememcache.rst
-source/api/nova..fakerabbit.rst
-source/api/nova..flags.rst
-source/api/nova..image.glance.rst
-source/api/nova..image.local.rst
-source/api/nova..image.s3.rst
-source/api/nova..image.service.rst
-source/api/nova..log.rst
-source/api/nova..manager.rst
-source/api/nova..network.api.rst
-source/api/nova..network.linux_net.rst
-source/api/nova..network.manager.rst
-source/api/nova..objectstore.bucket.rst
-source/api/nova..objectstore.handler.rst
-source/api/nova..objectstore.image.rst
-source/api/nova..objectstore.stored.rst
-source/api/nova..quota.rst
-source/api/nova..rpc.rst
-source/api/nova..scheduler.chance.rst
-source/api/nova..scheduler.driver.rst
-source/api/nova..scheduler.manager.rst
-source/api/nova..scheduler.simple.rst
-source/api/nova..scheduler.zone.rst
-source/api/nova..service.rst
-source/api/nova..test.rst
-source/api/nova..tests.api.openstack.fakes.rst
-source/api/nova..tests.api.openstack.test_adminapi.rst
-source/api/nova..tests.api.openstack.test_api.rst
-source/api/nova..tests.api.openstack.test_auth.rst
-source/api/nova..tests.api.openstack.test_common.rst
-source/api/nova..tests.api.openstack.test_faults.rst
-source/api/nova..tests.api.openstack.test_flavors.rst
-source/api/nova..tests.api.openstack.test_images.rst
-source/api/nova..tests.api.openstack.test_ratelimiting.rst
-source/api/nova..tests.api.openstack.test_servers.rst
-source/api/nova..tests.api.openstack.test_shared_ip_groups.rst
-source/api/nova..tests.api.openstack.test_zones.rst
-source/api/nova..tests.api.test_wsgi.rst
-source/api/nova..tests.db.fakes.rst
-source/api/nova..tests.declare_flags.rst
-source/api/nova..tests.fake_flags.rst
-source/api/nova..tests.glance.stubs.rst
-source/api/nova..tests.hyperv_unittest.rst
-source/api/nova..tests.objectstore_unittest.rst
-source/api/nova..tests.real_flags.rst
-source/api/nova..tests.runtime_flags.rst
-source/api/nova..tests.test_access.rst
-source/api/nova..tests.test_api.rst
-source/api/nova..tests.test_auth.rst
-source/api/nova..tests.test_cloud.rst
-source/api/nova..tests.test_compute.rst
-source/api/nova..tests.test_console.rst
-source/api/nova..tests.test_direct.rst
-source/api/nova..tests.test_flags.rst
-source/api/nova..tests.test_localization.rst
-source/api/nova..tests.test_log.rst
-source/api/nova..tests.test_middleware.rst
-source/api/nova..tests.test_misc.rst
-source/api/nova..tests.test_network.rst
-source/api/nova..tests.test_quota.rst
-source/api/nova..tests.test_rpc.rst
-source/api/nova..tests.test_scheduler.rst
-source/api/nova..tests.test_service.rst
-source/api/nova..tests.test_twistd.rst
+source/api/nova..db.sqlalchemy.migrate_repo.versions.005_add_instance_metadata.rst
+source/api/nova..db.sqlalchemy.migrate_repo.versions.006_add_provider_data_to_volumes.rst
+source/api/nova..db.sqlalchemy.migrate_repo.versions.007_add_instance_types.rst
+source/api/nova..db.sqlalchemy.migration.rst
+source/api/nova..db.sqlalchemy.models.rst
+source/api/nova..db.sqlalchemy.session.rst
+source/api/nova..exception.rst
+source/api/nova..fakememcache.rst
+source/api/nova..fakerabbit.rst
+source/api/nova..flags.rst
+source/api/nova..image.glance.rst
+source/api/nova..image.local.rst
+source/api/nova..image.s3.rst
+source/api/nova..image.service.rst
+source/api/nova..log.rst
+source/api/nova..manager.rst
+source/api/nova..network.api.rst
+source/api/nova..network.linux_net.rst
+source/api/nova..network.manager.rst
+source/api/nova..objectstore.bucket.rst
+source/api/nova..objectstore.handler.rst
+source/api/nova..objectstore.image.rst
+source/api/nova..objectstore.stored.rst
+source/api/nova..quota.rst
+source/api/nova..rpc.rst
+source/api/nova..scheduler.chance.rst
+source/api/nova..scheduler.driver.rst
+source/api/nova..scheduler.manager.rst
+source/api/nova..scheduler.simple.rst
+source/api/nova..scheduler.zone.rst
+source/api/nova..service.rst
+source/api/nova..test.rst
+source/api/nova..tests.api.openstack.fakes.rst
+source/api/nova..tests.api.openstack.test_adminapi.rst
+source/api/nova..tests.api.openstack.test_api.rst
+source/api/nova..tests.api.openstack.test_auth.rst
+source/api/nova..tests.api.openstack.test_common.rst
+source/api/nova..tests.api.openstack.test_faults.rst
+source/api/nova..tests.api.openstack.test_flavors.rst
+source/api/nova..tests.api.openstack.test_images.rst
+source/api/nova..tests.api.openstack.test_ratelimiting.rst
+source/api/nova..tests.api.openstack.test_servers.rst
+source/api/nova..tests.api.openstack.test_shared_ip_groups.rst
+source/api/nova..tests.api.openstack.test_zones.rst
+source/api/nova..tests.api.test_wsgi.rst
+source/api/nova..tests.db.fakes.rst
+source/api/nova..tests.declare_flags.rst
+source/api/nova..tests.fake_flags.rst
+source/api/nova..tests.glance.stubs.rst
+source/api/nova..tests.hyperv_unittest.rst
+source/api/nova..tests.objectstore_unittest.rst
+source/api/nova..tests.real_flags.rst
+source/api/nova..tests.runtime_flags.rst
+source/api/nova..tests.test_access.rst
+source/api/nova..tests.test_api.rst
+source/api/nova..tests.test_auth.rst
+source/api/nova..tests.test_cloud.rst
+source/api/nova..tests.test_compute.rst
+source/api/nova..tests.test_console.rst
+source/api/nova..tests.test_direct.rst
+source/api/nova..tests.test_flags.rst
+source/api/nova..tests.test_instance_types.rst
+source/api/nova..tests.test_localization.rst
+source/api/nova..tests.test_log.rst
+source/api/nova..tests.test_middleware.rst
+source/api/nova..tests.test_misc.rst
+source/api/nova..tests.test_network.rst
+source/api/nova..tests.test_quota.rst
+source/api/nova..tests.test_rpc.rst
+source/api/nova..tests.test_scheduler.rst
+source/api/nova..tests.test_service.rst
+source/api/nova..tests.test_test.rst
+source/api/nova..tests.test_twistd.rst
+source/api/nova..tests.test_utils.rst
 source/api/nova..tests.test_virt.rst
 source/api/nova..tests.test_volume.rst
 source/api/nova..tests.test_xenapi.rst

=== modified file 'doc/source/api/autoindex.rst'
--- doc/source/api/autoindex.rst	2011-02-21 20:30:20 +0000
+++ doc/source/api/autoindex.rst	2011-03-03 01:57:15 +0000
@@ -43,6 +43,9 @@
    nova..db.sqlalchemy.migrate_repo.versions.002_bexar.rst
    nova..db.sqlalchemy.migrate_repo.versions.003_add_label_to_networks.rst
    nova..db.sqlalchemy.migrate_repo.versions.004_add_zone_tables.rst
+   nova..db.sqlalchemy.migrate_repo.versions.005_add_instance_metadata.rst
+   nova..db.sqlalchemy.migrate_repo.versions.006_add_provider_data_to_volumes.rst
+   nova..db.sqlalchemy.migrate_repo.versions.007_add_instance_types.rst
    nova..db.sqlalchemy.migration.rst
    nova..db.sqlalchemy.models.rst
    nova..db.sqlalchemy.session.rst
@@ -101,6 +104,7 @@
    nova..tests.test_console.rst
    nova..tests.test_direct.rst
    nova..tests.test_flags.rst
+   nova..tests.test_instance_types.rst
    nova..tests.test_localization.rst
    nova..tests.test_log.rst
    nova..tests.test_middleware.rst
@@ -110,7 +114,9 @@
    nova..tests.test_rpc.rst
    nova..tests.test_scheduler.rst
    nova..tests.test_service.rst
+   nova..tests.test_test.rst
    nova..tests.test_twistd.rst
+   nova..tests.test_utils.rst
    nova..tests.test_virt.rst
    nova..tests.test_volume.rst
    nova..tests.test_xenapi.rst

=== added file 'doc/source/api/nova..db.sqlalchemy.migrate_repo.versions.005_add_instance_metadata.rst'
--- doc/source/api/nova..db.sqlalchemy.migrate_repo.versions.005_add_instance_metadata.rst	1970-01-01 00:00:00 +0000
+++ doc/source/api/nova..db.sqlalchemy.migrate_repo.versions.005_add_instance_metadata.rst	2011-03-03 01:57:15 +0000
@@ -0,0 +1,6 @@
+The :mod:`nova..db.sqlalchemy.migrate_repo.versions.005_add_instance_metadata` Module
+==============================================================================
+.. automodule:: nova..db.sqlalchemy.migrate_repo.versions.005_add_instance_metadata
+  :members:
+  :undoc-members:
+  :show-inheritance:

=== added file 'doc/source/api/nova..db.sqlalchemy.migrate_repo.versions.006_add_provider_data_to_volumes.rst'
--- doc/source/api/nova..db.sqlalchemy.migrate_repo.versions.006_add_provider_data_to_volumes.rst	1970-01-01 00:00:00 +0000
+++ doc/source/api/nova..db.sqlalchemy.migrate_repo.versions.006_add_provider_data_to_volumes.rst	2011-03-03 01:57:15 +0000
@@ -0,0 +1,6 @@
+The :mod:`nova..db.sqlalchemy.migrate_repo.versions.006_add_provider_data_to_volumes` Module
+==============================================================================
+.. automodule:: nova..db.sqlalchemy.migrate_repo.versions.006_add_provider_data_to_volumes
+  :members:
+  :undoc-members:
+  :show-inheritance:

=== added file 'doc/source/api/nova..db.sqlalchemy.migrate_repo.versions.007_add_instance_types.rst'
--- doc/source/api/nova..db.sqlalchemy.migrate_repo.versions.007_add_instance_types.rst	1970-01-01 00:00:00 +0000
+++ doc/source/api/nova..db.sqlalchemy.migrate_repo.versions.007_add_instance_types.rst	2011-03-03 01:57:15 +0000
@@ -0,0 +1,6 @@
+The :mod:`nova..db.sqlalchemy.migrate_repo.versions.007_add_instance_types` Module
+==============================================================================
+.. automodule:: nova..db.sqlalchemy.migrate_repo.versions.007_add_instance_types
+  :members:
+  :undoc-members:
+  :show-inheritance:

=== added file 'doc/source/api/nova..tests.test_instance_types.rst'
--- doc/source/api/nova..tests.test_instance_types.rst	1970-01-01 00:00:00 +0000
+++ doc/source/api/nova..tests.test_instance_types.rst	2011-03-03 01:57:15 +0000
@@ -0,0 +1,6 @@
+The :mod:`nova..tests.test_instance_types` Module
+==============================================================================
+.. automodule:: nova..tests.test_instance_types
+  :members:
+  :undoc-members:
+  :show-inheritance:

=== added file 'doc/source/api/nova..tests.test_test.rst'
--- doc/source/api/nova..tests.test_test.rst	1970-01-01 00:00:00 +0000
+++ doc/source/api/nova..tests.test_test.rst	2011-03-03 01:57:15 +0000
@@ -0,0 +1,6 @@
+The :mod:`nova..tests.test_test` Module
+==============================================================================
+.. automodule:: nova..tests.test_test
+  :members:
+  :undoc-members:
+  :show-inheritance:

=== added file 'doc/source/api/nova..tests.test_utils.rst'
--- doc/source/api/nova..tests.test_utils.rst	1970-01-01 00:00:00 +0000
+++ doc/source/api/nova..tests.test_utils.rst	2011-03-03 01:57:15 +0000
@@ -0,0 +1,6 @@
+The :mod:`nova..tests.test_utils` Module
+==============================================================================
+.. automodule:: nova..tests.test_utils
+  :members:
+  :undoc-members:
+  :show-inheritance:

=== modified file 'doc/source/man/novamanage.rst'
--- doc/source/man/novamanage.rst	2011-01-19 18:43:50 +0000
+++ doc/source/man/novamanage.rst	2011-03-03 01:57:15 +0000
@@ -179,6 +179,42 @@
 
     Displays a list of all floating IP addresses.
 
+Nova Flavor
+~~~~~~~~~~~
+
+``nova-manage flavor list``
+
+    Outputs a list of all active flavors to the screen.
+
+``nova-manage flavor list --all``
+
+    Outputs a list of all flavors (active and inactive) to the screen.
+
+``nova-manage flavor create <name> <memory> <vCPU> <local_storage> <flavorID> <(optional) swap> <(optional) RXTX Quota> <(optional) RXTX Cap>``
+
+    creates a flavor with the following positional arguments:
+     * memory (expressed in megabytes) 
+     * vcpu(s) (integer)
+     * local storage (expressed in gigabytes)
+     * flavorid (unique integer)
+     * swap space (expressed in megabytes, defaults to zero, optional)
+     * RXTX quotas (expressed in gigabytes, defaults to zero, optional)
+     * RXTX cap (expressed in gigabytes, defaults to zero, optional)
+
+``nova-manage flavor delete <name>``
+
+    Delete the flavor with the name <name>. This marks the flavor as inactive and cannot be launched. However, the record stays in the database for archival and billing purposes.
+
+``nova-manage flavor delete <name> --purge``
+
+    Purges the flavor with the name <name>. This removes this flavor from the database.
+
+
+Nova Instance_type
+~~~~~~~~~~~~~~~~~~
+
+The instance_type command is provided as an alias for the flavor command. All the same subcommands and arguments from nova-manage flavor can be used.
+
 
 FILES
 ========

=== modified file 'doc/source/nova.concepts.rst'
--- doc/source/nova.concepts.rst	2011-01-04 22:58:08 +0000
+++ doc/source/nova.concepts.rst	2011-03-03 01:57:15 +0000
@@ -64,6 +64,11 @@
 
 An 'instance' is a word for a virtual machine that runs inside the cloud.
 
+Concept: Instance Type
+----------------------
+
+An 'instance type' describes the compute, memory and storage capacity of nova computing instances. In layman terms, this is the size (in terms of vCPUs, RAM, etc.) of the virtual server that you will be launching.
+
 Concept: System Architecture
 ----------------------------
 

=== added file 'doc/source/runnova/managing.instance.types.rst'
--- doc/source/runnova/managing.instance.types.rst	1970-01-01 00:00:00 +0000
+++ doc/source/runnova/managing.instance.types.rst	2011-03-03 01:57:15 +0000
@@ -0,0 +1,84 @@
+..
+      Copyright 2011 Ken Pepple
+
+      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.
+
+Managing Instance Types and Flavors
+===================================
+
+What are Instance Types or Flavors ?
+------------------------------------
+
+Instance types describe the compute, memory and storage capacity of nova computing instances. In layman terms, this is the size (in terms of vCPUs, RAM, etc.) of the virtual server that you will be launching. In the EC2 API, these are called by names such as "m1.large" or "m1.tiny", while the OpenStack API terms these "flavors" with names like "512 MB Server". 
+
+In Nova, "flavor" and "instance type" are equivalent terms. When you create an EC2 instance type, you are also creating a OpenStack API flavor. To reduce repetition, for the rest of this document I will refer to these as instance types.
+
+Instance types can be in either the active or inactive state:
+  * Active instance types are available to be used for launching instances
+  * Inactive instance types are not available for launching instances
+
+In the current (Cactus) version of nova, instance types can only be created by the nova administrator through the nova-manage command. Future versions of nova (in concert with the OpenStack API or EC2 API), may expose this functionality directly to users.
+
+Basic Management
+----------------
+
+Instance types / flavor are managed through the nova-manage binary with 
+the "instance_type" command and an appropriate subcommand. Note that you can also use 
+the "flavor" command as a synonym for "instance_types".
+
+To see all currently active instance types, use the list subcommand::
+
+    # nova-manage instance_type list
+    m1.medium: Memory: 4096MB, VCPUS: 2, Storage: 40GB, FlavorID: 3, Swap: 0GB, RXTX Quota: 0GB, RXTX Cap: 0MB
+    m1.large: Memory: 8192MB, VCPUS: 4, Storage: 80GB, FlavorID: 4, Swap: 0GB, RXTX Quota: 0GB, RXTX Cap: 0MB
+    m1.tiny: Memory: 512MB, VCPUS: 1, Storage: 0GB, FlavorID: 1, Swap: 0GB, RXTX Quota: 0GB, RXTX Cap: 0MB
+    m1.xlarge: Memory: 16384MB, VCPUS: 8, Storage: 160GB, FlavorID: 5, Swap: 0GB, RXTX Quota: 0GB, RXTX Cap: 0MB
+    m1.small: Memory: 2048MB, VCPUS: 1, Storage: 20GB, FlavorID: 2, Swap: 0GB, RXTX Quota: 0GB, RXTX Cap: 0MB
+
+By default, the list subcommand only shows active instance types. To see all instance types (inactive and active), use the list subcommand with the "--all" flag::
+
+    # nova-manage instance_type list --all
+    m1.medium: Memory: 4096MB, VCPUS: 2, Storage: 40GB, FlavorID: 3, Swap: 0GB, RXTX Quota: 0GB, RXTX Cap: 0MB
+    m1.large: Memory: 8192MB, VCPUS: 4, Storage: 80GB, FlavorID: 4, Swap: 0GB, RXTX Quota: 0GB, RXTX Cap: 0MB
+    m1.tiny: Memory: 512MB, VCPUS: 1, Storage: 0GB, FlavorID: 1, Swap: 0GB, RXTX Quota: 0GB, RXTX Cap: 0MB
+    m1.xlarge: Memory: 16384MB, VCPUS: 8, Storage: 160GB, FlavorID: 5, Swap: 0GB, RXTX Quota: 0GB, RXTX Cap: 0MB
+    m1.small: Memory: 2048MB, VCPUS: 1, Storage: 20GB, FlavorID: 2, Swap: 0GB, RXTX Quota: 0GB, RXTX Cap: 0MB
+    m1.deleted: Memory: 2048MB, VCPUS: 1, Storage: 20GB, FlavorID: 2, Swap: 0GB, RXTX Quota: 0GB, RXTX Cap: 0MB, inactive
+
+To create an instance type, use the "create" subcommand with the following positional arguments:
+ * memory (expressed in megabytes) 
+ * vcpu(s) (integer)
+ * local storage (expressed in gigabytes)
+ * flavorid (unique integer)
+ * swap space (expressed in megabytes, defaults to zero, optional)
+ * RXTX quotas (expressed in gigabytes, defaults to zero, optional)
+ * RXTX cap (expressed in gigabytes, defaults to zero, optional)
+
+The following example creates an instance type named "m1.xxlarge"::
+
+    # nova-manage instance_type create m1.xxlarge 32768 16 320 0 0 0
+    m1.xxlarge created
+
+To delete an instance type, use the "delete" subcommand and specify the name::
+
+    # nova-manage instance_type delete m1.xxlarge
+    m1.xxlarge deleted
+
+Please note that the "delete" command only marks the instance type as 
+inactive in the database; it does not actually remove the instance type. This is done
+to preserve the instance type definition for long running instances (which may not 
+terminate for months or years). If you are sure that you want to delete this instance 
+type from the database, pass the "--purge" flag after the name::
+
+    # nova-manage instance_type delete m1.xxlarge --purge
+    m1.xxlarge purged

=== modified file 'nova/api/ec2/admin.py'
--- nova/api/ec2/admin.py	2011-02-23 04:42:49 +0000
+++ nova/api/ec2/admin.py	2011-03-03 01:57:15 +0000
@@ -29,7 +29,6 @@
 from nova import log as logging
 from nova import utils
 from nova.auth import manager
-from nova.compute import instance_types
 
 
 FLAGS = flags.FLAGS
@@ -80,8 +79,8 @@
     return rv
 
 
-def instance_dict(name, inst):
-    return {'name': name,
+def instance_dict(inst):
+    return {'name': inst['name'],
             'memory_mb': inst['memory_mb'],
             'vcpus': inst['vcpus'],
             'disk_gb': inst['local_gb'],
@@ -115,9 +114,9 @@
     def __str__(self):
         return 'AdminController'
 
-    def describe_instance_types(self, _context, **_kwargs):
-        return {'instanceTypeSet': [instance_dict(n, v) for n, v in
-                                    instance_types.INSTANCE_TYPES.iteritems()]}
+    def describe_instance_types(self, context, **_kwargs):
+        """Returns all active instance types data (vcpus, memory, etc.)"""
+        return {'instanceTypeSet': [db.instance_type_get_all(context)]}
 
     def describe_user(self, _context, name, **_kwargs):
         """Returns user data, including access and secret keys."""

=== modified file 'nova/api/openstack/__init__.py'
--- nova/api/openstack/__init__.py	2011-02-25 17:00:01 +0000
+++ nova/api/openstack/__init__.py	2011-03-03 01:57:15 +0000
@@ -74,6 +74,7 @@
         server_members = {'action': 'POST'}
         if FLAGS.allow_admin_api:
             LOG.debug(_("Including admin operations in API."))
+
             server_members['pause'] = 'POST'
             server_members['unpause'] = 'POST'
             server_members["diagnostics"] = "GET"

=== modified file 'nova/api/openstack/flavors.py'
--- nova/api/openstack/flavors.py	2010-12-16 18:09:38 +0000
+++ nova/api/openstack/flavors.py	2011-03-03 01:57:15 +0000
@@ -17,6 +17,8 @@
 
 from webob import exc
 
+from nova import db
+from nova import context
 from nova.api.openstack import faults
 from nova.api.openstack import common
 from nova.compute import instance_types
@@ -39,19 +41,19 @@
 
     def detail(self, req):
         """Return all flavors in detail."""
-        items = [self.show(req, id)['flavor'] for id in self._all_ids()]
-        items = common.limited(items, req)
+        items = [self.show(req, id)['flavor'] for id in self._all_ids(req)]
         return dict(flavors=items)
 
     def show(self, req, id):
         """Return data about the given flavor id."""
-        for name, val in instance_types.INSTANCE_TYPES.iteritems():
-            if val['flavorid'] == int(id):
-                item = dict(ram=val['memory_mb'], disk=val['local_gb'],
-                            id=val['flavorid'], name=name)
-                return dict(flavor=item)
+        ctxt = req.environ['nova.context']
+        values = db.instance_type_get_by_flavor_id(ctxt, id)
+        return dict(flavor=values)
         raise faults.Fault(exc.HTTPNotFound())
 
-    def _all_ids(self):
+    def _all_ids(self, req):
         """Return the list of all flavorids."""
-        return [i['flavorid'] for i in instance_types.INSTANCE_TYPES.values()]
+        ctxt = req.environ['nova.context']
+        inst_types = db.instance_type_get_all(ctxt)
+        flavor_ids = [inst_types[i]['flavorid'] for i in inst_types.keys()]
+        return sorted(flavor_ids)

=== modified file 'nova/compute/api.py'
--- nova/compute/api.py	2011-03-01 16:53:19 +0000
+++ nova/compute/api.py	2011-03-03 01:57:15 +0000
@@ -88,9 +88,9 @@
                availability_zone=None, user_data=None, metadata=[],
                onset_files=None):
         """Create the number of instances requested if quota and
-        other arguments check out ok.
-        """
-        type_data = instance_types.INSTANCE_TYPES[instance_type]
+        other arguments check out ok."""
+
+        type_data = instance_types.get_instance_type(instance_type)
         num_instances = quota.allowed_instances(context, max_count, type_data)
         if num_instances < min_count:
             pid = context.project_id

=== modified file 'nova/compute/instance_types.py'
--- nova/compute/instance_types.py	2011-02-17 23:13:59 +0000
+++ nova/compute/instance_types.py	2011-03-03 01:57:15 +0000
@@ -4,6 +4,7 @@
 # Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 # Copyright (c) 2010 Citrix Systems, Inc.
+# Copyright 2011 Ken Pepple
 #
 #    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
@@ -21,30 +22,120 @@
 The built-in instance properties.
 """
 
+from nova import context
+from nova import db
+from nova import exception
 from nova import flags
-from nova import exception
+from nova import log as logging
 
 FLAGS = flags.FLAGS
-INSTANCE_TYPES = {
-    'm1.tiny': dict(memory_mb=512, vcpus=1, local_gb=0, flavorid=1),
-    'm1.small': dict(memory_mb=2048, vcpus=1, local_gb=20, flavorid=2),
-    'm1.medium': dict(memory_mb=4096, vcpus=2, local_gb=40, flavorid=3),
-    'm1.large': dict(memory_mb=8192, vcpus=4, local_gb=80, flavorid=4),
-    'm1.xlarge': dict(memory_mb=16384, vcpus=8, local_gb=160, flavorid=5)}
+LOG = logging.getLogger('nova.instance_types')
+
+
+def create(name, memory, vcpus, local_gb, flavorid, swap=0,
+           rxtx_quota=0, rxtx_cap=0):
+    """Creates instance types / flavors
+       arguments: name memory vcpus local_gb flavorid swap rxtx_quota rxtx_cap
+    """
+    for option in [memory, vcpus, local_gb, flavorid]:
+        try:
+            int(option)
+        except ValueError:
+            raise exception.InvalidInputException(
+                    _("create arguments must be positive integers"))
+    if (int(memory) <= 0) or (int(vcpus) <= 0) or (int(local_gb) < 0):
+        raise exception.InvalidInputException(
+                _("create arguments must be positive integers"))
+
+    try:
+        db.instance_type_create(
+                context.get_admin_context(),
+                dict(name=name,
+                    memory_mb=memory,
+                    vcpus=vcpus,
+                    local_gb=local_gb,
+                    flavorid=flavorid,
+                    swap=swap,
+                    rxtx_quota=rxtx_quota,
+                    rxtx_cap=rxtx_cap))
+    except exception.DBError, e:
+        LOG.exception(_('DB error: %s' % e))
+        raise exception.ApiError(_("Cannot create instance type: %s" % name))
+
+
+def destroy(name):
+    """Marks instance types / flavors as deleted
+    arguments: name"""
+    if name == None:
+        raise exception.InvalidInputException(_("No instance type specified"))
+    else:
+        try:
+            db.instance_type_destroy(context.get_admin_context(), name)
+        except exception.NotFound:
+            LOG.exception(_('Instance type %s not found for deletion' % name))
+            raise exception.ApiError(_("Unknown instance type: %s" % name))
+
+
+def purge(name):
+    """Removes instance types / flavors from database
+    arguments: name"""
+    if name == None:
+        raise exception.InvalidInputException(_("No instance type specified"))
+    else:
+        try:
+            db.instance_type_purge(context.get_admin_context(), name)
+        except exception.NotFound:
+            LOG.exception(_('Instance type %s not found for purge' % name))
+            raise exception.ApiError(_("Unknown instance type: %s" % name))
+
+
+def get_all_types(inactive=0):
+    """Retrieves non-deleted instance_types.
+    Pass true as argument if you want deleted instance types returned also."""
+    return db.instance_type_get_all(context.get_admin_context(), inactive)
+
+
+def get_all_flavors():
+    """retrieves non-deleted flavors. alias for instance_types.get_all_types().
+    Pass true as argument if you want deleted instance types returned also."""
+    return get_all_types(context.get_admin_context())
+
+
+def get_instance_type(name):
+    """Retrieves single instance type by name"""
+    if name is None:
+        return FLAGS.default_instance_type
+    try:
+        ctxt = context.get_admin_context()
+        inst_type = db.instance_type_get_by_name(ctxt, name)
+        return inst_type
+    except exception.DBError:
+        raise exception.ApiError(_("Unknown instance type: %s" % name))
 
 
 def get_by_type(instance_type):
-    """Build instance data structure and save it to the data store."""
+    """retrieve instance type name"""
     if instance_type is None:
         return FLAGS.default_instance_type
-    if instance_type not in INSTANCE_TYPES:
-        raise exception.ApiError(_("Unknown instance type: %s") % \
-                                 instance_type, "Invalid")
-    return instance_type
+
+    try:
+        ctxt = context.get_admin_context()
+        inst_type = db.instance_type_get_by_name(ctxt, instance_type)
+        return inst_type['name']
+    except exception.DBError, e:
+        LOG.exception(_('DB error: %s' % e))
+        raise exception.ApiError(_("Unknown instance type: %s" %\
+                                    instance_type))
 
 
 def get_by_flavor_id(flavor_id):
-    for instance_type, details in INSTANCE_TYPES.iteritems():
-        if details['flavorid'] == int(flavor_id):
-            return instance_type
-    return FLAGS.default_instance_type
+    """retrieve instance type's name by flavor_id"""
+    if flavor_id is None:
+        return FLAGS.default_instance_type
+    try:
+        ctxt = context.get_admin_context()
+        flavor = db.instance_type_get_by_flavor_id(ctxt, flavor_id)
+        return flavor['name']
+    except exception.DBError, e:
+        LOG.exception(_('DB error: %s' % e))
+        raise exception.ApiError(_("Unknown flavor: %s" % flavor_id))

=== modified file 'nova/db/api.py'
--- nova/db/api.py	2011-03-18 02:09:46 +0000
+++ nova/db/api.py	2011-03-03 01:57:15 +0000
@@ -1007,6 +1007,41 @@
     return IMPL.console_get(context, console_id, instance_id)
 
 
+    ##################
+
+
+def instance_type_create(context, values):
+    """Create a new instance type"""
+    return IMPL.instance_type_create(context, values)
+
+
+def instance_type_get_all(context, inactive=0):
+    """Get all instance types"""
+    return IMPL.instance_type_get_all(context, inactive)
+
+
+def instance_type_get_by_name(context, name):
+    """Get instance type by name"""
+    return IMPL.instance_type_get_by_name(context, name)
+
+
+def instance_type_get_by_flavor_id(context, id):
+    """Get instance type by name"""
+    return IMPL.instance_type_get_by_flavor_id(context, id)
+
+
+def instance_type_destroy(context, name):
+    """Delete a instance type"""
+    return IMPL.instance_type_destroy(context, name)
+
+
+def instance_type_purge(context, name):
+    """Purges (removes) an instance type from DB
+       Use instance_type_destroy for most cases
+    """
+    return IMPL.instance_type_purge(context, name)
+
+
 ####################
 
 

=== modified file 'nova/db/sqlalchemy/api.py'
--- nova/db/sqlalchemy/api.py	2011-03-18 02:09:46 +0000
+++ nova/db/sqlalchemy/api.py	2011-03-03 01:57:15 +0000
@@ -2073,6 +2073,98 @@
     return result
 
 
+    ##################
+
+
+@require_admin_context
+def instance_type_create(_context, values):
+    try:
+        instance_type_ref = models.InstanceTypes()
+        instance_type_ref.update(values)
+        instance_type_ref.save()
+    except:
+        raise exception.DBError
+    return instance_type_ref
+
+
+@require_context
+def instance_type_get_all(context, inactive=0):
+    """
+    Returns a dict describing all instance_types with name as key.
+    """
+    session = get_session()
+    if inactive:
+        inst_types = session.query(models.InstanceTypes).\
+                        order_by("name").\
+                        all()
+    else:
+        inst_types = session.query(models.InstanceTypes).\
+                        filter_by(deleted=inactive).\
+                        order_by("name").\
+                        all()
+    if inst_types:
+        inst_dict = {}
+        for i in inst_types:
+            inst_dict[i['name']] = dict(i)
+        return inst_dict
+    else:
+        raise exception.NotFound
+
+
+@require_context
+def instance_type_get_by_name(context, name):
+    """Returns a dict describing specific instance_type"""
+    session = get_session()
+    inst_type = session.query(models.InstanceTypes).\
+                    filter_by(name=name).\
+                    first()
+    if not inst_type:
+        raise exception.NotFound(_("No instance type with name %s") % name)
+    else:
+        return dict(inst_type)
+
+
+@require_context
+def instance_type_get_by_flavor_id(context, id):
+    """Returns a dict describing specific flavor_id"""
+    session = get_session()
+    inst_type = session.query(models.InstanceTypes).\
+                                    filter_by(flavorid=int(id)).\
+                                    first()
+    if not inst_type:
+        raise exception.NotFound(_("No flavor with name %s") % id)
+    else:
+        return dict(inst_type)
+
+
+@require_admin_context
+def instance_type_destroy(context, name):
+    """ Marks specific instance_type as deleted"""
+    session = get_session()
+    instance_type_ref = session.query(models.InstanceTypes).\
+                                      filter_by(name=name)
+    records = instance_type_ref.update(dict(deleted=1))
+    if records == 0:
+        raise exception.NotFound
+    else:
+        return instance_type_ref
+
+
+@require_admin_context
+def instance_type_purge(context, name):
+    """ Removes specific instance_type from DB
+        Usually instance_type_destroy should be used
+    """
+    session = get_session()
+    instance_type_ref = session.query(models.InstanceTypes).\
+                                      filter_by(name=name)
+    records = instance_type_ref.delete()
+    if records == 0:
+        raise exception.NotFound
+    else:
+        return instance_type_ref
+
+
 ####################
 
 

=== added file 'nova/db/sqlalchemy/migrate_repo/versions/008_add_instance_types.py'
--- nova/db/sqlalchemy/migrate_repo/versions/008_add_instance_types.py	1970-01-01 00:00:00 +0000
+++ nova/db/sqlalchemy/migrate_repo/versions/008_add_instance_types.py	2011-03-03 01:57:15 +0000
@@ -0,0 +1,87 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2011 Ken Pepple
+#    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.
+
+from sqlalchemy import *
+from migrate import *
+
+from nova import api
+from nova import db
+from nova import log as logging
+
+import datetime
+
+meta = MetaData()
+
+
+#
+# New Tables
+#
+instance_types = Table('instance_types', meta,
+        Column('created_at', DateTime(timezone=False)),
+        Column('updated_at', DateTime(timezone=False)),
+        Column('deleted_at', DateTime(timezone=False)),
+        Column('deleted', Boolean(create_constraint=True, name=None)),
+        Column('name',
+               String(length=255, convert_unicode=False, assert_unicode=None,
+                      unicode_error=None, _warn_on_bytestring=False),
+                      unique=True),
+        Column('id', Integer(),  primary_key=True, nullable=False),
+        Column('memory_mb', Integer(),  nullable=False),
+        Column('vcpus', Integer(),  nullable=False),
+        Column('local_gb', Integer(),  nullable=False),
+        Column('flavorid', Integer(),  nullable=False, unique=True),
+        Column('swap', Integer(),  nullable=False, default=0),
+        Column('rxtx_quota', Integer(),  nullable=False, default=0),
+        Column('rxtx_cap', Integer(),  nullable=False, default=0))
+
+
+def upgrade(migrate_engine):
+    # Upgrade operations go here
+    # Don't create your own engine; bind migrate_engine
+    # to your metadata
+    meta.bind = migrate_engine
+    try:
+        instance_types.create()
+    except Exception:
+        logging.info(repr(table))
+        logging.exception('Exception while creating instance_types table')
+        raise
+
+    # Here are the old static instance types
+    INSTANCE_TYPES = {
+    'm1.tiny': dict(memory_mb=512, vcpus=1, local_gb=0, flavorid=1),
+    'm1.small': dict(memory_mb=2048, vcpus=1, local_gb=20, flavorid=2),
+    'm1.medium': dict(memory_mb=4096, vcpus=2, local_gb=40, flavorid=3),
+    'm1.large': dict(memory_mb=8192, vcpus=4, local_gb=80, flavorid=4),
+    'm1.xlarge': dict(memory_mb=16384, vcpus=8, local_gb=160, flavorid=5)}
+    try:
+        i = instance_types.insert()
+        for name, values in INSTANCE_TYPES.iteritems():
+            # FIXME(kpepple) should we be seeding created_at / updated_at ?
+            # now = datetime.datatime.utcnow()
+            i.execute({'name': name, 'memory_mb': values["memory_mb"],
+                        'vcpus': values["vcpus"], 'deleted': 0,
+                        'local_gb': values["local_gb"],
+                        'flavorid': values["flavorid"]})
+    except Exception:
+        logging.info(repr(table))
+        logging.exception('Exception while seeding instance_types table')
+        raise
+
+
+def downgrade(migrate_engine):
+    # Operations to reverse the above upgrade go here.
+    for table in (instance_types):
+        table.drop()

=== modified file 'nova/db/sqlalchemy/models.py'
--- nova/db/sqlalchemy/models.py	2011-03-02 23:37:31 +0000
+++ nova/db/sqlalchemy/models.py	2011-03-03 01:57:15 +0000
@@ -215,6 +215,20 @@
     error = Column(Text)
 
 
+class InstanceTypes(BASE, NovaBase):
+    """Represent possible instance_types or flavor of VM offered"""
+    __tablename__ = "instance_types"
+    id = Column(Integer, primary_key=True)
+    name = Column(String(255), unique=True)
+    memory_mb = Column(Integer)
+    vcpus = Column(Integer)
+    local_gb = Column(Integer)
+    flavorid = Column(Integer, unique=True)
+    swap = Column(Integer, nullable=False, default=0)
+    rxtx_quota = Column(Integer, nullable=False, default=0)
+    rxtx_cap = Column(Integer, nullable=False, default=0)
+
+
 class Volume(BASE, NovaBase):
     """Represents a block storage device that can be attached to a vm."""
     __tablename__ = 'volumes'
@@ -579,7 +593,7 @@
     connection is lost and needs to be reestablished.
     """
     from sqlalchemy import create_engine
-    models = (Service, Instance, InstanceActions,
+    models = (Service, Instance, InstanceActions, InstanceTypes,
               Volume, ExportDevice, IscsiTarget, FixedIp, FloatingIp,
               Network, SecurityGroup, SecurityGroupIngressRule,
               SecurityGroupInstanceAssociation, AuthToken, User,

=== modified file 'nova/tests/api/openstack/test_flavors.py'
--- nova/tests/api/openstack/test_flavors.py	2011-02-23 19:56:37 +0000
+++ nova/tests/api/openstack/test_flavors.py	2011-03-03 01:57:15 +0000
@@ -20,6 +20,8 @@
 
 from nova import test
 import nova.api
+from nova import context
+from nova import db
 from nova.api.openstack import flavors
 from nova.tests.api.openstack import fakes
 
@@ -33,6 +35,7 @@
         fakes.stub_out_networking(self.stubs)
         fakes.stub_out_rate_limiting(self.stubs)
         fakes.stub_out_auth(self.stubs)
+        self.context = context.get_admin_context()
 
     def tearDown(self):
         self.stubs.UnsetAll()
@@ -41,6 +44,9 @@
     def test_get_flavor_list(self):
         req = webob.Request.blank('/v1.0/flavors')
         res = req.get_response(fakes.wsgi_app())
+        self.assertEqual(res.status_int, 200)
 
     def test_get_flavor_by_id(self):
-        pass
+        req = webob.Request.blank('/v1.0/flavors/1')
+        res = req.get_response(fakes.wsgi_app())
+        self.assertEqual(res.status_int, 200)

=== modified file 'nova/tests/db/fakes.py'
--- nova/tests/db/fakes.py	2010-12-23 03:35:41 +0000
+++ nova/tests/db/fakes.py	2011-03-03 01:57:15 +0000
@@ -20,13 +20,22 @@
 import time
 
 from nova import db
+from nova import test
 from nova import utils
-from nova.compute import instance_types
 
 
 def stub_out_db_instance_api(stubs):
     """ Stubs out the db API for creating Instances """
 
+    INSTANCE_TYPES = {
+        'm1.tiny': dict(memory_mb=512, vcpus=1, local_gb=0, flavorid=1),
+        'm1.small': dict(memory_mb=2048, vcpus=1, local_gb=20, flavorid=2),
+        'm1.medium':
+            dict(memory_mb=4096, vcpus=2, local_gb=40, flavorid=3),
+        'm1.large': dict(memory_mb=8192, vcpus=4, local_gb=80, flavorid=4),
+        'm1.xlarge':
+            dict(memory_mb=16384, vcpus=8, local_gb=160, flavorid=5)}
+
     class FakeModel(object):
         """ Stubs out for model """
         def __init__(self, values):
@@ -41,10 +50,16 @@
             else:
                 raise NotImplementedError()
 
+    def fake_instance_type_get_all(context, inactive=0):
+        return INSTANCE_TYPES
+
+    def fake_instance_type_get_by_name(context, name):
+        return INSTANCE_TYPES[name]
+
     def fake_instance_create(values):
         """ Stubs out the db.instance_create method """
 
-        type_data = instance_types.INSTANCE_TYPES[values['instance_type']]
+        type_data = INSTANCE_TYPES[values['instance_type']]
 
         base_options = {
             'name': values['name'],
@@ -73,3 +88,5 @@
 
     stubs.Set(db, 'instance_create', fake_instance_create)
     stubs.Set(db, 'network_get_by_instance', fake_network_get_by_instance)
+    stubs.Set(db, 'instance_type_get_all', fake_instance_type_get_all)
+    stubs.Set(db, 'instance_type_get_by_name', fake_instance_type_get_by_name)

=== added file 'nova/tests/test_instance_types.py'
--- nova/tests/test_instance_types.py	1970-01-01 00:00:00 +0000
+++ nova/tests/test_instance_types.py	2011-03-03 01:57:15 +0000
@@ -0,0 +1,86 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2011 Ken Pepple
+#    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.
+"""
+Unit Tests for instance types code
+"""
+import time
+
+from nova import context
+from nova import db
+from nova import exception
+from nova import flags
+from nova import log as logging
+from nova import test
+from nova import utils
+from nova.compute import instance_types
+from nova.db.sqlalchemy.session import get_session
+from nova.db.sqlalchemy import models
+
+FLAGS = flags.FLAGS
+LOG = logging.getLogger('nova.tests.compute')
+
+
+class InstanceTypeTestCase(test.TestCase):
+    """Test cases for instance type code"""
+    def setUp(self):
+        super(InstanceTypeTestCase, self).setUp()
+        session = get_session()
+        max_flavorid = session.query(models.InstanceTypes).\
+                                     order_by("flavorid desc").\
+                                     first()
+        self.flavorid = max_flavorid["flavorid"] + 1
+        self.name = str(int(time.time()))
+
+    def test_instance_type_create_then_delete(self):
+        """Ensure instance types can be created"""
+        starting_inst_list = instance_types.get_all_types()
+        instance_types.create(self.name, 256, 1, 120, self.flavorid)
+        new = instance_types.get_all_types()
+        self.assertNotEqual(len(starting_inst_list),
+                            len(new),
+                            'instance type was not created')
+        instance_types.destroy(self.name)
+        self.assertEqual(1,
+                    instance_types.get_instance_type(self.name)["deleted"])
+        self.assertEqual(starting_inst_list, instance_types.get_all_types())
+        instance_types.purge(self.name)
+        self.assertEqual(len(starting_inst_list),
+                         len(instance_types.get_all_types()),
+                         'instance type not purged')
+
+    def test_get_all_instance_types(self):
+        """Ensures that all instance types can be retrieved"""
+        session = get_session()
+        total_instance_types = session.query(models.InstanceTypes).\
+                                            count()
+        inst_types = instance_types.get_all_types()
+        self.assertEqual(total_instance_types, len(inst_types))
+
+    def test_invalid_create_args_should_fail(self):
+        """Ensures that instance type creation fails with invalid args"""
+        self.assertRaises(
+                exception.InvalidInputException,
+                instance_types.create, self.name, 0, 1, 120, self.flavorid)
+        self.assertRaises(
+                exception.InvalidInputException,
+                instance_types.create, self.name, 256, -1, 120, self.flavorid)
+        self.assertRaises(
+                exception.InvalidInputException,
+                instance_types.create, self.name, 256, 1, "aa", self.flavorid)
+
+    def test_non_existant_inst_type_shouldnt_delete(self):
+        """Ensures that instance type creation fails with invalid args"""
+        self.assertRaises(exception.ApiError,
+                          instance_types.destroy, "sfsfsdfdfs")

=== modified file 'nova/tests/test_quota.py'
--- nova/tests/test_quota.py	2011-02-23 17:40:43 +0000
+++ nova/tests/test_quota.py	2011-03-03 01:57:15 +0000
@@ -74,19 +74,30 @@
         vol['size'] = size
         return db.volume_create(self.context, vol)['id']
 
+    def _get_instance_type(self, name):
+        instance_types = {
+            'm1.tiny': dict(memory_mb=512, vcpus=1, local_gb=0, flavorid=1),
+            'm1.small': dict(memory_mb=2048, vcpus=1, local_gb=20, flavorid=2),
+            'm1.medium':
+                dict(memory_mb=4096, vcpus=2, local_gb=40, flavorid=3),
+            'm1.large': dict(memory_mb=8192, vcpus=4, local_gb=80, flavorid=4),
+            'm1.xlarge':
+                dict(memory_mb=16384, vcpus=8, local_gb=160, flavorid=5)}
+        return instance_types[name]
+
     def test_quota_overrides(self):
         """Make sure overriding a projects quotas works"""
         num_instances = quota.allowed_instances(self.context, 100,
-            instance_types.INSTANCE_TYPES['m1.small'])
+            self._get_instance_type('m1.small'))
         self.assertEqual(num_instances, 2)
         db.quota_create(self.context, {'project_id': self.project.id,
                                        'instances': 10})
         num_instances = quota.allowed_instances(self.context, 100,
-            instance_types.INSTANCE_TYPES['m1.small'])
+            self._get_instance_type('m1.small'))
         self.assertEqual(num_instances, 4)
         db.quota_update(self.context, self.project.id, {'cores': 100})
         num_instances = quota.allowed_instances(self.context, 100,
-            instance_types.INSTANCE_TYPES['m1.small'])
+            self._get_instance_type('m1.small'))
         self.assertEqual(num_instances, 10)
 
         # metadata_items

=== modified file 'nova/tests/test_xenapi.py'
--- nova/tests/test_xenapi.py	2011-02-25 16:47:08 +0000
+++ nova/tests/test_xenapi.py	2011-03-03 01:57:15 +0000
@@ -233,7 +233,7 @@
         vm = vms[0]
 
         # Check that m1.large above turned into the right thing.
-        instance_type = instance_types.INSTANCE_TYPES['m1.large']
+        instance_type = db.instance_type_get_by_name(conn, 'm1.large')
         mem_kib = long(instance_type['memory_mb']) << 10
         mem_bytes = str(mem_kib << 10)
         vcpus = instance_type['vcpus']

=== modified file 'nova/virt/libvirt_conn.py'
--- nova/virt/libvirt_conn.py	2011-01-31 15:23:57 +0000
+++ nova/virt/libvirt_conn.py	2011-03-03 01:57:15 +0000
@@ -55,6 +55,7 @@
 from nova import exception
 from nova import flags
 from nova import log as logging
+#from nova import test
 from nova import utils
 #from nova.api import context
 from nova.auth import manager
@@ -606,7 +607,7 @@
                           user=user,
                           project=project,
                           size=size)
-        type_data = instance_types.INSTANCE_TYPES[inst['instance_type']]
+        type_data = instance_types.get_instance_type([inst['instance_type']])
 
         if type_data['local_gb']:
             self._cache_image(fn=self._create_local,
@@ -667,7 +668,8 @@
                                              instance['id'])
         # FIXME(vish): stick this in db
         instance_type = instance['instance_type']
-        instance_type = instance_types.INSTANCE_TYPES[instance_type]
+        # instance_type = test.INSTANCE_TYPES[instance_type]
+        instance_type = instance_types.get_instance_type(instance_type)
         ip_address = db.instance_get_fixed_address(context.get_admin_context(),
                                                    instance['id'])
         # Assume that the gateway also acts as the dhcp server.

=== modified file 'nova/virt/xenapi/vm_utils.py'
--- nova/virt/xenapi/vm_utils.py	2011-03-01 16:55:13 +0000
+++ nova/virt/xenapi/vm_utils.py	2011-03-03 01:57:15 +0000
@@ -86,7 +86,8 @@
         the pv_kernel flag indicates whether the guest is HVM or PV
         """
 
-        instance_type = instance_types.INSTANCE_TYPES[instance.instance_type]
+        instance_type = instance_types.\
+                                get_instance_type(instance.instance_type)
         mem = str(long(instance_type['memory_mb']) * 1024 * 1024)
         vcpus = str(instance_type['vcpus'])
         rec = {
@@ -144,7 +145,8 @@
 
     @classmethod
     def ensure_free_mem(cls, session, instance):
-        instance_type = instance_types.INSTANCE_TYPES[instance.instance_type]
+        instance_type = instance_types.get_instance_type(
+            instance.instance_type)
         mem = long(instance_type['memory_mb']) * 1024 * 1024
         #get free memory from host
         host = session.get_xenapi_host()

=== modified file 'plugins/xenserver/xenapi/etc/xapi.d/plugins/glance'
--- plugins/xenserver/xenapi/etc/xapi.d/plugins/glance	2011-02-25 03:16:04 +0000
+++ plugins/xenserver/xenapi/etc/xapi.d/plugins/glance	2011-03-03 01:57:15 +0000
@@ -207,8 +207,7 @@
         'transfer-encoding': 'chunked',
         'x-image-meta-is_public': 'True',
         'x-image-meta-status': 'queued',
-        'x-image-meta-type': 'vhd'
-     }
+        'x-image-meta-type': 'vhd'}
     for header, value in headers.iteritems():
         conn.putheader(header, value)
     conn.endheaders()