docker/core/Create-new-server-in-test_create_backup.patch

   1 From 03eb38ce54aeec4bc4c1cb3475c6fb84661f8993 Mon Sep 17 00:00:00 2001
   2 From: =?UTF-8?q?C=C3=A9dric=20Ollivier?= <cedric.ollivier@orange.com>
   3 Date: Tue, 21 Jul 2020 13:28:50 +0200
   4 Subject: [PATCH] Create new server in test_create_backup
   5 MIME-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8
   9 test_reboot_server_hard sometimes fail in all gates [1].
  10 This hack could highlight if they are side effects between
  11 test_create_backup and test_reboot_server_hard.
  12
  13 [1] http://artifacts.opnfv.org/functest/E5AZMH89OOK6/functest-opnfv-functest-smoke-cntt-hunter-tempest_full_cntt-run-142/tempest_full_cntt/tempest-report.html
  14
  15 Change-Id: I203562f686b004094e5e18858004b7a2d26567a6
  16 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
  17 ---
  18  .../api/compute/servers/test_server_actions.py    | 15 ++++++++-------
  19  1 file changed, 8 insertions(+), 7 deletions(-)
  20
  21 diff --git a/tempest/api/compute/servers/test_server_actions.py b/tempest/api/compute/servers/test_server_actions.py
  22 index d477be0eb..c369311d3 100644
  23 --- a/tempest/api/compute/servers/test_server_actions.py
  24 +++ b/tempest/api/compute/servers/test_server_actions.py
  25 @@ -443,6 +443,7 @@ class ServerActionsTestJSON(base.BaseV2ComputeTest):
  26          # Check if glance v1 is available to determine which client to use. We
  27          # prefer glance v1 for the compute API tests since the compute image
  28          # API proxy was written for glance v1.
  29 +        newserver = self.create_test_server(wait_until='ACTIVE')
  30          if CONF.image_feature_enabled.api_v1:
  31              glance_client = self.os_primary.image_client
  32          elif CONF.image_feature_enabled.api_v2:
  33 @@ -453,7 +454,7 @@ class ServerActionsTestJSON(base.BaseV2ComputeTest):
  34                  '[image-feature-enabled].')
  35
  36          backup1 = data_utils.rand_name('backup-1')
  37 -        resp = self.client.create_backup(self.server_id,
  38 +        resp = self.client.create_backup(newserver['id'],
  39                                           backup_type='daily',
  40                                           rotation=2,
  41                                           name=backup1)
  42 @@ -481,8 +482,8 @@ class ServerActionsTestJSON(base.BaseV2ComputeTest):
  43                                        image1_id, 'active')
  44
  45          backup2 = data_utils.rand_name('backup-2')
  46 -        waiters.wait_for_server_status(self.client, self.server_id, 'ACTIVE')
  47 -        resp = self.client.create_backup(self.server_id,
  48 +        waiters.wait_for_server_status(self.client, newserver['id'], 'ACTIVE')
  49 +        resp = self.client.create_backup(newserver['id'],
  50                                           backup_type='daily',
  51                                           rotation=2,
  52                                           name=backup2)
  53 @@ -499,7 +500,7 @@ class ServerActionsTestJSON(base.BaseV2ComputeTest):
  54          properties = {
  55              'image_type': 'backup',
  56              'backup_type': "daily",
  57 -            'instance_uuid': self.server_id,
  58 +            'instance_uuid': newserver['id'],
  59          }
  60          params = {
  61              'status': 'active',
  62 @@ -524,8 +525,8 @@ class ServerActionsTestJSON(base.BaseV2ComputeTest):
  63          # create the third one, due to the rotation is 2,
  64          # the first one will be deleted
  65          backup3 = data_utils.rand_name('backup-3')
  66 -        waiters.wait_for_server_status(self.client, self.server_id, 'ACTIVE')
  67 -        resp = self.client.create_backup(self.server_id,
  68 +        waiters.wait_for_server_status(self.client, newserver['id'], 'ACTIVE')
  69 +        resp = self.client.create_backup(newserver['id'],
  70                                           backup_type='daily',
  71                                           rotation=2,
  72                                           name=backup3)
  73 @@ -536,7 +537,7 @@ class ServerActionsTestJSON(base.BaseV2ComputeTest):
  74              image3_id = data_utils.parse_image_id(resp.response['location'])
  75          self.addCleanup(glance_client.delete_image, image3_id)
  76          # the first back up should be deleted
  77 -        waiters.wait_for_server_status(self.client, self.server_id, 'ACTIVE')
  78 +        waiters.wait_for_server_status(self.client, newserver['id'], 'ACTIVE')
  79          glance_client.wait_for_resource_deletion(image1_id)
  80          oldest_backup_exist = False
  81          if CONF.image_feature_enabled.api_v1:
  82 --
  83 2.27.0
  84