diff options
23 files changed, 43 insertions, 23 deletions
diff --git a/doc/api_samples/os-baremetal-nodes/baremetal-node-create-req.json b/doc/api_samples/os-baremetal-nodes/baremetal-node-create-req.json index d8b9eb452..fa6455c49 100644 --- a/doc/api_samples/os-baremetal-nodes/baremetal-node-create-req.json +++ b/doc/api_samples/os-baremetal-nodes/baremetal-node-create-req.json @@ -8,7 +8,6 @@ "pm_user": "pm_user", "pm_password": "pm_pass", "prov_mac_address": "12:34:56:78:90:ab", - "prov_vlan_id": 1234, "terminal_port": 8000 } }
\ No newline at end of file diff --git a/doc/api_samples/os-baremetal-nodes/baremetal-node-create-req.xml b/doc/api_samples/os-baremetal-nodes/baremetal-node-create-req.xml index 85c863a97..3cbc3ea8a 100644 --- a/doc/api_samples/os-baremetal-nodes/baremetal-node-create-req.xml +++ b/doc/api_samples/os-baremetal-nodes/baremetal-node-create-req.xml @@ -7,6 +7,5 @@ pm_address="10.1.2.3" pm_user="pm_user" prov_mac_address="12:34:56:78:90:ab" - prov_vlan_id="1234" terminal_port="8000" />
\ No newline at end of file diff --git a/doc/api_samples/os-baremetal-nodes/baremetal-node-create-resp.json b/doc/api_samples/os-baremetal-nodes/baremetal-node-create-resp.json index b62a9e663..0f176482c 100644 --- a/doc/api_samples/os-baremetal-nodes/baremetal-node-create-resp.json +++ b/doc/api_samples/os-baremetal-nodes/baremetal-node-create-resp.json @@ -9,7 +9,6 @@ "pm_address": "10.1.2.3", "pm_user": "pm_user", "prov_mac_address": "12:34:56:78:90:ab", - "prov_vlan_id": 1234, "service_host": "host", "terminal_port": 8000 } diff --git a/doc/api_samples/os-baremetal-nodes/baremetal-node-create-resp.xml b/doc/api_samples/os-baremetal-nodes/baremetal-node-create-resp.xml index 9b8421f0f..20fb43b64 100644 --- a/doc/api_samples/os-baremetal-nodes/baremetal-node-create-resp.xml +++ b/doc/api_samples/os-baremetal-nodes/baremetal-node-create-resp.xml @@ -3,7 +3,6 @@ instance_uuid="None" pm_address="10.1.2.3" cpus="8" - prov_vlan_id="1234" memory_mb="8192" prov_mac_address="12:34:56:78:90:ab" service_host="host" diff --git a/doc/api_samples/os-baremetal-nodes/baremetal-node-list-resp.json b/doc/api_samples/os-baremetal-nodes/baremetal-node-list-resp.json index d43d580ed..d85f7c6f7 100644 --- a/doc/api_samples/os-baremetal-nodes/baremetal-node-list-resp.json +++ b/doc/api_samples/os-baremetal-nodes/baremetal-node-list-resp.json @@ -17,7 +17,6 @@ "pm_address": "10.1.2.3", "pm_user": "pm_user", "prov_mac_address": "12:34:56:78:90:ab", - "prov_vlan_id": 1234, "service_host": "host", "terminal_port": 8000 } diff --git a/doc/api_samples/os-baremetal-nodes/baremetal-node-list-resp.xml b/doc/api_samples/os-baremetal-nodes/baremetal-node-list-resp.xml index 7cd1b5d8a..feb3d6f1d 100644 --- a/doc/api_samples/os-baremetal-nodes/baremetal-node-list-resp.xml +++ b/doc/api_samples/os-baremetal-nodes/baremetal-node-list-resp.xml @@ -4,7 +4,6 @@ instance_uuid="None" pm_address="10.1.2.3" cpus="8" - prov_vlan_id="1234" memory_mb="8192" prov_mac_address="12:34:56:78:90:ab" service_host="host" diff --git a/doc/api_samples/os-baremetal-nodes/baremetal-node-show-resp.json b/doc/api_samples/os-baremetal-nodes/baremetal-node-show-resp.json index d42365752..c407c20a2 100644 --- a/doc/api_samples/os-baremetal-nodes/baremetal-node-show-resp.json +++ b/doc/api_samples/os-baremetal-nodes/baremetal-node-show-resp.json @@ -16,7 +16,6 @@ "pm_address": "10.1.2.3", "pm_user": "pm_user", "prov_mac_address": "12:34:56:78:90:ab", - "prov_vlan_id": 1234, "service_host": "host", "terminal_port": 8000 } diff --git a/doc/api_samples/os-baremetal-nodes/baremetal-node-show-resp.xml b/doc/api_samples/os-baremetal-nodes/baremetal-node-show-resp.xml index 6d5f9719f..12d881a3f 100644 --- a/doc/api_samples/os-baremetal-nodes/baremetal-node-show-resp.xml +++ b/doc/api_samples/os-baremetal-nodes/baremetal-node-show-resp.xml @@ -3,7 +3,6 @@ instance_uuid="None" pm_address="10.1.2.3" cpus="8" - prov_vlan_id="1234" memory_mb="8192" prov_mac_address="12:34:56:78:90:ab" service_host="host" diff --git a/nova/api/openstack/compute/contrib/baremetal_nodes.py b/nova/api/openstack/compute/contrib/baremetal_nodes.py index e0d8e7d06..0f2d30935 100644 --- a/nova/api/openstack/compute/contrib/baremetal_nodes.py +++ b/nova/api/openstack/compute/contrib/baremetal_nodes.py @@ -28,7 +28,7 @@ LOG = logging.getLogger(__name__) authorize = extensions.extension_authorizer('compute', 'baremetal_nodes') node_fields = ['id', 'cpus', 'local_gb', 'memory_mb', 'pm_address', - 'pm_user', 'prov_mac_address', 'prov_vlan_id', + 'pm_user', 'prov_mac_address', 'service_host', 'terminal_port', 'instance_uuid', ] diff --git a/nova/tests/api/openstack/compute/contrib/test_baremetal_nodes.py b/nova/tests/api/openstack/compute/contrib/test_baremetal_nodes.py index fc4ae8122..76ebd8dec 100644 --- a/nova/tests/api/openstack/compute/contrib/test_baremetal_nodes.py +++ b/nova/tests/api/openstack/compute/contrib/test_baremetal_nodes.py @@ -47,7 +47,6 @@ class BareMetalNodesTest(test.TestCase): 'pm_user': "pm_user", 'pm_password': "pm_pass", 'prov_mac_address': "12:34:56:78:90:ab", - 'prov_vlan_id': 1234, 'terminal_port': 8000, 'interfaces': [], } diff --git a/nova/tests/baremetal/db/utils.py b/nova/tests/baremetal/db/utils.py index 74553f895..f50abd2e6 100644 --- a/nova/tests/baremetal/db/utils.py +++ b/nova/tests/baremetal/db/utils.py @@ -32,9 +32,7 @@ def new_bm_node(**kwargs): h.pm_user = kwargs.pop('pm_user', 'ipmi_user') h.pm_password = kwargs.pop('pm_password', 'ipmi_password') h.prov_mac_address = kwargs.pop('prov_mac_address', '12:34:56:78:90:ab') - h.registration_status = kwargs.pop('registration_status', 'done') h.task_state = kwargs.pop('task_state', None) - h.prov_vlan_id = kwargs.pop('prov_vlan_id', None) h.terminal_port = kwargs.pop('terminal_port', 8000) if len(kwargs) > 0: raise test.TestingException("unknown field: %s" diff --git a/nova/tests/integrated/api_samples/os-baremetal-nodes/baremetal-node-create-req.json.tpl b/nova/tests/integrated/api_samples/os-baremetal-nodes/baremetal-node-create-req.json.tpl index fd2ae101f..82b6485b9 100644 --- a/nova/tests/integrated/api_samples/os-baremetal-nodes/baremetal-node-create-req.json.tpl +++ b/nova/tests/integrated/api_samples/os-baremetal-nodes/baremetal-node-create-req.json.tpl @@ -8,7 +8,6 @@ "pm_user": "pm_user", "pm_password": "pm_pass", "prov_mac_address": "12:34:56:78:90:ab", - "prov_vlan_id": 1234, "terminal_port": 8000 } } diff --git a/nova/tests/integrated/api_samples/os-baremetal-nodes/baremetal-node-create-req.xml.tpl b/nova/tests/integrated/api_samples/os-baremetal-nodes/baremetal-node-create-req.xml.tpl index 78a2c1c74..8065c41c1 100644 --- a/nova/tests/integrated/api_samples/os-baremetal-nodes/baremetal-node-create-req.xml.tpl +++ b/nova/tests/integrated/api_samples/os-baremetal-nodes/baremetal-node-create-req.xml.tpl @@ -7,6 +7,5 @@ pm_address="10.1.2.3" pm_user="pm_user" prov_mac_address="12:34:56:78:90:ab" - prov_vlan_id="1234" terminal_port="8000" /> diff --git a/nova/tests/integrated/api_samples/os-baremetal-nodes/baremetal-node-create-resp.json.tpl b/nova/tests/integrated/api_samples/os-baremetal-nodes/baremetal-node-create-resp.json.tpl index d3911b49d..a0d976b99 100644 --- a/nova/tests/integrated/api_samples/os-baremetal-nodes/baremetal-node-create-resp.json.tpl +++ b/nova/tests/integrated/api_samples/os-baremetal-nodes/baremetal-node-create-resp.json.tpl @@ -7,7 +7,6 @@ "pm_address": "10.1.2.3", "pm_user": "pm_user", "prov_mac_address": "12:34:56:78:90:ab", - "prov_vlan_id": 1234, "terminal_port": 8000, "instance_uuid": null, "id": %(node_id)s, diff --git a/nova/tests/integrated/api_samples/os-baremetal-nodes/baremetal-node-create-resp.xml.tpl b/nova/tests/integrated/api_samples/os-baremetal-nodes/baremetal-node-create-resp.xml.tpl index f21d16a11..1c3700841 100644 --- a/nova/tests/integrated/api_samples/os-baremetal-nodes/baremetal-node-create-resp.xml.tpl +++ b/nova/tests/integrated/api_samples/os-baremetal-nodes/baremetal-node-create-resp.xml.tpl @@ -7,7 +7,6 @@ pm_address="10.1.2.3" pm_user="pm_user" prov_mac_address="12:34:56:78:90:ab" - prov_vlan_id="1234" terminal_port="8000" instance_uuid="None" id="%(node_id)s"> diff --git a/nova/tests/integrated/api_samples/os-baremetal-nodes/baremetal-node-list-resp.json.tpl b/nova/tests/integrated/api_samples/os-baremetal-nodes/baremetal-node-list-resp.json.tpl index 9b04a9cea..4a5e03701 100644 --- a/nova/tests/integrated/api_samples/os-baremetal-nodes/baremetal-node-list-resp.json.tpl +++ b/nova/tests/integrated/api_samples/os-baremetal-nodes/baremetal-node-list-resp.json.tpl @@ -7,7 +7,6 @@ "pm_address": "10.1.2.3", "pm_user": "pm_user", "prov_mac_address": "12:34:56:78:90:ab", - "prov_vlan_id": 1234, "terminal_port": 8000, "instance_uuid": null, "id": %(node_id)s, diff --git a/nova/tests/integrated/api_samples/os-baremetal-nodes/baremetal-node-list-resp.xml.tpl b/nova/tests/integrated/api_samples/os-baremetal-nodes/baremetal-node-list-resp.xml.tpl index f17b6cc20..f8cfc3885 100644 --- a/nova/tests/integrated/api_samples/os-baremetal-nodes/baremetal-node-list-resp.xml.tpl +++ b/nova/tests/integrated/api_samples/os-baremetal-nodes/baremetal-node-list-resp.xml.tpl @@ -8,7 +8,6 @@ pm_address="10.1.2.3" pm_user="pm_user" prov_mac_address="12:34:56:78:90:ab" - prov_vlan_id="1234" terminal_port="8000" instance_uuid="None" id="%(node_id)s"> diff --git a/nova/tests/integrated/api_samples/os-baremetal-nodes/baremetal-node-show-resp.json.tpl b/nova/tests/integrated/api_samples/os-baremetal-nodes/baremetal-node-show-resp.json.tpl index 701b33d24..67a878a4a 100644 --- a/nova/tests/integrated/api_samples/os-baremetal-nodes/baremetal-node-show-resp.json.tpl +++ b/nova/tests/integrated/api_samples/os-baremetal-nodes/baremetal-node-show-resp.json.tpl @@ -7,7 +7,6 @@ "pm_address": "10.1.2.3", "pm_user": "pm_user", "prov_mac_address": "12:34:56:78:90:ab", - "prov_vlan_id": 1234, "terminal_port": 8000, "instance_uuid": null, "id": %(node_id)s, diff --git a/nova/tests/integrated/api_samples/os-baremetal-nodes/baremetal-node-show-resp.xml.tpl b/nova/tests/integrated/api_samples/os-baremetal-nodes/baremetal-node-show-resp.xml.tpl index 36e5568e5..667024116 100644 --- a/nova/tests/integrated/api_samples/os-baremetal-nodes/baremetal-node-show-resp.xml.tpl +++ b/nova/tests/integrated/api_samples/os-baremetal-nodes/baremetal-node-show-resp.xml.tpl @@ -7,7 +7,6 @@ pm_address="10.1.2.3" pm_user="pm_user" prov_mac_address="12:34:56:78:90:ab" - prov_vlan_id="1234" terminal_port="8000" instance_uuid="None" id="%(node_id)s"> diff --git a/nova/tests/test_migrations.py b/nova/tests/test_migrations.py index c78bb6d24..94854140d 100644 --- a/nova/tests/test_migrations.py +++ b/nova/tests/test_migrations.py @@ -1238,3 +1238,9 @@ class TestBaremetalMigrations(BaseMigrationTestCase, CommonTestsMixIn): def _post_downgrade_004(self, engine): bm_nodes = get_table(engine, 'bm_nodes') self.assertNotIn(u'instance_name', [c.name for c in bm_nodes.columns]) + + def _check_005(self, engine, data): + bm_nodes = get_table(engine, 'bm_nodes') + columns = [c.name for c in bm_nodes.columns] + self.assertNotIn(u'prov_vlan_id', columns) + self.assertNotIn(u'registration_status', columns) diff --git a/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/005_drop_unused_columns_from_nodes.py b/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/005_drop_unused_columns_from_nodes.py new file mode 100644 index 000000000..cb361f947 --- /dev/null +++ b/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/005_drop_unused_columns_from_nodes.py @@ -0,0 +1,35 @@ +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright (c) 2013 NTT DOCOMO, INC. +# +# 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, String, Integer, MetaData, Table + + +def upgrade(migrate_engine): + meta = MetaData() + meta.bind = migrate_engine + + nodes = Table('bm_nodes', meta, autoload=True) + nodes.drop_column('prov_vlan_id') + nodes.drop_column('registration_status') + + +def downgrade(migrate_engine): + meta = MetaData() + meta.bind = migrate_engine + + nodes = Table('bm_nodes', meta, autoload=True) + nodes.create_column(Column('prov_vlan_id', Integer)) + nodes.create_column(Column('registration_status', String(length=16))) diff --git a/nova/virt/baremetal/db/sqlalchemy/models.py b/nova/virt/baremetal/db/sqlalchemy/models.py index 35f3b176c..61063f031 100644 --- a/nova/virt/baremetal/db/sqlalchemy/models.py +++ b/nova/virt/baremetal/db/sqlalchemy/models.py @@ -46,9 +46,7 @@ class BareMetalNode(BASE, models.NovaBase): pm_user = Column(Text) pm_password = Column(Text) prov_mac_address = Column(Text) - registration_status = Column(String(16)) task_state = Column(String(255)) - prov_vlan_id = Column(Integer) terminal_port = Column(Integer) image_path = Column(String(255), nullable=True) pxe_config_path = Column(String(255), nullable=True) diff --git a/nova/virt/baremetal/driver.py b/nova/virt/baremetal/driver.py index 97d72cc74..8e5559533 100755 --- a/nova/virt/baremetal/driver.py +++ b/nova/virt/baremetal/driver.py @@ -387,7 +387,7 @@ class BareMetalDriver(driver.ComputeDriver): vcpus = node['cpus'] memory_mb = node['memory_mb'] local_gb = node['local_gb'] - if node['registration_status'] != 'done' or node['instance_uuid']: + if node['instance_uuid']: vcpus_used = node['cpus'] memory_mb_used = node['memory_mb'] local_gb_used = node['local_gb'] |