From bb6374dfeb81f020d82161c28a6b31be636fbc01 Mon Sep 17 00:00:00 2001 From: Sandy Walsh Date: Mon, 12 Sep 2011 04:59:58 -0700 Subject: region name --- nova/scheduler/zone_manager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nova/scheduler/zone_manager.py b/nova/scheduler/zone_manager.py index d3cf57639..a15228182 100644 --- a/nova/scheduler/zone_manager.py +++ b/nova/scheduler/zone_manager.py @@ -90,7 +90,7 @@ class ZoneState(object): def _call_novaclient(zone): """Call novaclient. Broken out for testing purposes.""" client = novaclient.Client(zone.username, zone.password, None, - zone.api_url, service_name = zone.name) + zone.api_url, region_name = zone.name) return client.zones.info()._info -- cgit From 5de08f3ac11d936979a3c08c27b3b19b72d58373 Mon Sep 17 00:00:00 2001 From: Sandy Walsh Date: Mon, 12 Sep 2011 07:37:02 -0700 Subject: migration move --- .../migrate_repo/versions/045_add_zone_name.py | 35 ---------------------- .../migrate_repo/versions/046_add_zone_name.py | 35 ++++++++++++++++++++++ 2 files changed, 35 insertions(+), 35 deletions(-) delete mode 100644 nova/db/sqlalchemy/migrate_repo/versions/045_add_zone_name.py create mode 100644 nova/db/sqlalchemy/migrate_repo/versions/046_add_zone_name.py diff --git a/nova/db/sqlalchemy/migrate_repo/versions/045_add_zone_name.py b/nova/db/sqlalchemy/migrate_repo/versions/045_add_zone_name.py deleted file mode 100644 index 3198e48a9..000000000 --- a/nova/db/sqlalchemy/migrate_repo/versions/045_add_zone_name.py +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 2011 OpenStack LLC. -# -# 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 Column, Integer, MetaData, String, Table - -meta = MetaData() - -zones = Table('zones', meta, - Column('id', Integer(), primary_key=True, nullable=False), - ) - -name = Column('name', String(255)) - - -def upgrade(migrate_engine): - meta.bind = migrate_engine - - zones.create_column(name) - - -def downgrade(migrate_engine): - meta.bind = migrate_engine - - zones.drop_column(name) diff --git a/nova/db/sqlalchemy/migrate_repo/versions/046_add_zone_name.py b/nova/db/sqlalchemy/migrate_repo/versions/046_add_zone_name.py new file mode 100644 index 000000000..3198e48a9 --- /dev/null +++ b/nova/db/sqlalchemy/migrate_repo/versions/046_add_zone_name.py @@ -0,0 +1,35 @@ +# Copyright 2011 OpenStack LLC. +# +# 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 Column, Integer, MetaData, String, Table + +meta = MetaData() + +zones = Table('zones', meta, + Column('id', Integer(), primary_key=True, nullable=False), + ) + +name = Column('name', String(255)) + + +def upgrade(migrate_engine): + meta.bind = migrate_engine + + zones.create_column(name) + + +def downgrade(migrate_engine): + meta.bind = migrate_engine + + zones.drop_column(name) -- cgit