Merge pull request #42 from edisonxiang/addcomments

add comments for dcs
huaweicloud · Jul 5, 2018 · 966fcb2 · 966fcb2
2 parents 1e1d4f3 + 63708cd
commit 966fcb2
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 14 deletions.
diff --git a/docs/usage/dcs-imdg.md b/docs/usage/dcs-imdg.md
@@ -76,10 +76,6 @@ Update a previously provisioned instance.
 | maintain_begin               | string     | N         | Time at which the maintenance time window starts.
 | maintain_end                 | string     | N         | Time at which the maintenance time window ends.
 | security_group_id            | string     | N         | Subnet ID.
-| new_capacity                 | int        | N         | New cache capacity. Unit: GB. For a IMDG instance in single node, the cache capacity can be 2 GB, 4 GB, 8 GB. For a IMDG instance in cluster mode, the cache capacity can be 64 GB.
-| old_password                 | string     | N         | The previous password of IMDG instance.
-| new_password                 | string     | N         | The new password of IMDG instance.
-
 
 ## Deprovision
 
@@ -142,10 +138,7 @@ To update a service, use the `cf update-service` command.
 ```
 cf update-service myimdg -c '{
     "name": "IMDGSingleNode1",
-    "description": "IMDG Single Node Test1",
-    "new_capacity": 8,
-    "old_password": "Password1234!",
-    "new_password": "Password1234$"
+    "description": "IMDG Single Node Test1"
 }'
 ```
 

diff --git a/docs/usage/dcs-redis.md b/docs/usage/dcs-redis.md
@@ -77,7 +77,7 @@ Update a previously provisioned instance.
 | maintain_begin               | string     | N         | Time at which the maintenance time window starts.
 | maintain_end                 | string     | N         | Time at which the maintenance time window ends.
 | security_group_id            | string     | N         | Subnet ID.
-| new_capacity                 | int        | N         | New cache capacity. Unit: GB. For a Redis instance in single node or master standby mode, the cache capacity can be 2 GB, 4 GB, 8 GB, 16 GB, 32 GB, or 64 GB. For a Redis instance in cluster mode, the cache capacity can be 64, 128, 256, 512, or 1024 GB.
+| new_capacity                 | int        | N         | New cache capacity. Unit: GB. For a Redis instance in single node or master standby mode, the cache capacity can be 2 GB, 4 GB, 8 GB, 16 GB, 32 GB, or 64 GB. **For a Redis instance in cluster mode, it does not support extend the cache capacity.**
 | old_password                 | string     | N         | The previous password of Redis instance.
 | new_password                 | string     | N         | The new password of Redis instance.
 
@@ -144,7 +144,6 @@ To update a service, use the `cf update-service` command.
 cf update-service myredis -c '{
     "name": "RedisSingleNode1",
     "description": "Redis Single Node Test1",
-    "new_capacity": 8,
     "old_password": "Password1234!",
     "new_password": "Password1234$"
 }'

diff --git a/pkg/services/dcs/bind.go b/pkg/services/dcs/bind.go
@@ -81,10 +81,11 @@ func (b *DCSBroker) Bind(instanceID, bindingID string, details brokerapi.BindDet
 	}
 
 	// Get specified parameters
+	username := addtionalparam[AddtionalParamUsername]
 	password := addtionalparam[AddtionalParamPassword]
 
 	// Build Binding Credential
-	credential, err := BuildBindingCredential(instance.IP, instance.Port, instance.AccessUser, password, instance.Name, service.Name)
+	credential, err := BuildBindingCredential(instance.IP, instance.Port, username, password, instance.Name, service.Name)
 	if err != nil {
 		return brokerapi.Binding{}, fmt.Errorf("build dcs instance binding credential failed. Error: %s", err)
 	}

diff --git a/pkg/services/dcs/provision.go b/pkg/services/dcs/provision.go
@@ -203,6 +203,7 @@ func (b *DCSBroker) Provision(instanceID string, details brokerapi.ProvisionDeta
 
 	// Constuct addtional info
 	addtionalparam := map[string]string{}
+	addtionalparam[AddtionalParamUsername] = provisionOpts.AccessUser
 	addtionalparam[AddtionalParamPassword] = provisionOpts.Password
 
 	// Marshal addtional info

diff --git a/pkg/services/dcs/types.go b/pkg/services/dcs/types.go
@@ -73,6 +73,8 @@ type UpdateParameters struct {
 }
 
 const (
+	// AddtionalParamUsername for username
+	AddtionalParamUsername string = "username"
 	// AddtionalParamPassword for password
 	AddtionalParamPassword string = "password"
 )
diff --git a/pkg/services/dcs/utils.go b/pkg/services/dcs/utils.go
@@ -15,10 +15,12 @@ func BuildBindingCredential(
 	name string,
 	servicetype string) (BindingCredential, error) {
 
-	if servicetype == models.DCSRedisServiceName ||
-		servicetype == models.DCSMemcachedServiceName ||
-		servicetype == models.DCSIMDGServiceName {
+	if servicetype == models.DCSRedisServiceName {
+		username = ""
+	} else if servicetype == models.DCSMemcachedServiceName {
 
+	} else if servicetype == models.DCSIMDGServiceName {
+		port = 0
 	} else {
 		return BindingCredential{}, fmt.Errorf("unknown service type: %s", servicetype)
 	}