Updated to use ScaleIO v2 API

.docs/user-guide/storage-providers.md

@@ -280,6 +280,7 @@ example see the `Examples` section.
 ```yaml
 scaleio:
     endpoint:             https://host_ip/api
+    apiVersion:           "2.0"
     insecure:             false
     useCerts:             true
     userName:             admin
@@ -294,6 +295,8 @@ scaleio:
 ```
 
 #### Configuration Notes
+- The `apiVersion` can optionally be set here to force certain API behavior.
+The default is to retrieve the endpoint API, and pass this version during calls.
 - `insecure` should be set to `true` if you have not loaded the SSL
 certificates on the host.  A successful wget or curl should be possible without
 SSL errors to the API `endpoint` in this case.
@@ -327,7 +330,7 @@ parameter.
 - By default the password is the same as your administrative MDM password.
 - Start the gateway `service scaleio-gateway start`.
  - With 1.32 we have noticed a restart of the gateway may be necessary as well
-after an initial install with `service scaleio-gateway restart`. 
+after an initial install with `service scaleio-gateway restart`.
 
 ### Activating the Driver
 To activate the ScaleIO driver please follow the instructions for

drivers/storage/scaleio/scaleio.go

@@ -63,22 +63,25 @@ func (d *driver) Init(r *core.RexRay) error {
 		"endpoint":   d.endpoint(),
 		"insecure":   d.insecure(),
 		"useCerts":   d.useCerts(),
+		"apiVersion": d.apiVersion(),
 	})
 
 	var err error
 
 	if d.client, err = goscaleio.NewClientWithArgs(
 		d.endpoint(),
+		d.apiVersion(),
 		d.insecure(),
 		d.useCerts()); err != nil {
 		return goof.WithFieldsE(fields, "error constructing new client", err)
 	}
 
 	if _, err := d.client.Authenticate(
 		&goscaleio.ConfigConnect{
-			d.endpoint(),
-			d.userName(),
-			d.password()}); err != nil {
+			Endpoint: d.endpoint(),
+			Username: d.userName(),
+			Password: d.password(),
+		}); err != nil {
 		fields["userName"] = d.userName()
 		if d.password() != "" {
 			fields["password"] = "******"
@@ -784,6 +787,10 @@ func (d *driver) endpoint() string {
 	return d.r.Config.GetString("scaleio.endpoint")
 }
 
+func (d *driver) apiVersion() string {
+	return d.r.Config.GetString("scaleio.apiVersion")
+}
+
 func (d *driver) insecure() bool {
 	return d.r.Config.GetBool("scaleio.insecure")
 }
@@ -841,6 +848,7 @@ func configRegistration() *gofig.Registration {
 	r.Key(gofig.String, "", "", "", "scaleio.endpoint")
 	r.Key(gofig.Bool, "", false, "", "scaleio.insecure")
 	r.Key(gofig.Bool, "", false, "", "scaleio.useCerts")
+	r.Key(gofig.String, "", "", "", "scaleio.apiVersion")
 	r.Key(gofig.String, "", "", "", "scaleio.userID")
 	r.Key(gofig.String, "", "", "", "scaleio.userName")
 	r.Key(gofig.String, "", "", "", "scaleio.password")

glide.yaml

@@ -24,7 +24,7 @@ import:
     repo:    https://github.com/clintonskitson/goamz
     vcs:     git
   - package: github.com/emccode/goscaleio
-    ref:     37a71bf801a533473f94e4d4dcee2372c141e261
+    ref:     5b02f78c9e4b331a05271145196c15c6614b9eff
     repo:    https://github.com/emccode/goscaleio.git
     vcs:     git
   - package: github.com/emccode/goxtremio