Fixed integration tests

Author: haphan

samples/images/v2/images/create.php

@@ -18,6 +18,8 @@
     'diskFormat'      => '{diskFormat}',
     'visibility'      => '{visibility}',
     'minDisk'         => 10,
-    'protected'       => true,
+    'protected'       => false,
     'minRam'          => 10,
 ]);
+
+$image->uploadData(\GuzzleHttp\Psr7\Utils::streamFor('fake-image.img'));

samples/images/v2/members/add.php

@@ -11,4 +11,4 @@
 
 $member = $openstack->imagesV2()
                     ->getImage('{imageId}')
-                    ->addMember('{tenantId}');
+                    ->addMember('{projectId}');

samples/images/v2/members/delete.php

@@ -11,5 +11,5 @@
 
 $openstack->imagesV2()
           ->getImage('{imageId}')
-          ->getMember('{tenantId}')
+          ->getMember('{projectId}')
           ->delete();

samples/images/v2/members/update_status.php

@@ -13,5 +13,5 @@
 
 $openstack->imagesV2()
     ->getImage('{imageId}')
-    ->getMember('{tenantId}')
+    ->getMember('{projectId}')
     ->updateStatus(Member::STATUS_ACCEPTED);

tests/integration/BlockStorage/v2/CoreTest.php

@@ -28,15 +28,19 @@ public function runTests()
     {
         $this->startTimer();
 
+        $this->logger->info('-> Volumes');
         $this->volumes();
+        $this->logger->info('-> Volume Types');
         $this->volumeTypes();
+        $this->logger->info('-> Snapshots');
         $this->snapshots();
 
         $this->outputTimeTaken();
     }
 
     public function volumes()
     {
+        $this->logStep('-> Volumes tests');
         $this->logStep('Creating volume type');
         $volumeType = $this->getService()->createVolumeType(['name' => $this->randomStr()]);
 
@@ -88,6 +92,8 @@ public function volumes()
 
     public function volumeTypes()
     {
+        $this->logStep('-> Volumes Types tests');
+
         $replacements = [
             '{name}' => $this->randomStr(),
         ];
@@ -122,9 +128,11 @@ public function volumeTypes()
 
     public function snapshots()
     {
+        $this->logStep('-> Snapshot tests');
+
         $this->logStep('Creating volume');
         $volume = $this->getService()->createVolume(['name' => $this->randomStr(), 'size' => 1]);
-        $volume->waitUntilActive();
+        $volume->waitUntil('available', 60);
 
         $replacements = [
             '{volumeId}'    => $volume->id,
@@ -137,7 +145,7 @@ public function snapshots()
         require_once $this->sampleFile($replacements, 'snapshots/create.php');
         $this->assertInstanceOf(Snapshot::class, $snapshot);
         $this->assertEquals($replacements['{name}'], $snapshot->name);
-        $snapshot->waitUntilActive();
+        $volume->waitUntil('available', 60);
 
         $snapshotId = $snapshot->id;
         $replacements = ['{snapshotId}' => $snapshotId];

tests/integration/Images/v2/CoreTest.php

@@ -67,19 +67,22 @@ public function members()
             '{tag2}'            => 'quantal',
             '{containerFormat}' => 'bare',
             '{diskFormat}'      => 'qcow2',
-            '{visibility}'      => 'private',
+            '{visibility}'      => 'shared',
             'true'              => 'false',
         ];
 
         $this->logStep('Creating image');
         /** @var Image $image */
         require_once $this->sampleFile($replacements, 'images/create.php');
 
-        $replacements = ['{imageId}' => $image->id];
+
+
+        $this->logStep(sprintf('Image created with id=%s', $image->id));
 
         $this->logStep('Adding member');
+        $replacements += ['{imageId}' => $image->id];
         /** @var Member $member */
-        require_once $this->sampleFile($replacements, 'members/add.php');
+        require_once $this->sampleFile(['{imageId}' => $image->id, ], 'members/add.php');
         $this->assertInstanceOf(Member::class, $member);
 
         $replacements += ['status' => Member::STATUS_REJECTED];