Flavor based reservation

.gitreview

@@ -2,3 +2,4 @@
 host=review.opendev.org
 port=29418
 project=openstack/blazar.git
+defaultbranch=stable/yoga

blazar/db/api.py

@@ -378,6 +378,28 @@ def host_update(host_id, values):
     IMPL.host_update(host_id, values)
 
 
+# ComputeHostResourceInventory
+
+def host_custom_resource_create(values):
+    """Create a Host CustomResource from the values."""
+    return IMPL.host_custom_resource_create(values)
+
+
+def host_custom_resource_get_all_per_host(host_id):
+    """Return all custom resources belonging to a specific Compute host."""
+    return IMPL.host_custom_resource_get_all_per_host(host_id)
+
+
+# ComputeHostTrait
+
+def host_trait_create(values):
+    return IMPL.host_trait_create(values)
+
+
+def host_trait_get_all_per_host(host_id):
+    return IMPL.host_trait_get_all_per_host(host_id)
+
+
 # ComputeHostExtraCapabilities
 
 def host_extra_capability_create(values):

blazar/db/migration/alembic_migrations/versions/2ae105568b6d_add_inventory_traits.py

@@ -0,0 +1,64 @@
+# Copyright 2023 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.
+
+"""test
+
+Revision ID: 2ae105568b6d
+Revises: e20cbce0504c
+Create Date: 2023-07-06 15:46:28.036821
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '2ae105568b6d'
+down_revision = 'e20cbce0504c'
+
+from alembic import op
+import sqlalchemy as sa
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('computehost_resource_inventory',
+    sa.Column('created_at', sa.DateTime(), nullable=True),
+    sa.Column('updated_at', sa.DateTime(), nullable=True),
+    sa.Column('id', sa.String(length=36), nullable=False),
+    sa.Column('computehost_id', sa.String(length=36), nullable=True),
+    sa.Column('resource_class', sa.String(length=255), nullable=False),
+    sa.Column('allocation_ratio', sa.Float(), nullable=False),
+    sa.Column('total', sa.Integer(), nullable=False),
+    sa.Column('reserved', sa.Integer(), nullable=False),
+    sa.Column('max_unit', sa.Integer(), nullable=False),
+    sa.Column('min_unit', sa.Integer(), nullable=False),
+    sa.ForeignKeyConstraint(['computehost_id'], ['computehosts.id'], ),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_table('computehost_trait',
+    sa.Column('created_at', sa.DateTime(), nullable=True),
+    sa.Column('updated_at', sa.DateTime(), nullable=True),
+    sa.Column('id', sa.String(length=36), nullable=False),
+    sa.Column('computehost_id', sa.String(length=36), nullable=True),
+    sa.Column('trait', sa.String(length=255), nullable=False),
+    sa.ForeignKeyConstraint(['computehost_id'], ['computehosts.id'], ),
+    sa.PrimaryKeyConstraint('id')
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table('computehost_trait')
+    op.drop_table('computehost_resource_inventory')
+    # ### end Alembic commands ###

blazar/db/migration/alembic_migrations/versions/e20cbce0504c_add_resource_inventory.py

@@ -0,0 +1,52 @@
+# Copyright 2023 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.
+
+"""add resource inventory
+
+Revision ID: e20cbce0504c
+Revises: 02e2f2186d98
+Create Date: 2023-07-06 14:45:39.036229
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = 'e20cbce0504c'
+down_revision = '02e2f2186d98'
+
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import mysql
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('instance_reservations', sa.Column('resource_inventory', sa.Text().with_variant(mysql.MEDIUMTEXT(), 'mysql'), nullable=True))
+    op.add_column('instance_reservations', sa.Column('resource_traits', sa.Text().with_variant(mysql.MEDIUMTEXT(), 'mysql'), nullable=True))
+    op.add_column('instance_reservations', sa.Column('source_flavor', sa.Text().with_variant(mysql.MEDIUMTEXT(), 'mysql'), nullable=True))
+    op.alter_column('instance_reservations', 'affinity',
+               existing_type=mysql.TINYINT(display_width=1),
+               nullable=True)
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.alter_column('instance_reservations', 'affinity',
+               existing_type=mysql.TINYINT(display_width=1),
+               nullable=False)
+    op.drop_column('instance_reservations', 'source_flavor_id')
+    op.drop_column('instance_reservations', 'resource_traits')
+    op.drop_column('instance_reservations', 'resource_inventory')
+    # ### end Alembic commands ###

blazar/db/sqlalchemy/api.py

@@ -746,6 +746,69 @@ def host_destroy(host_id):
         session.delete(host)
 
 
+# ComputeHostResourceInventory
+
+def host_custom_resource_create(values):
+    values = values.copy()
+
+    custom_resource = models.ComputeHostResourceInventory()
+    custom_resource.update(values)
+
+    session = get_session()
+    with session.begin():
+        try:
+            custom_resource.save(session=session)
+        except common_db_exc.DBDuplicateEntry as e:
+            # raise exception about duplicated columns (e.columns)
+            raise db_exc.BlazarDBDuplicateEntry(
+                model=custom_resource.__class__.__name__,
+                columns=e.columns)
+
+    return None
+
+
+def _host_custom_resource_get_all_per_host(session, host_id):
+    query = model_query(models.ComputeHostResourceInventory, session)
+    LOG.debug(query)
+    return query.filter_by(computehost_id=host_id)
+
+
+def host_custom_resource_get_all_per_host(host_id):
+    return _host_custom_resource_get_all_per_host(get_session(),
+                                                  host_id).all()
+
+
+# ComputeHostTrait
+
+def host_trait_create(values):
+    values = values.copy()
+
+    custom_resource = models.ComputeHostTrait()
+    custom_resource.update(values)
+
+    session = get_session()
+    with session.begin():
+        try:
+            custom_resource.save(session=session)
+        except common_db_exc.DBDuplicateEntry as e:
+            # raise exception about duplicated columns (e.columns)
+            raise db_exc.BlazarDBDuplicateEntry(
+                model=custom_resource.__class__.__name__,
+                columns=e.columns)
+
+    return None
+
+
+def _host_trait_get_all_per_host(session, host_id):
+    query = model_query(models.ComputeHostTrait, session)
+    LOG.debug(query)
+    return query.filter_by(computehost_id=host_id)
+
+
+def host_trait_get_all_per_host(host_id):
+    return _host_trait_get_all_per_host(get_session(),
+                                                  host_id).all()
+
 # ComputeHostExtraCapability
 
 def _host_resource_property_query(session):

blazar/db/sqlalchemy/models.py

@@ -206,6 +206,9 @@ class InstanceReservations(mb.BlazarBase):
     amount = sa.Column(sa.Integer, nullable=False)
     affinity = sa.Column(sa.Boolean, nullable=True)
     resource_properties = sa.Column(MediumText(), nullable=True)
+    resource_inventory = sa.Column(MediumText(), nullable=True)
+    resource_traits = sa.Column(MediumText(), nullable=True)
+    source_flavor = sa.Column(MediumText(), nullable=True)
     flavor_id = sa.Column(sa.String(36), nullable=True)
     aggregate_id = sa.Column(sa.Integer, nullable=True)
     server_group_id = sa.Column(sa.String(36), nullable=True)
@@ -253,11 +256,44 @@ class ComputeHost(mb.BlazarBase):
                                                   cascade="all,delete",
                                                   backref='computehost',
                                                   lazy='joined')
+    computehost_resource_inventory = relationship(
+        'ComputeHostResourceInventory', cascade="all,delete",
+        backref='computehost', lazy='joined')
+    computehost_traits = relationship(
+        'ComputeHostTrait', cascade="all,delete",
+        backref='computehost', lazy='joined')
 
     def to_dict(self):
         return super(ComputeHost, self).to_dict()
 
 
+class ComputeHostResourceInventory(mb.BlazarBase):
+    __tablename__ = 'computehost_resource_inventory'
+
+    id = _id_column()
+    computehost_id = sa.Column(sa.String(36), sa.ForeignKey('computehosts.id'))
+    resource_class = sa.Column(sa.String(255), nullable=False)
+    allocation_ratio = sa.Column(sa.Float, nullable=False)
+    total = sa.Column(sa.Integer, nullable=False)
+    reserved = sa.Column(sa.Integer, nullable=False)
+    max_unit = sa.Column(sa.Integer, nullable=False)
+    min_unit = sa.Column(sa.Integer, nullable=False)
+
+    def to_dict(self):
+        return super(ComputeHostResourceInventory, self).to_dict()
+
+
+class ComputeHostTrait(mb.BlazarBase):
+    __tablename__ = 'computehost_trait'
+
+    id = _id_column()
+    computehost_id = sa.Column(sa.String(36), sa.ForeignKey('computehosts.id'))
+    trait = sa.Column(sa.String(255), nullable=False)
+
+    def to_dict(self):
+        return super(ComputeHostTrait, self).to_dict()
+
+
 class ComputeHostExtraCapability(mb.BlazarBase):
     """Description
 

blazar/manager/exceptions.py

@@ -60,6 +60,10 @@ class HostNotFound(exceptions.NotFound):
     msg_fmt = _("Host '%(host)s' not found!")
 
 
+class ResourceProviderNotFound(exceptions.NotFound):
+    msg_fmt = _("Resource provider for host '%(host)s' not found!")
+
+
 class InvalidHost(exceptions.NotAuthorized):
     msg_fmt = _("Invalid values for host %(host)s")