Synchronise master with upstream

README.rst

@@ -1,14 +1,11 @@
-Team and repository tags
-========================
+======
+Blazar
+======
 
 .. image:: https://governance.openstack.org/tc/badges/blazar.svg
-    :target: https://governance.openstack.org/tc/reference/tags/index.html
 
 .. Change things from this point on
 
-Blazar
-======
-
 Blazar is a resource reservation service for OpenStack. Blazar enables users
 to reserve a specific type/amount of resources for a specific time period and
 it leases these resources to users based on their reservations.

api-ref/source/v1/leases.inc

@@ -85,6 +85,24 @@ Parameters for Instance Reservation
 The following parameters are returned for instance reservation. All parameters
 are in the ``reservation`` object.
 
+.. rest_parameters:: parameters.yaml
+
+  - reservation.amount: reservation_amount
+  - reservation.vcpus: reservation_vcpus
+  - reservation.memory_mb: reservation_memory_mb
+  - reservation.disk_gb: reservation_disk_gb
+  - reservation.affinity : reservation_affinity
+  - reservation.resource_properties: reservation_resource_properties
+  - reservation.flavor_id: reservation_flavor_id
+  - reservation.server_group_id: reservation_server_group_id
+  - reservation.aggregate_id: reservation_aggregate_id
+
+Parameters for Flavor-based Instance Reservation
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The following parameters are returned for flavor-based instance reservation.
+All parameters are in the ``reservation`` object.
+
 .. rest_parameters:: parameters.yaml
 
   - reservation.amount: reservation_amount
@@ -161,6 +179,19 @@ are in the ``reservation`` object.
   - reservation.affinity : reservation_affinity
   - reservation.resource_properties: reservation_resource_properties
 
+Parameters for Flavor-based Instance Reservation
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The following parameters are required for flavor-based instance reservation.
+All parameters are in the ``reservation`` object.
+
+.. rest_parameters:: parameters.yaml
+
+  - reservation.amount: reservation_amount
+  - reservation.flavor_id: reservation_flavor_id
+  - reservation.affinity : reservation_affinity
+  - reservation.resource_properties: reservation_resource_properties
+
 **Example of Create Lease Request**
 
 .. literalinclude:: ../../../doc/api_samples/leases/lease-create-req.json
@@ -225,6 +256,21 @@ Parameters for Instance Reservation
 The following parameters are returned for instance reservation. All parameters
 are in the ``reservation`` object.
 
+.. rest_parameters:: parameters.yaml
+
+  - reservation.amount: reservation_amount
+  - reservation.vcpus: reservation_vcpus
+  - reservation.memory_mb: reservation_memory_mb
+  - reservation.disk_gb: reservation_disk_gb
+  - reservation.affinity : reservation_affinity
+  - reservation.resource_properties: reservation_resource_properties
+  - reservation.flavor_id: reservation_flavor_id
+  - reservation.server_group_id: reservation_server_group_id
+  - reservation.aggregate_id: reservation_aggregate_id
+
+Parameters for Flavor-based Instance Reservation
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
 .. rest_parameters:: parameters.yaml
 
   - reservation.amount: reservation_amount
@@ -326,6 +372,21 @@ Parameters for Instance Reservation
 The following parameters are returned for instance reservation. All parameters
 are in the ``reservation`` object.
 
+.. rest_parameters:: parameters.yaml
+
+  - reservation.amount: reservation_amount
+  - reservation.vcpus: reservation_vcpus
+  - reservation.memory_mb: reservation_memory_mb
+  - reservation.disk_gb: reservation_disk_gb
+  - reservation.affinity : reservation_affinity
+  - reservation.resource_properties: reservation_resource_properties
+  - reservation.flavor_id: reservation_flavor_id
+  - reservation.server_group_id: reservation_server_group_id
+  - reservation.aggregate_id: reservation_aggregate_id
+
+Parameters for Flavor-based Instance Reservation
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
 .. rest_parameters:: parameters.yaml
 
   - reservation.amount: reservation_amount
@@ -406,6 +467,12 @@ are in the ``reservation`` object.
   - reservation.affinity : reservation_affinity_optional
   - reservation.resource_properties: reservation_resource_properties_optional
 
+Parameters for Flavor-based Instance Reservation
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Lease updates are not currently supported for flavor-based instance
+reservations.
+
 **Example of Update Lease Request**
 
 .. literalinclude:: ../../../doc/api_samples/leases/lease-update-req.json
@@ -482,6 +549,12 @@ are in the ``reservation`` object.
   - reservation.server_group_id: reservation_server_group_id
   - reservation.aggregate_id: reservation_aggregate_id
 
+Parameters for Flavor-based Instance Reservation
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Lease updates are not currently supported for flavor-based instance
+reservations.
+
 **Example of Update Lease Response**
 
 .. literalinclude:: ../../../doc/api_samples/leases/lease-update-resp.json

blazar/config.py

@@ -16,17 +16,14 @@
 
 from oslo_config import cfg
 from oslo_log import log as logging
-from oslo_policy import opts
 
 
 cli_opts = [
     cfg.HostAddressOpt('host', default='0.0.0.0',
                        help='Name of this node. This can be an opaque '
                             'identifier. It is not necessarily a hostname, '
                             'FQDN, or IP address. However, the node name must '
-                            'be valid within an AMQP key, and if using '
-                            'ZeroMQ (will be removed in the Stein release), a '
-                            'valid hostname, FQDN, or IP address'),
+                            'be valid within an AMQP key.'),
     cfg.BoolOpt('log_exchange', default=False,
                 help='Log request/response exchange details: environ, '
                      'headers and bodies'),
@@ -91,18 +88,3 @@
 CONF.register_opts(api_opts)
 CONF.register_opts(lease_opts)
 logging.register_options(cfg.CONF)
-
-
-def set_lib_defaults():
-    """Update default value for configuration options from other namespace.
-
-    Example, oslo lib config options. This is needed for
-    config generator tool to pick these default value changes.
-    https://docs.openstack.org/oslo.config/latest/cli/
-    generator.html#modifying-defaults-from-other-namespaces
-    """
-
-    # TODO(gmann): Remove setting the default value of config policy_file
-    # once oslo_policy change the default value to 'policy.yaml'.
-    # https://github.com/openstack/oslo.policy/blob/a626ad12fe5a3abd49d70e3e5b95589d279ab578/oslo_policy/opts.py#L49
-    opts.set_defaults(CONF, 'policy.yaml')

blazar/db/sqlalchemy/model_base.py

@@ -14,8 +14,8 @@
 # limitations under the License.
 
 from oslo_db.sqlalchemy import models
-from sqlalchemy.ext import declarative
 from sqlalchemy.orm import attributes
+from sqlalchemy.orm import declarative_base
 
 
 class _BlazarBase(models.ModelBase, models.TimestampMixin):
@@ -49,4 +49,4 @@ def datetime_to_str(dct, attr_name):
         dct[attr_name] = dct[attr_name].isoformat(' ')
 
 
-BlazarBase = declarative.declarative_base(cls=_BlazarBase)
+BlazarBase = declarative_base(cls=_BlazarBase)

blazar/manager/service.py

@@ -21,6 +21,7 @@
 from oslo_config import cfg
 from oslo_log import log as logging
 from oslo_utils.excutils import save_and_reraise_exception
+from oslo_utils import timeutils
 from stevedore import enabled
 
 from blazar import context
@@ -236,7 +237,7 @@ def _process_events(self):
             sort_dir='asc',
             filters={'status': status.event.UNDONE,
                      'time': {'op': 'le',
-                              'border': datetime.datetime.utcnow()}}
+                              'border': timeutils.utcnow()}}
         )
 
         for batch in self._select_for_execution(events):
@@ -252,7 +253,7 @@ def _exec_event(self, event):
         try:
             event_fn(lease_id=event['lease_id'], event_id=event['id'])
         except common_ex.InvalidStatus:
-            now = datetime.datetime.utcnow()
+            now = timeutils.utcnow()
             if now < event['time'] + datetime.timedelta(
                     seconds=CONF.manager.event_max_retries * 10):
                 # Set the event status UNDONE for retrying the event
@@ -284,7 +285,7 @@ def _date_from_string(self, date_string, date_format=LEASE_DATE_FORMAT):
         return date
 
     def _parse_lease_dates(self, start_date, end_date):
-        now = datetime.datetime.utcnow()
+        now = timeutils.utcnow()
         now = datetime.datetime(now.year,
                                 now.month,
                                 now.day,
@@ -508,6 +509,13 @@ def _add_resource_type(self, reservations, existing_reservations):
 
         return reservations
 
+    def _handle_resource_type_exception(self, lease):
+        for reservation in lease['reservations']:
+            if reservation['resource_type'] == 'flavor:instance':
+                raise exceptions.NotImplemented(
+                    error="Updating leases for 'flavor:instance' type "
+                          "reservations is not yet supported.")
+
     @status.lease.lease_status(
         transition=status.lease.UPDATING,
         result_in=status.lease.STABLE,
@@ -534,6 +542,9 @@ def update_lease(self, lease_id, values):
             return db_api.lease_get(lease_id)
 
         lease = db_api.lease_get(lease_id)
+
+        self._handle_resource_type_exception(lease)
+
         start_date = values.get(
             'start_date',
             datetime.datetime.strftime(lease['start_date'], LEASE_DATE_FORMAT))

blazar/notification/api.py

@@ -27,6 +27,14 @@ def format_lease_payload(lease):
         'lease_id': lease['id'],
         'user_id': lease['user_id'],
         'project_id': lease['project_id'],
+        'trust_id': lease['trust_id'],
         'start_date': lease['start_date'],
-        'end_date': lease['end_date']
+        'end_date': lease['end_date'],
+        'status': lease['status'],
+        'reservations': lease['reservations'],
+        'events': lease['events'],
+        'name': lease.get('name'),
+        'created_at': lease.get('created_at'),
+        'updated_at': lease.get('updated_at'),
+        'degraded': lease.get('degraded')
     }

blazar/plugins/flavor/flavor_plugin.py

@@ -133,8 +133,42 @@ def _query_available_hosts(self, start_date, end_date,
                 end_date + datetime.timedelta(minutes=CONF.cleaning_time),
                 [])
 
+        placement_rps_matching_traits = None
+        # Only query placement if we have traits to match
+        if resource_traits:
+            traits_list = []
+            for trait, value in resource_traits.items():
+                # We've already validated resource_traits at this point
+                if value == "required":
+                    traits_list.append(trait)
+                elif value == "forbidden":
+                    # prefix forbidden traits with `!`
+                    traits_list.append(f"!{trait}")
+            required_string = ",".join(traits_list)
+            placement_rps_matching_traits = \
+                self._placement_client.list_resource_providers(
+                    query=f"required={required_string}",
+                    microversion="1.22",
+                )
+        placement_rps_matching_traits_hostnames = {
+            rp['name'] for rp in placement_rps_matching_traits
+        } if placement_rps_matching_traits else set()
+
         available_hosts = []
         for host_info in (reserved_hosts + free_hosts):
+            hypervisor_hostname = host_info['host']['hypervisor_hostname']
+            if (
+                resource_traits and
+                (
+                    hypervisor_hostname
+                    not in placement_rps_matching_traits_hostnames
+                )
+            ):
+                LOG.debug(
+                    "Placement filtered out host %s based on traits",
+                    hypervisor_hostname
+                )
+                continue
             # check how many instances can fit on this host
             hosts_list = self._get_hosts_list(host_info, resource_request)
             available_hosts.extend(hosts_list)
@@ -391,6 +425,7 @@ def _create_flavor(self, instance_reservation):
             'vcpus': source_flavor['vcpus'],
             'ram': source_flavor['ram'],
             'disk': source_flavor['disk'],
+            'ephemeral': source_flavor.get('OS-FLV-EXT-DATA:ephemeral', 0),
             'is_public': False
         }
         # create flavor using admin access

blazar/plugins/floatingips/floatingip_plugin.py

@@ -19,6 +19,7 @@
 from oslo_utils.excutils import save_and_reraise_exception
 from oslo_utils import netutils
 from oslo_utils import strutils
+from oslo_utils import timeutils
 
 from blazar import context
 from blazar.db import api as db_api
@@ -422,7 +423,7 @@ def query_fip_allocations(self, fips, detail=None, lease_id=None,
                      ]
         }.
         """
-        start = datetime.datetime.utcnow()
+        start = timeutils.utcnow()
         end = datetime.date.max
 
         reservations = db_utils.get_reservation_allocations_by_fip_ids(

blazar/plugins/instances/instance_plugin.py

@@ -21,6 +21,7 @@
 from oslo_log import log as logging
 from oslo_utils import strutils
 from oslo_utils.strutils import bool_from_string
+from oslo_utils import timeutils
 
 from blazar import context
 from blazar.db import api as db_api
@@ -167,7 +168,7 @@ def query_allocations(self, hosts, lease_id=None, reservation_id=None):
                      ]
         }.
         """
-        start = datetime.datetime.utcnow()
+        start = timeutils.utcnow()
         end = datetime.date.max
 
         # To reduce overhead, this method only executes one query
@@ -549,7 +550,8 @@ def update_reservation(self, reservation_id, new_values):
             return
 
         if (reservation['status'] == 'active' and
-                any([k in updatable[:-1] for k in new_values.keys()])):
+                any([k in updatable for k in new_values.keys()
+                     if k != 'amount'])):
             msg = "An active reservation only accepts to update amount."
             raise mgr_exceptions.InvalidStateUpdate(msg)
 
@@ -770,8 +772,7 @@ def _heal_reservation(self, reservation, host_ids):
     def _select_host(self, reservation, lease):
         """Returns the alternative host id or None if not found."""
         values = {}
-        values['start_date'] = max(datetime.datetime.utcnow(),
-                                   lease['start_date'])
+        values['start_date'] = max(timeutils.utcnow(), lease['start_date'])
         values['end_date'] = lease['end_date']
         specs = ['vcpus', 'memory_mb', 'disk_gb', 'affinity', 'amount',
                  'resource_properties']