[CE-77] Fix cluster stop/start/restart operation

Fix operation fail for cluster Change-Id: Ib95b33ac0c074580664831bcdc72528097cc4e0a Signed-off-by: Haitao Yue <hightall@me.com>
hyperledger · Jun 30, 2017 · 3a5c642 · 3a5c642
1 parent 4ef1854
commit 3a5c642
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/agent/docker/docker_swarm.py b/src/agent/docker/docker_swarm.py
@@ -448,7 +448,7 @@ def compose_start(name, worker_api, mapped_ports=SERVICE_PORTS,
     _compose_set_env(name, worker_api, mapped_ports, network_type,
                      log_level, log_type, log_server, config)
 
-    if network_type == NETWORK_TYPES[1]:
+    if network_type == NETWORK_TYPE_FABRIC_PRE_V1:
         cluster_version = 'fabric-0.6'
     else:
         cluster_version = 'fabric-1.0'
@@ -491,7 +491,7 @@ def compose_restart(name, worker_api, mapped_ports=SERVICE_PORTS,
     _compose_set_env(name, worker_api, mapped_ports, network_type,
                      log_level, log_type, log_server, config)
 
-    if network_type == NETWORK_TYPES[1]:
+    if network_type == NETWORK_TYPE_FABRIC_PRE_V1:
         cluster_version = 'fabric-0.6'
     else:
         cluster_version = 'fabric-1.0'
@@ -536,7 +536,7 @@ def compose_stop(name, worker_api, mapped_ports=SERVICE_PORTS,
     _compose_set_env(name, worker_api, mapped_ports, network_type,
                      log_level, log_type, log_server, config)
 
-    if network_type == NETWORK_TYPES[1]:
+    if network_type == NETWORK_TYPE_FABRIC_PRE_V1:
         cluster_version = 'fabric-0.6'
     else:
         cluster_version = 'fabric-1.0'
@@ -577,7 +577,7 @@ def compose_down(name, worker_api, mapped_ports=SERVICE_PORTS,
     _compose_set_env(name, worker_api, mapped_ports, network_type,
                      log_level, log_type, log_server, config)
 
-    if network_type == NETWORK_TYPES[1]:
+    if network_type == NETWORK_TYPE_FABRIC_PRE_V1:
         cluster_version = 'fabric-0.6'
     else:
         cluster_version = 'fabric-1.0'

diff --git a/src/themes/react/static/js/services/cluster.js b/src/themes/react/static/js/services/cluster.js
@@ -36,7 +36,7 @@ export async function deleteCluster(params) {
 export async function operation(params) {
 	return request({
 		url: config.urls.cluster.operation,
-		method: 'post',
+		method: 'get',
 		data: params
 	})
 }