small update and comment fabric-operator hyperledger-cello#192

Signed-off-by: Dixing (Dex) Xu <dixingxu@gmail.com>

azure-pipelines.yml

@@ -40,9 +40,9 @@ stages:
         images:
         - imagename: "hyperledger/cello-ansible-agent"
           dockerfile: "build_image/docker/agent/ansible/Dockerfile.in"
-      - name: fabricoperator
-        images:
-        - imagename: "hyperledger/cello-k8s-operator-agent"
-          dockerfile: "src/agent/fabric-operator/agent/Dockerfile"
-        - imagename: "hyperledger/cello-k8s-operator-controller"
-          dockerfile: "src/agent/fabric-operator/Dockerfile"
+#     - name: fabricoperator
+#       images:
+#       - imagename: "hyperledger/cello-k8s-operator-agent"
+#         dockerfile: "src/agent/fabric-operator/agent/Dockerfile"
+#       - imagename: "hyperledger/cello-k8s-operator-controller"
+#         dockerfile: "src/agent/fabric-operator/Dockerfile"

src/agent/docker-rest-agent/intergration-test/test.py

@@ -18,28 +18,45 @@
                 'name': 'cello-hlf-peer'
     }
 
-# Test creating a node
+print('-'*20)
+print('Test creating a node')
+print()
 n = post('http://localhost:5001/api/v1/nodes', data=data)
 print(n.text)
 txt = json.loads(n.text)
 nid = txt['data']['id']
+print('-'*20)
 
-# Test starting a node
+print('Test starting a node')
+print()
 data = {'action': 'start'}
 response = post('http://localhost:5001/api/v1/nodes/'+nid, data=data)
 print(response.text)
+print('-'*20)
 
-# Test restarting a node
+print('Test restarting a node')
+print()
 data = {'action': 'restart'}
 response = post('http://localhost:5001/api/v1/nodes/'+nid, data=data)
 print(response.text)
+print('-'*20)
 
-# Test stopping a node
+print('Test stopping a node')
+print()
 data = {'action': 'stop'}
 response = post('http://localhost:5001/api/v1/nodes/'+nid, data=data)
 print(response.text)
+print('-'*20)
 
-# Test deleting a node
+
+print('Get status of a node')
+print()
+response = get('http://localhost:5001/api/v1/nodes/'+nid)
+print(response.text)
+print('-'*20)
+
+print('Test deleting a node')
+print()
 data = {'action': 'delete'}
 response = post('http://localhost:5001/api/v1/nodes/'+nid, data=data)
 print(response.text)

src/agent/docker-rest-agent/requirements.txt

@@ -1,18 +1,3 @@
-Django>=3.0
-uwsgi
-enum34
-djangorestframework
-holdup>1.5.0,<=1.6.0
-drf-yasg<=1.17.0
-swagger_spec_validator<=2.4.1
-psycopg2-binary
-celery<5.0,>=4.4
-redis
+Flask
+flask-restful
 requests
-supervisor
-django-celery-beat
-django-celery-results
-django-3-jet
-djangorestframework-jwt<=1.11.0
-python-jwt # 需要安装，否则会出现token解码失败错误
-shortuuid

src/agent/docker-rest-agent/server.py

@@ -41,24 +41,28 @@ def create_node():
     res['data']['id'] = container.id
     res['data']['public-grpc'] = '127.0.0.1:7050' # TODO: read the info from config file
     res['data']['public-raft'] = '127.0.0.1:7052'
+    res['msg'] = 'node created'
     return jsonify(res)
 
 @app.route('/api/v1/nodes/<id>', methods=['GET', 'POST'])
 def operate_node(id):
-
     container = client.containers.get(id)
     if request.method == 'POST':
         act = request.form.get('action') # only with POST
 
         try:
             if act == 'start':
                 container.start()
+                res['msg'] = 'node started'
             elif act == 'restart':
                 container.restart()
+                res['msg'] = 'node restarted'
             elif act == 'stop':
                 container.stop()
+                res['msg'] = 'node stopped'
             elif act == 'delete':
                 container.remove()
+                res['msg'] = 'node deleted'
             else:
                 res['msg'] = 'undefined action'
         except:
@@ -69,8 +73,8 @@ def operate_node(id):
             raise
     else:
         # GET
-        res['data']['status'] = container.status()
-    
+        res['data']['status'] = container.status
+
     res['code'] = PASS_CODE
     return jsonify(res)