diff options
| author | Sandy Walsh <sandy.walsh@rackspace.com> | 2011-08-31 11:54:30 -0700 |
|---|---|---|
| committer | Sandy Walsh <sandy.walsh@rackspace.com> | 2011-08-31 11:54:30 -0700 |
| commit | 6b67b2f391830da52dea5cd84bd564bab692f365 (patch) | |
| tree | 0d3fc90f2a20f0eceec6a65d7ee9621242ebda81 | |
| parent | 2a2aa10316abe9135541198bddd4c189976eb2fd (diff) | |
| download | nova-6b67b2f391830da52dea5cd84bd564bab692f365.tar.gz nova-6b67b2f391830da52dea5cd84bd564bab692f365.tar.xz nova-6b67b2f391830da52dea5cd84bd564bab692f365.zip | |
zone_add fixed to support zone name
| -rw-r--r-- | nova/api/openstack/zones.py | 2 | ||||
| -rw-r--r-- | nova/db/sqlalchemy/models.py | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/nova/api/openstack/zones.py b/nova/api/openstack/zones.py index a2bf267ed..998498e82 100644 --- a/nova/api/openstack/zones.py +++ b/nova/api/openstack/zones.py @@ -46,7 +46,7 @@ def _filter_keys(item, keys): def _exclude_keys(item, keys): - return dict((k, v) for k, v in item.iteritems() if k not in keys) + return dict((k, v) for k, v in item.iteritems() if k and (k not in keys)) def _scrub_zone(zone): diff --git a/nova/db/sqlalchemy/models.py b/nova/db/sqlalchemy/models.py index f8feb0b4f..dd447457b 100644 --- a/nova/db/sqlalchemy/models.py +++ b/nova/db/sqlalchemy/models.py @@ -847,6 +847,7 @@ class Zone(BASE, NovaBase): """Represents a child zone of this zone.""" __tablename__ = 'zones' id = Column(Integer, primary_key=True) + name = Column(String(255)) api_url = Column(String(255)) username = Column(String(255)) password = Column(String(255)) |