From a7ce9d02226aa59f0b843ff35274fbfe4a7cae1d Mon Sep 17 00:00:00 2001 From: Konstantin Babushkin Date: Wed, 6 Dec 2023 21:27:15 +0100 Subject: [PATCH 1/9] block storage --- .../workflows/integration_block_storage.yml | 74 +++++++++++++++++++ .github/workflows/integration_identity.yml | 3 + .../workflows/integration_object_storage.yml | 3 + .../integration/BlockStorage/v2/CoreTest.php | 9 ++- 4 files changed, 88 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/integration_block_storage.yml diff --git a/.github/workflows/integration_block_storage.yml b/.github/workflows/integration_block_storage.yml new file mode 100644 index 00000000..df599273 --- /dev/null +++ b/.github/workflows/integration_block_storage.yml @@ -0,0 +1,74 @@ +name: Run Block Storage Integration Tests + +on: + workflow_dispatch: + pull_request: + paths: + - '**BlockStorage**' + - '**Common**' + +jobs: + tests: + if: "!contains(github.event.head_commit.message, 'skip ci') && !contains(github.event.head_commit.message, 'ci skip')" + strategy: + fail-fast: false + matrix: + openstack_version: [ "stable/wallaby" ] # v2 is removed from xena + php_version: [ 8.1 ] + ubuntu_version: [ 20.04 ] + runs-on: ubuntu-${{ matrix.ubuntu_version }} + name: Deploy OpenStack ${{ matrix.name }} and run ObjectStore integration tests with php ${{matrix.php_version}} + steps: + - uses: actions/checkout@v2 + - name: get cache directory + id: composer-cache + run: | + echo "::set-output name=dir::$(composer config cache-files-dir)" + - uses: actions/cache@v3 + with: + path: | + ~/.php_cs.cache + ${{ steps.composer-cache.outputs.dir }} + key: ${{ runner.os }}-composer-${{ matrix.php_version }}-${{ hashFiles('**.composer.lock') }} + restore-keys: | + ${{ runner.os }}-composer-${{ matrix.php_version }}- + - uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php_version }} + extensions: curl + tools: composer:v2 + coverage: none + - run: composer install --prefer-dist --no-interaction --no-progress + - name: Restore devstack cache + uses: actions/cache@v3 + with: + path: | + /opt/stack/* + !/opt/stack/data + ~/devstack/ + key: ${{ runner.os }}-openstack-${{ matrix.openstack_version }}-${{ github.workflow }} + - name: Deploy devstack + uses: EmilienM/devstack-action@v0.11 + with: + branch: ${{ matrix.openstack_version }} + conf_overrides: | + CINDER_ISCSI_HELPER=lioadm + enabled_services: 's-account,s-container,s-object,s-proxy,s-bak' + - name: Set env variables + run: | + { + echo OS_AUTH_URL="$(grep -oP -m 1 "(?<=auth_url: )(.*)\$" /etc/openstack/clouds.yaml)/v3" + echo OS_REGION=RegionOne + echo OS_REGION_NAME=RegionOne + echo OS_USER_ID=$(openstack --os-cloud=devstack-admin user show admin -f value -c id) + echo OS_USERNAME=admin + echo OS_PASSWORD=secret + echo OS_PROJECT_ID=$(openstack --os-cloud=devstack-admin project show admin -f value -c id) + echo OS_PROJECT_NAME=admin + echo OS_RESIZE_FLAVOR=2 + echo OS_FLAVOR=1 + echo OS_DOMAIN_ID=default + } >> "$GITHUB_ENV" + - name: Execute integration tests + run: php ./tests/integration/run.php -s=BlockStorage + diff --git a/.github/workflows/integration_identity.yml b/.github/workflows/integration_identity.yml index 0c52d3a3..0de8f1ab 100644 --- a/.github/workflows/integration_identity.yml +++ b/.github/workflows/integration_identity.yml @@ -1,8 +1,11 @@ name: Run Identity Integration Tests on: + workflow_dispatch: pull_request: paths: - '**Identity**' + - '**Common**' + jobs: tests: if: "!contains(github.event.head_commit.message, 'skip ci') && !contains(github.event.head_commit.message, 'ci skip')" diff --git a/.github/workflows/integration_object_storage.yml b/.github/workflows/integration_object_storage.yml index 9e94f73e..ee3a484b 100644 --- a/.github/workflows/integration_object_storage.yml +++ b/.github/workflows/integration_object_storage.yml @@ -1,8 +1,11 @@ name: Run Object Storage Integration Tests on: + workflow_dispatch: pull_request: paths: - '**ObjectStore**' + - '**Common**' + jobs: tests: if: "!contains(github.event.head_commit.message, 'skip ci') && !contains(github.event.head_commit.message, 'ci skip')" diff --git a/tests/integration/BlockStorage/v2/CoreTest.php b/tests/integration/BlockStorage/v2/CoreTest.php index a94ca077..9063e80f 100644 --- a/tests/integration/BlockStorage/v2/CoreTest.php +++ b/tests/integration/BlockStorage/v2/CoreTest.php @@ -68,7 +68,10 @@ public function volumes() require_once $this->sampleFile($replacements, 'volumes/get.php'); self::assertInstanceOf(Volume::class, $volume); - $replacements += ['{newName}' => $this->randomStr(), '{newDescription}' => $this->randomStr()]; + $replacements += [ + '{newName}' => $this->randomStr(), + '{newDescription}' => $this->randomStr() + ]; $this->logStep('Updating volume'); /** @var Volume $volume */ @@ -79,6 +82,8 @@ public function volumes() /** @var \Generator $volumes */ require_once $this->sampleFile($replacements, 'volumes/list.php'); + $volume->waitUntil('available'); + $this->logStep('Deleting volume'); require_once $this->sampleFile($replacements, 'volumes/delete.php'); @@ -176,6 +181,8 @@ public function snapshots() $this->logStep('Updating snapshot'); require_once $this->sampleFile($replacements, 'snapshots/update.php'); + $snapshot->waitUntil('available', 60); + $this->logStep('Deleting snapshot'); require_once $this->sampleFile($replacements, 'snapshots/delete.php'); $snapshot->waitUntilDeleted(); From 64912791ab0a8ba7d19ecb1a7e892aa0a21c6e4d Mon Sep 17 00:00:00 2001 From: Konstantin Babushkin Date: Wed, 6 Dec 2023 21:29:16 +0100 Subject: [PATCH 2/9] fix name --- .github/workflows/integration_block_storage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration_block_storage.yml b/.github/workflows/integration_block_storage.yml index df599273..495ed0c7 100644 --- a/.github/workflows/integration_block_storage.yml +++ b/.github/workflows/integration_block_storage.yml @@ -17,7 +17,7 @@ jobs: php_version: [ 8.1 ] ubuntu_version: [ 20.04 ] runs-on: ubuntu-${{ matrix.ubuntu_version }} - name: Deploy OpenStack ${{ matrix.name }} and run ObjectStore integration tests with php ${{matrix.php_version}} + name: Deploy OpenStack ${{ matrix.name }} and run Block Storage integration tests with php ${{matrix.php_version}} steps: - uses: actions/checkout@v2 - name: get cache directory From 7b6caea475ee32eaaa4061648c82eba6ce761680 Mon Sep 17 00:00:00 2001 From: Konstantin Babushkin Date: Thu, 7 Dec 2023 07:53:41 +0100 Subject: [PATCH 3/9] Images integration --- .github/workflows/integration_images.yml | 73 ++++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 .github/workflows/integration_images.yml diff --git a/.github/workflows/integration_images.yml b/.github/workflows/integration_images.yml new file mode 100644 index 00000000..9a731547 --- /dev/null +++ b/.github/workflows/integration_images.yml @@ -0,0 +1,73 @@ +name: Run Images Integration Tests +on: + workflow_dispatch: + pull_request: + paths: + - '**Images**' + - '**Common**' + +jobs: + tests: + if: "!contains(github.event.head_commit.message, 'skip ci') && !contains(github.event.head_commit.message, 'ci skip')" + strategy: + fail-fast: false + matrix: + openstack_version: [ "stable/zed" ] + php_version: [ 8.1 ] + ubuntu_version: [ 20.04 ] + runs-on: ubuntu-${{ matrix.ubuntu_version }} + name: Deploy OpenStack ${{ matrix.name }} with Glance and run Images integration tests with php ${{matrix.php_version}} + steps: + - uses: actions/checkout@v2 + - name: get cache directory + id: composer-cache + run: | + echo "::set-output name=dir::$(composer config cache-files-dir)" + - uses: actions/cache@v3 + with: + path: | + ~/.php_cs.cache + ${{ steps.composer-cache.outputs.dir }} + key: ${{ runner.os }}-composer-${{ matrix.php_version }}-${{ hashFiles('**.composer.lock') }} + restore-keys: | + ${{ runner.os }}-composer-${{ matrix.php_version }}- + - uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php_version }} + extensions: curl + tools: composer:v2 + coverage: none + - run: composer install --prefer-dist --no-interaction --no-progress + - name: Restore devstack cache + uses: actions/cache@v3 + with: + path: | + /opt/stack/* + !/opt/stack/data + ~/devstack/ + key: ${{ runner.os }}-openstack-${{ matrix.openstack_version }}-${{ github.workflow }} + - name: Deploy devstack + uses: EmilienM/devstack-action@v0.11 + with: + branch: ${{ matrix.openstack_version }} + conf_overrides: | + CINDER_ISCSI_HELPER=lioadm + enabled_services: 's-account,s-container,s-object,s-proxy,s-bak' + - name: Set env variables + run: | + { + echo OS_AUTH_URL="$(grep -oP -m 1 "(?<=auth_url: )(.*)\$" /etc/openstack/clouds.yaml)/v3" + echo OS_REGION=RegionOne + echo OS_REGION_NAME=RegionOne + echo OS_USER_ID=$(openstack --os-cloud=devstack-admin user show admin -f value -c id) + echo OS_USERNAME=admin + echo OS_PASSWORD=secret + echo OS_PROJECT_ID=$(openstack --os-cloud=devstack-admin project show admin -f value -c id) + echo OS_PROJECT_NAME=admin + echo OS_RESIZE_FLAVOR=2 + echo OS_FLAVOR=1 + echo OS_DOMAIN_ID=default + } >> "$GITHUB_ENV" + - name: Execute integration tests + run: php ./tests/integration/run.php -s=Compute + From fc653435ea32c16e772bfb2652a540c42eb21652 Mon Sep 17 00:00:00 2001 From: Konstantin Babushkin Date: Thu, 7 Dec 2023 08:03:58 +0100 Subject: [PATCH 4/9] Networking integration --- .github/workflows/integration_networking.yml | 72 +++++++++++++++++++ .../integration/Networking/v2/Layer3Test.php | 3 +- tests/integration/Runner.php | 2 +- 3 files changed, 74 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/integration_networking.yml diff --git a/.github/workflows/integration_networking.yml b/.github/workflows/integration_networking.yml new file mode 100644 index 00000000..ba651c16 --- /dev/null +++ b/.github/workflows/integration_networking.yml @@ -0,0 +1,72 @@ +name: Run Networking Integration Tests +on: + workflow_dispatch: + pull_request: + paths: + - '**Networking**' + - '**Common**' + +jobs: + tests: + if: "!contains(github.event.head_commit.message, 'skip ci') && !contains(github.event.head_commit.message, 'ci skip')" + strategy: + fail-fast: false + matrix: + openstack_version: [ "stable/zed" ] + php_version: [ 8.1 ] + ubuntu_version: [ 20.04 ] + runs-on: ubuntu-${{ matrix.ubuntu_version }} + name: Deploy OpenStack ${{ matrix.name }} with Neutron and run Networking integration tests with php ${{matrix.php_version}} + steps: + - uses: actions/checkout@v2 + - name: get cache directory + id: composer-cache + run: | + echo "::set-output name=dir::$(composer config cache-files-dir)" + - uses: actions/cache@v3 + with: + path: | + ~/.php_cs.cache + ${{ steps.composer-cache.outputs.dir }} + key: ${{ runner.os }}-composer-${{ matrix.php_version }}-${{ hashFiles('**.composer.lock') }} + restore-keys: | + ${{ runner.os }}-composer-${{ matrix.php_version }}- + - uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php_version }} + extensions: curl + tools: composer:v2 + coverage: none + - run: composer install --prefer-dist --no-interaction --no-progress + - name: Restore devstack cache + uses: actions/cache@v3 + with: + path: | + /opt/stack/* + !/opt/stack/data + ~/devstack/ + key: ${{ runner.os }}-openstack-${{ matrix.openstack_version }}-${{ github.workflow }} + - name: Deploy devstack + uses: EmilienM/devstack-action@v0.11 + with: + branch: ${{ matrix.openstack_version }} + conf_overrides: | + CINDER_ISCSI_HELPER=lioadm + - name: Set env variables + run: | + { + echo OS_AUTH_URL="$(grep -oP -m 1 "(?<=auth_url: )(.*)\$" /etc/openstack/clouds.yaml)/v3" + echo OS_REGION=RegionOne + echo OS_REGION_NAME=RegionOne + echo OS_USER_ID=$(openstack --os-cloud=devstack-admin user show admin -f value -c id) + echo OS_USERNAME=admin + echo OS_PASSWORD=secret + echo OS_PROJECT_ID=$(openstack --os-cloud=devstack-admin project show admin -f value -c id) + echo OS_PROJECT_NAME=admin + echo OS_RESIZE_FLAVOR=2 + echo OS_FLAVOR=1 + echo OS_DOMAIN_ID=default + } >> "$GITHUB_ENV" + - name: Execute integration tests + run: php ./tests/integration/run.php -s=Compute + diff --git a/tests/integration/Networking/v2/Layer3Test.php b/tests/integration/Networking/v2/Layer3Test.php index 2efad65f..71bc67e6 100644 --- a/tests/integration/Networking/v2/Layer3Test.php +++ b/tests/integration/Networking/v2/Layer3Test.php @@ -2,7 +2,6 @@ namespace OpenStack\Integration\Networking\v2; -use Guzzle\Tests\Service\Mock\Command\Sub\Sub; use OpenStack\Integration\TestCase; use OpenStack\Networking\v2\Extensions\Layer3\Models\FloatingIp; use OpenStack\Networking\v2\Models\Network; @@ -28,7 +27,7 @@ public function runTests() $this->outputTimeTaken(); } - public function teardown() + public function teardown(): void { parent::teardown(); diff --git a/tests/integration/Runner.php b/tests/integration/Runner.php index e2cdeda1..dc377638 100644 --- a/tests/integration/Runner.php +++ b/tests/integration/Runner.php @@ -35,7 +35,7 @@ private function assembleTestFiles() if ($servicePath->isDir() && $versionBn[0] == 'v') { foreach ($this->traverse($versionPath->getPathname()) as $testPath) { if (strpos($testPath->getFilename(), 'Test.php')) { - $testBn = strtolower(substr($testPath->getBasename(), 0, -8)); + $testBn = substr($testPath->getBasename(), 0, -8); $this->tests[$serviceBn][strtolower($versionBn)][] = $testBn; } } From 6a6be1ed47ec83ea51ec8db7870c0dc18747dc0f Mon Sep 17 00:00:00 2001 From: Konstantin Babushkin Date: Thu, 7 Dec 2023 08:04:13 +0100 Subject: [PATCH 5/9] remove unused services from images integration --- .github/workflows/integration_images.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/integration_images.yml b/.github/workflows/integration_images.yml index 9a731547..b6a216b9 100644 --- a/.github/workflows/integration_images.yml +++ b/.github/workflows/integration_images.yml @@ -52,7 +52,6 @@ jobs: branch: ${{ matrix.openstack_version }} conf_overrides: | CINDER_ISCSI_HELPER=lioadm - enabled_services: 's-account,s-container,s-object,s-proxy,s-bak' - name: Set env variables run: | { From c9d931fb6d2bc141c59e5255d8088c178d0d4159 Mon Sep 17 00:00:00 2001 From: Konstantin Babushkin Date: Thu, 7 Dec 2023 09:15:54 +0100 Subject: [PATCH 6/9] compute --- .../workflows/integration_block_storage.yml | 2 +- .github/workflows/integration_compute.yml | 73 +++++++++++++++++++ .github/workflows/integration_identity.yml | 2 +- .github/workflows/integration_images.yml | 2 +- .github/workflows/integration_networking.yml | 2 +- .../workflows/integration_object_storage.yml | 2 +- tests/integration/Compute/v2/CoreTest.php | 16 ++-- 7 files changed, 86 insertions(+), 13 deletions(-) create mode 100644 .github/workflows/integration_compute.yml diff --git a/.github/workflows/integration_block_storage.yml b/.github/workflows/integration_block_storage.yml index 495ed0c7..371c6573 100644 --- a/.github/workflows/integration_block_storage.yml +++ b/.github/workflows/integration_block_storage.yml @@ -65,7 +65,7 @@ jobs: echo OS_PASSWORD=secret echo OS_PROJECT_ID=$(openstack --os-cloud=devstack-admin project show admin -f value -c id) echo OS_PROJECT_NAME=admin - echo OS_RESIZE_FLAVOR=2 + echo OS_RESIZE_FLAVOR=c1 echo OS_FLAVOR=1 echo OS_DOMAIN_ID=default } >> "$GITHUB_ENV" diff --git a/.github/workflows/integration_compute.yml b/.github/workflows/integration_compute.yml new file mode 100644 index 00000000..7d072378 --- /dev/null +++ b/.github/workflows/integration_compute.yml @@ -0,0 +1,73 @@ +name: Run Compute Integration Tests +on: + workflow_dispatch: + pull_request: + paths: + - '**Compute**' + - '**Common**' + +jobs: + tests: + if: "!contains(github.event.head_commit.message, 'skip ci') && !contains(github.event.head_commit.message, 'ci skip')" + strategy: + fail-fast: false + matrix: + openstack_version: [ "stable/wallaby" ] # Cinder v2 is removed from xena + php_version: [ 8.1 ] + ubuntu_version: [ 20.04 ] + runs-on: ubuntu-${{ matrix.ubuntu_version }} + name: Deploy OpenStack ${{ matrix.name }} with Nova and run Compute integration tests with php ${{matrix.php_version}} + steps: + - uses: actions/checkout@v2 + - name: get cache directory + id: composer-cache + run: | + echo "::set-output name=dir::$(composer config cache-files-dir)" + - uses: actions/cache@v3 + with: + path: | + ~/.php_cs.cache + ${{ steps.composer-cache.outputs.dir }} + key: ${{ runner.os }}-composer-${{ matrix.php_version }}-${{ hashFiles('**.composer.lock') }} + restore-keys: | + ${{ runner.os }}-composer-${{ matrix.php_version }}- + - uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php_version }} + extensions: curl + tools: composer:v2 + coverage: none + - run: composer install --prefer-dist --no-interaction --no-progress + - name: Restore devstack cache + uses: actions/cache@v3 + with: + path: | + /opt/stack/* + !/opt/stack/data + ~/devstack/ + key: ${{ runner.os }}-openstack-${{ matrix.openstack_version }}-${{ github.workflow }} + - name: Deploy devstack + uses: EmilienM/devstack-action@v0.11 + with: + branch: ${{ matrix.openstack_version }} + conf_overrides: | + CINDER_ISCSI_HELPER=lioadm + enabled_services: 's-account,s-container,s-object,s-proxy,s-bak' + - name: Set env variables + run: | + { + echo OS_AUTH_URL="$(grep -oP -m 1 "(?<=auth_url: )(.*)\$" /etc/openstack/clouds.yaml)/v3" + echo OS_REGION=RegionOne + echo OS_REGION_NAME=RegionOne + echo OS_USER_ID=$(openstack --os-cloud=devstack-admin user show admin -f value -c id) + echo OS_USERNAME=admin + echo OS_PASSWORD=secret + echo OS_PROJECT_ID=$(openstack --os-cloud=devstack-admin project show admin -f value -c id) + echo OS_PROJECT_NAME=admin + echo OS_RESIZE_FLAVOR=c1 + echo OS_FLAVOR=1 + echo OS_DOMAIN_ID=default + } >> "$GITHUB_ENV" + - name: Execute integration tests + run: php ./tests/integration/run.php -s=Compute + diff --git a/.github/workflows/integration_identity.yml b/.github/workflows/integration_identity.yml index 0de8f1ab..c7f2f8a9 100644 --- a/.github/workflows/integration_identity.yml +++ b/.github/workflows/integration_identity.yml @@ -61,7 +61,7 @@ jobs: echo OS_PASSWORD=secret echo OS_PROJECT_ID=$(openstack --os-cloud=devstack-admin project show admin -f value -c id) echo OS_PROJECT_NAME=admin - echo OS_RESIZE_FLAVOR=2 + echo OS_RESIZE_FLAVOR=c1 echo OS_FLAVOR=1 echo OS_DOMAIN_ID=default } >> "$GITHUB_ENV" diff --git a/.github/workflows/integration_images.yml b/.github/workflows/integration_images.yml index b6a216b9..98e5b3d0 100644 --- a/.github/workflows/integration_images.yml +++ b/.github/workflows/integration_images.yml @@ -63,7 +63,7 @@ jobs: echo OS_PASSWORD=secret echo OS_PROJECT_ID=$(openstack --os-cloud=devstack-admin project show admin -f value -c id) echo OS_PROJECT_NAME=admin - echo OS_RESIZE_FLAVOR=2 + echo OS_RESIZE_FLAVOR=c1 echo OS_FLAVOR=1 echo OS_DOMAIN_ID=default } >> "$GITHUB_ENV" diff --git a/.github/workflows/integration_networking.yml b/.github/workflows/integration_networking.yml index ba651c16..51c8e3c6 100644 --- a/.github/workflows/integration_networking.yml +++ b/.github/workflows/integration_networking.yml @@ -63,7 +63,7 @@ jobs: echo OS_PASSWORD=secret echo OS_PROJECT_ID=$(openstack --os-cloud=devstack-admin project show admin -f value -c id) echo OS_PROJECT_NAME=admin - echo OS_RESIZE_FLAVOR=2 + echo OS_RESIZE_FLAVOR=c1 echo OS_FLAVOR=1 echo OS_DOMAIN_ID=default } >> "$GITHUB_ENV" diff --git a/.github/workflows/integration_object_storage.yml b/.github/workflows/integration_object_storage.yml index ee3a484b..252e4e37 100644 --- a/.github/workflows/integration_object_storage.yml +++ b/.github/workflows/integration_object_storage.yml @@ -68,7 +68,7 @@ jobs: echo OS_PASSWORD=secret echo OS_PROJECT_ID=$(openstack --os-cloud=devstack-admin project show admin -f value -c id) echo OS_PROJECT_NAME=admin - echo OS_RESIZE_FLAVOR=2 + echo OS_RESIZE_FLAVOR=c1 echo OS_FLAVOR=1 echo OS_DOMAIN_ID=default } >> "$GITHUB_ENV" diff --git a/tests/integration/Compute/v2/CoreTest.php b/tests/integration/Compute/v2/CoreTest.php index 5d7c0b67..f1f20528 100644 --- a/tests/integration/Compute/v2/CoreTest.php +++ b/tests/integration/Compute/v2/CoreTest.php @@ -139,7 +139,7 @@ protected function setUp(): void $this->logStep('Created volume {name} with {id}', ['name' => $this->volume->name, 'id' => $this->volume->id]); - $this->getSecurityGroupService()->createSecurityGroup(['name' => self::SECGROUP]); + $this->secgroup = $this->getSecurityGroupService()->createSecurityGroup(['name' => self::SECGROUP]); $this->logStep('Created security group {secgroup}', ['secgroup' => self::SECGROUP]); } @@ -498,7 +498,7 @@ private function createServerImage() ]; /** @var $server \OpenStack\Compute\v2\Models\Server */ - require_once $this->sampleFile($replacements, 'Images/create_server_image.php'); + require_once $this->sampleFile($replacements, 'images/create_server_image.php'); $server->waitWithCallback(function (Server $server) { return !$server->taskState; @@ -511,7 +511,7 @@ private function createServerImage() private function listImages() { - require_once $this->sampleFile([], 'Images/list_images.php'); + require_once $this->sampleFile([], 'images/list_images.php'); $this->logStep('Listed all available images'); } @@ -520,7 +520,7 @@ private function getImage() { $replacements = ['{imageId}' => $this->imageId]; - require_once $this->sampleFile($replacements, 'Images/get_image.php'); + require_once $this->sampleFile($replacements, 'images/get_image.php'); $this->logStep('Retrieved details for image {imageId}', $replacements); } @@ -530,20 +530,20 @@ private function imageMetadata() $replacements = ['{imageId}' => $this->imageId]; /** @var $image \OpenStack\Compute\v2\Models\Image */ - require_once $this->sampleFile($replacements, 'Images/reset_image_metadata.php'); + require_once $this->sampleFile($replacements, 'images/reset_image_metadata.php'); $this->logStep('Reset metadata of image {imageId}', $replacements); - require_once $this->sampleFile($replacements, 'Images/retrieve_image_metadata.php'); + require_once $this->sampleFile($replacements, 'images/retrieve_image_metadata.php'); $this->logStep('Retrieved metadata of image {imageId}', $replacements); - require_once $this->sampleFile($replacements + ['{metadataKey}'], 'Images/delete_image_metadata_item.php'); + require_once $this->sampleFile($replacements + ['{metadataKey}'], 'images/delete_image_metadata_item.php'); $this->logStep('Deleted metadata key of image {imageId}', $replacements); } private function deleteServerImage() { $replacements = ['{imageId}' => $this->imageId]; - require_once $this->sampleFile($replacements, 'Images/delete_image.php'); + require_once $this->sampleFile($replacements, 'images/delete_image.php'); $this->logStep('Deleted image {imageId}', $replacements); } From 1b964d64fabf8ee2c950712791eb298faee30e48 Mon Sep 17 00:00:00 2001 From: Konstantin Babushkin Date: Thu, 7 Dec 2023 09:31:35 +0100 Subject: [PATCH 7/9] fix typo --- .github/workflows/integration_networking.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration_networking.yml b/.github/workflows/integration_networking.yml index 51c8e3c6..cc18661c 100644 --- a/.github/workflows/integration_networking.yml +++ b/.github/workflows/integration_networking.yml @@ -68,5 +68,5 @@ jobs: echo OS_DOMAIN_ID=default } >> "$GITHUB_ENV" - name: Execute integration tests - run: php ./tests/integration/run.php -s=Compute + run: php ./tests/integration/run.php -s=Networking From 565d4aeeb3e8f43f4321705ebab8815bb2c251b4 Mon Sep 17 00:00:00 2001 From: Konstantin Babushkin Date: Thu, 7 Dec 2023 09:32:03 +0100 Subject: [PATCH 8/9] formatting --- tests/integration/Images/v2/CoreTest.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/integration/Images/v2/CoreTest.php b/tests/integration/Images/v2/CoreTest.php index 8a459481..bc7f7fbf 100644 --- a/tests/integration/Images/v2/CoreTest.php +++ b/tests/integration/Images/v2/CoreTest.php @@ -75,8 +75,6 @@ public function members() /** @var Image $image */ require_once $this->sampleFile($replacements, 'images/create.php'); - - $this->logStep(sprintf('Image created with id=%s', $image->id)); $this->logStep('Adding member'); From 3ec6cab3d3199fb2fe01f43be333815fd7c7f9cc Mon Sep 17 00:00:00 2001 From: Konstantin Babushkin Date: Thu, 7 Dec 2023 09:45:24 +0100 Subject: [PATCH 9/9] typo --- .github/workflows/integration_images.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration_images.yml b/.github/workflows/integration_images.yml index 98e5b3d0..feddef03 100644 --- a/.github/workflows/integration_images.yml +++ b/.github/workflows/integration_images.yml @@ -68,5 +68,5 @@ jobs: echo OS_DOMAIN_ID=default } >> "$GITHUB_ENV" - name: Execute integration tests - run: php ./tests/integration/run.php -s=Compute + run: php ./tests/integration/run.php -s=Images