Improved integration tests for Compute

Author: haphan

tests/integration/BlockStorage/v2/CoreTest.php

@@ -41,7 +41,6 @@ public function runTests()
     public function volumes()
     {
         $this->logStep('-> Volumes tests');
-        $this->logStep('Creating volume type');
         $volumeType = $this->getService()->createVolumeType(['name' => $this->randomStr()]);
 
         $replacements = [
@@ -92,8 +91,6 @@ public function volumes()
 
     public function volumeTypes()
     {
-        $this->logStep('-> Volumes Types tests');
-
         $replacements = [
             '{name}' => $this->randomStr(),
         ];
@@ -128,8 +125,6 @@ public function volumeTypes()
 
     public function snapshots()
     {
-        $this->logStep('-> Snapshot tests');
-
         $this->logStep('Creating volume');
         $volume = $this->getService()->createVolume(['name' => $this->randomStr(), 'size' => 1]);
         $volume->waitUntil('available', 60);

tests/integration/Compute/v2/CoreTest.php

@@ -12,10 +12,12 @@
 use OpenStack\Compute\v2\Models\Server;
 use OpenStack\Integration\TestCase;
 use OpenStack\Integration\Utils;
+use OpenStack\Networking\v2\Extensions\SecurityGroups\Models\SecurityGroup;
 use OpenStack\Networking\v2\Models\Network;
 use OpenStack\Networking\v2\Models\Subnet;
 use OpenStack\Networking\v2\Service as NetworkService;
 use OpenStack\BlockStorage\v2\Service as BlockStorageService;
+use OpenStack\Networking\v2\Extensions\SecurityGroups\Service as SecurityGroupService;
 
 class CoreTest extends TestCase
 {
@@ -24,6 +26,8 @@ class CoreTest extends TestCase
     const SUBNET = 'phptest_subnet';
     const VOLUME = 'phptest_volume';
 
+    const SECGROUP = 'phptest_secgroup';
+
     const IMAGE = 'cirros';
 
     /** @var NetworkService */
@@ -32,6 +36,9 @@ class CoreTest extends TestCase
     /** @var BlockStorageService */
     private $blockStorageService;
 
+    /** @var SecurityGroupService */
+    private $secgroupService;
+
     /** @var  Network */
     private $network;
 
@@ -41,6 +48,9 @@ class CoreTest extends TestCase
     /** @var  Volume */
     private $volume;
 
+    /** @var SecurityGroup */
+    private $secgroup;
+
     // Core test
     private $service;
     private $serverId;
@@ -68,6 +78,12 @@ private function getNetworkService()
         return $this->networkService;
     }
 
+    private function getSecurityGroupService(): SecurityGroupService
+    {
+        $this->secgroupService = $this->secgroupService ?? Utils::getOpenStack()->networkingV2ExtSecGroups();
+        return $this->secgroupService;
+    }
+
     private function getBlockStorageService()
     {
         if (!$this->blockStorageService) {
@@ -100,7 +116,7 @@ protected function setUp()
             ]
         );
 
-        $this->logStep('Created network {name} with id {id}', ['name' => $this->network->name, 'id' => $this->network->id]);
+        $this->logStep('Created network {name} with {id}', ['name' => $this->network->name, 'id' => $this->network->id]);
 
         $this->subnet = $this->getNetworkService()->createSubnet(
             [
@@ -111,7 +127,7 @@ protected function setUp()
             ]
         );
 
-        $this->logStep('Created subnet {name} with id {id}', ['name' => $this->subnet->name, 'id' => $this->subnet->id]);
+        $this->logStep('Created subnet {name} with {id}', ['name' => $this->subnet->name, 'id' => $this->subnet->id]);
 
         $this->volume = $this->getBlockStorageService()->createVolume(
             [
@@ -121,7 +137,11 @@ protected function setUp()
             ]
         );
 
-        $this->logStep('Created volume {name} with id {id}', ['name' => $this->volume->name, 'id' => $this->volume->id]);
+        $this->logStep('Created volume {name} with {id}', ['name' => $this->volume->name, 'id' => $this->volume->id]);
+
+        $this->getSecurityGroupService()->createSecurityGroup(['name' => self::SECGROUP]);
+
+        $this->logStep('Created security group {secgroup}', ['secgroup' => self::SECGROUP]);
     }
 
     public function runTests()
@@ -193,12 +213,14 @@ public function runTests()
             // Interface attachments
             $this->createInterfaceAttachment();
         } finally {
+            $this->logger->info('Tearing down');
             // Teardown
             $this->deleteServer();
             $this->deleteFlavor();
             $this->subnet->delete();
             $this->network->delete();
             $this->volume->delete();
+            $this->secgroup->delete();
         }
 
         $this->outputTimeTaken();
@@ -341,6 +363,7 @@ private function resizeServer()
 
     private function confirmServerResize()
     {
+        $this->logger->info('Waiting for status VERIFY_RESIZE');
         $replacements = ['{serverId}' => $this->serverId];
 
         /** @var $server \OpenStack\Compute\v2\Models\Server */
@@ -623,8 +646,8 @@ private function getLimits()
     private function addSecurityGroupToServer()
     {
         $replacements = [
-            '{serverId}' => $this->serverId,
-            '{secGroupName}' => 'default'
+            '{serverId}'     => $this->serverId,
+            '{secGroupName}' => self::SECGROUP,
         ];
 
         require_once  $this->sampleFile($replacements, 'servers/add_security_group.php');
@@ -650,8 +673,8 @@ private function listServerSecurityGroups()
     private function removeServerSecurityGroup()
     {
         $replacements = [
-            '{serverId}' => $this->serverId,
-            '{secGroupName}' => 'default'
+            '{serverId}'     => $this->serverId,
+            '{secGroupName}' => self::SECGROUP,
         ];
 
         require_once $this->sampleFile($replacements, 'servers/remove_security_group.php');