14
14
compose_restart
15
15
16
16
from common import NETWORK_TYPES , CONSENSUS_PLUGINS , \
17
- CONSENSUS_MODES , CLUSTER_SIZES
17
+ CONSENSUS_MODES , NETWORK_SIZE_FABRIC_PRE_V1
18
18
19
19
from ..cluster_base import ClusterBase
20
20
@@ -32,9 +32,8 @@ def __init__(self):
32
32
pass
33
33
34
34
def create (self , cid , mapped_ports , host , user_id = "" ,
35
- fabric_version = NETWORK_TYPES [0 ],
36
- consensus_plugin = CONSENSUS_PLUGINS [0 ],
37
- consensus_mode = CONSENSUS_MODES [0 ], size = CLUSTER_SIZES [0 ]):
35
+ network_type = NETWORK_TYPES [0 ],
36
+ config = None ):
38
37
""" Create a cluster based on given data
39
38
40
39
TODO: maybe need other id generation mechanism
@@ -44,54 +43,42 @@ def create(self, cid, mapped_ports, host, user_id="",
44
43
:param start_port: first service port for cluster, will generate
45
44
if not given
46
45
:param user_id: user_id of the cluster if start to be applied
47
- :param fabric_version : fabric images version
48
- :param consensus_plugin: type of the consensus type
49
- :param size: size of the cluster, int type
46
+ :param network_type : fabric images version
47
+ :param config: network config
48
+
50
49
:return: Id of the created cluster or None
51
50
"""
52
51
53
52
# from now on, we should be safe
54
53
55
54
# start compose project, failed then clean and return
56
55
logger .debug ("Start compose project with name={}" .format (cid ))
57
- containers = compose_up (
58
- name = cid , mapped_ports = mapped_ports , host = host ,
59
- network_type = fabric_version ,
60
- consensus_plugin = consensus_plugin , consensus_mode = consensus_mode ,
61
- cluster_size = size )
62
- if not containers or len (containers ) != size :
56
+ containers = compose_up (name = cid , mapped_ports = mapped_ports , host = host ,
57
+ network_type = network_type , config = None )
58
+ if not containers or len (containers ) != config .size :
63
59
logger .warning ("failed to create cluster, with container={}"
64
60
.format (containers ))
65
61
return []
66
62
else :
67
63
return containers
68
64
69
- def delete (self , id , daemon_url , fabric_version , consensus_plugin ,
70
- cluster_size ):
71
- return compose_clean (id , daemon_url , fabric_version ,
72
- consensus_plugin , cluster_size )
73
-
74
- def start (self , name , daemon_url , mapped_ports , fabric_version ,
75
- consensus_plugin ,
76
- consensus_mode , log_type , log_level , log_server , cluster_size ):
77
- return compose_start (name , daemon_url , mapped_ports , fabric_version ,
78
- consensus_plugin , consensus_mode , log_type ,
79
- log_level , log_server , cluster_size )
80
-
81
- def restart (self , name , daemon_url , mapped_ports , fabric_version ,
82
- consensus_plugin , consensus_mode , log_type , log_level ,
83
- log_server , cluster_size ):
84
- return compose_restart (name , daemon_url , mapped_ports , fabric_version ,
85
- consensus_plugin , consensus_mode , log_type ,
86
- log_level , log_server , cluster_size )
87
-
88
- def stop (self , name , daemon_url , mapped_ports , fabric_version ,
89
- consensus_plugin , consensus_mode , log_type , log_level ,
90
- log_server , cluster_size ):
91
- return compose_stop (name , daemon_url , mapped_ports , fabric_version ,
92
- consensus_plugin ,
93
- consensus_mode , log_type , log_level , log_server ,
94
- cluster_size )
65
+ def delete (self , id , worker_api , network_type , config ):
66
+ return compose_clean (id , worker_api , network_type , config )
67
+
68
+ def start (self , name , worker_api , mapped_ports , network_type ,
69
+ log_type , log_level , log_server , config ):
70
+ return compose_start (name , worker_api , mapped_ports , network_type ,
71
+ log_type , log_level , log_server , config )
72
+
73
+ def restart (self , name , worker_api , mapped_ports , network_type ,
74
+ log_type , log_level , log_server , config ):
75
+ return compose_restart (name , worker_api , mapped_ports , network_type ,
76
+ log_type , log_level , log_server , config )
77
+
78
+ def stop (self , name , worker_api , mapped_ports , network_type ,
79
+ log_type , log_level , log_server , config ):
80
+ return compose_stop (name , worker_api , mapped_ports , network_type ,
81
+ log_type , log_level , log_server , config )
95
82
96
83
97
84
cluster_on_docker = ClusterOnDocker ()
0 commit comments