Parameterize type of service in catalog so it can be specified when building a service object.

Author: ycombinator

lib/OpenCloud/Common/Service/ServiceBuilder.php

@@ -37,6 +37,7 @@ class ServiceBuilder
     public static function factory(ClientInterface $client, $class, array $options = array())
     {
         $name = isset($options['name']) ? $options['name'] : null;
+        $type = isset($options['type']) ? $options['type'] : null;
         $urlType = isset($options['urlType']) ? $options['urlType'] : null;
 
         if (isset($options['region'])) {
@@ -47,6 +48,6 @@ public static function factory(ClientInterface $client, $class, array $options =
             $region = null;
         }
 
-        return new $class($client, null, $name, $region, $urlType);
+        return new $class($client, $type, $name, $region, $urlType);
     }
 }