add better functionality

Author: Jamie Hannaford

src/Common/Resource/AbstractResource.php

@@ -116,7 +116,8 @@ private function parseDocBlockValue($type, $val)
     private function isNotNativeType($type)
     {
         return !in_array($type, [
-            'string', 'bool', 'boolean', 'null', 'array', 'object', 'int', 'integer', 'float', 'numeric', 'mixed'
+            'string', 'bool', 'boolean', 'double', 'null', 'array', 'object', 'int', 'integer', 'float', 'numeric',
+            'mixed'
         ]);
     }
 

src/Common/Resource/HasWaiterTrait.php

@@ -95,9 +95,9 @@ private function shouldHalt($timeout, $startTime)
      *                          or exceed this timeout, the blocking operation will immediately cease. If FALSE
      *                          is provided, the timeout will never be considered.
      */
-    public function waitUntilActive($timeout = 60)
+    public function waitUntilActive($timeout = false)
     {
-        $this->waitUntil('ACTIVE');
+        $this->waitUntil('ACTIVE', $timeout);
     }
 
     public function waitUntilDeleted($timeout = 60, $sleepPeriod = 1)

src/Common/Service/Builder.php

@@ -5,7 +5,6 @@
 use GuzzleHttp\Client;
 use GuzzleHttp\ClientInterface;
 use GuzzleHttp\Middleware as GuzzleMiddleware;
-use OpenStack\Common\Auth\ServiceUrlResolver;
 use OpenStack\Common\Auth\Token;
 use OpenStack\Common\Transport\HandlerStack;
 use OpenStack\Common\Transport\Middleware;
@@ -26,6 +25,9 @@ class Builder
      */
     private $globalOptions = [];
 
+    /** @var string */
+    private $rootNamespace;
+
     /**
      * Defaults that will be applied to options if no values are provided by the user.
      *
@@ -38,9 +40,10 @@ class Builder
      *                             Eventually they will be merged (and if necessary overridden) by the
      *                             service-specific options passed in.
      */
-    public function __construct(array $globalOptions = [])
+    public function __construct(array $globalOptions = [], $rootNamespace = 'OpenStack')
     {
         $this->globalOptions = $globalOptions;
+        $this->rootNamespace = $rootNamespace;
     }
 
     /**
@@ -53,7 +56,7 @@ public function __construct(array $globalOptions = [])
      */
     private function getClasses($serviceName, $serviceVersion)
     {
-        $rootNamespace = sprintf("OpenStack\\%s\\v%d", $serviceName, $serviceVersion);
+        $rootNamespace = sprintf("%s\\%s\\v%d", $this->rootNamespace, $serviceName, $serviceVersion);
 
         return [
             sprintf("%s\\Api", $rootNamespace),
@@ -164,4 +167,4 @@ private function mergeOptions(array $serviceOptions)
 
         return $options;
     }
-}
+}