[1] http://lists.openstack.org/pipermail/openstack-discuss/2020-October/018445.html

Conflicts:
  .zuul.yaml
  lower-constraints.txt

NOTE(stephenfin): Conflicts are due to the changed job template
(victoria vs wallaby) and slightly different lower constraints between
branches.

Change-Id: I45e9a81d451c64cdd51f9b606d94161742bacdb7
(cherry picked from commit c677192d51ac80922f990c8a96b49e9dcc9325d2)
(cherry picked from commit cde8db3d619ff94369cdabeebb42d3ecc2027651)
(cherry picked from commit 40f56c653cc4eabf9edc05b5c5785e818295b013)

Add pagination parameters, '--limit' and '--offset'. It's unfortunate
that we can't use '--marker' like elsewhere but that requires
server-side support to be truly effective.

Change-Id: I186adc8cdf28e9c540ad22bca6684d9dd892976a
Signed-off-by: Stephen Finucane <sfinucan@redhat.com>
(cherry picked from commit 5ec4d4c7188f4766d270be32e12b64b709d2b835)

Fix the issue where the flavor name was empty in server list output.
This requires somewhat invasive unit test changes to reflect the changed
API response from the server, but this has the upside of meaning we
don't need new tests since what we have validates things.
Also drop the flavor ID column as it is removed from the compute API.

Conflicts:
    openstackclient/tests/unit/compute/v2/test_server.py

NOTE(melwitt): The conflicts and differences from the cherry picked
change are because the following changes are not in Victoria:

  * I4811f8f66dcb14ed99cc1cfb80b00e2d77afe45f
    (compute: Add 'server * --all-projects' option)
  * I7a8349106e211c57c4577b75326b39b88bd9ac1e
    (compute: Fix 'server * -f yaml' output)
  * I84848c0bf8ab3c36dd821141191e2725e4e3b58b (Remove usage of six)
  * Ieeb1f22df7092e66a411b6a36eafb3e16efc2fc2
    (compute: Add missing options for 'server list')
  * If065602792958ff0145ae9f2e05f5b7a3177905c
    (Compute: Add tags support for server)
  * I25a4da697e27c0fba4d28b504377667eb18f15fe
    (compute: Add '--force' option to 'server delete')
  * I463993170c03a1d98c47ab6a3c19131b7fca1099 (Remove oslo.utils)
  * I18991adf899c7b72c98bb89871bf0715d35943f0
    (Add a few selectable fields to the "openstack server list" output)
  * I62b2ed8488ee4ac9c42051311bcfb455506ddd90
    (Switch compute flavors from novaclient/direct to SDK)

Change-Id: Ica3320242a38901c1180b2b29109c9474366fde0
Signed-off-by: Khomesh Thakre <khomeshthakre24@gmail.com>
Story: 2008257
Task: 41113
(cherry picked from commit 8e362402dee07744668bcf7f6774af4fbe9a07e3)
(cherry picked from commit 0873e7580eceab07c3be0824d2ea4163491f8d6e)
(cherry picked from commit 4b7e777c0ce19aa67a9a33cbeb3b4ee2b052383f)

This has no impact on the end result, but it should make fixing issues
introduced by API microversion 2.69 a little easier.

Conflicts:
    openstackclient/compute/v2/server.py

NOTE(melwitt): The conflicts are because the following changes are not
in Victoria:

  * I463993170c03a1d98c47ab6a3c19131b7fca1099 (Remove oslo.utils)
  * I18991adf899c7b72c98bb89871bf0715d35943f0 (Add a few selectable
    fields to the "openstack server list" output)
  * I2f2033a8d49ee42eb21696a9cd28e63ad9712fad (trivial: Cleanup docs
    for 'server list')

Change-Id: I7d70eac8aa1a6197ed05a49f071e6899ec219c03
Signed-off-by: Stephen Finucane <sfinucan@redhat.com>
(cherry picked from commit 4c3de28e83babb0672950320a20492dc61803b4a)
(cherry picked from commit f4adbcef7b1b18d9454109a020e5e2c6ad78b5f1)
(cherry picked from commit cb621f22d4547c20f5722058be8d99de936a48c6)