Add resource_properties column to instance_reservations table
Partially Implements: blueprint flavors-extra-specs Change-Id: Iaa1c09923cecbcb0816529ee29470a9da33d3fe9
This commit is contained in:
parent
83860abbfe
commit
0596122a78
|
@ -0,0 +1,48 @@
|
||||||
|
# Copyright 2018 OpenStack Foundation.
|
||||||
|
#
|
||||||
|
# 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.
|
||||||
|
|
||||||
|
"""resource_properties_in_instance_plugin
|
||||||
|
|
||||||
|
Revision ID: c0ae6b08b0d7
|
||||||
|
Revises: 75a74e4539cb
|
||||||
|
Create Date: 2018-03-19 08:02:03.269871
|
||||||
|
|
||||||
|
"""
|
||||||
|
|
||||||
|
# revision identifiers, used by Alembic.
|
||||||
|
revision = 'c0ae6b08b0d7'
|
||||||
|
down_revision = '75a74e4539cb'
|
||||||
|
|
||||||
|
from alembic import op
|
||||||
|
import sqlalchemy as sa
|
||||||
|
from sqlalchemy.dialects.mysql import MEDIUMTEXT
|
||||||
|
|
||||||
|
|
||||||
|
def MediumText():
|
||||||
|
return sa.Text().with_variant(MEDIUMTEXT(), 'mysql')
|
||||||
|
|
||||||
|
|
||||||
|
def upgrade():
|
||||||
|
# ### commands auto generated by Alembic - please adjust! ###
|
||||||
|
op.add_column('instance_reservations',
|
||||||
|
sa.Column('resource_properties',
|
||||||
|
MediumText(), nullable=True, default=""))
|
||||||
|
# ### end Alembic commands ###
|
||||||
|
|
||||||
|
|
||||||
|
def downgrade():
|
||||||
|
# ### commands auto generated by Alembic - please adjust! ###
|
||||||
|
op.drop_column('instance_reservations', 'resource_properties')
|
||||||
|
# ### end Alembic commands ###
|
|
@ -120,7 +120,8 @@ class Reservation(mb.BlazarBase):
|
||||||
|
|
||||||
if self.instance_reservations:
|
if self.instance_reservations:
|
||||||
ir_keys = ['vcpus', 'memory_mb', 'disk_gb', 'amount', 'affinity',
|
ir_keys = ['vcpus', 'memory_mb', 'disk_gb', 'amount', 'affinity',
|
||||||
'flavor_id', 'aggregate_id', 'server_group_id']
|
'flavor_id', 'aggregate_id', 'server_group_id',
|
||||||
|
'resource_properties']
|
||||||
d.update(self.instance_reservations.to_dict(include=ir_keys))
|
d.update(self.instance_reservations.to_dict(include=ir_keys))
|
||||||
|
|
||||||
return d
|
return d
|
||||||
|
@ -174,6 +175,7 @@ class InstanceReservations(mb.BlazarBase):
|
||||||
disk_gb = sa.Column(sa.Integer, nullable=False)
|
disk_gb = sa.Column(sa.Integer, nullable=False)
|
||||||
amount = sa.Column(sa.Integer, nullable=False)
|
amount = sa.Column(sa.Integer, nullable=False)
|
||||||
affinity = sa.Column(sa.Boolean, nullable=False)
|
affinity = sa.Column(sa.Boolean, nullable=False)
|
||||||
|
resource_properties = sa.Column(MediumText(), nullable=True)
|
||||||
flavor_id = sa.Column(sa.String(36), nullable=True)
|
flavor_id = sa.Column(sa.String(36), nullable=True)
|
||||||
aggregate_id = sa.Column(sa.Integer, nullable=True)
|
aggregate_id = sa.Column(sa.Integer, nullable=True)
|
||||||
server_group_id = sa.Column(sa.String(36), nullable=True)
|
server_group_id = sa.Column(sa.String(36), nullable=True)
|
||||||
|
|
Loading…
Reference in New Issue