Reorganize Docker files and infrastructure

.gitignore

@@ -137,7 +137,6 @@ fabric.properties
 bin/
 tmp/
 *.tmp
-*.bak
 *.swp
 *~.nib
 local.properties
@@ -219,7 +218,6 @@ yarn-error.log
 /coverage
 .idea
 package-lock.json
-*bak
 .vscode
 
 # visual studio code
@@ -244,9 +242,9 @@ src/dashboard/lambda/mock/index.js
 .config
 .config.old
 
-# Cello local storage
-/**/opt/*
-/**/cello/*
+# Fabric
+src/api-engine/cello/builders
+src/api-engine/cello/config
 
 # Local Netlify folder
 .netlify

build_image/docker/cello-hlf/Dockerfile

@@ -102,7 +102,6 @@ RUN wget -O /go/bin/yq https://github.com/mikefarah/yq/releases/download/2.4.1/y
 RUN go install github.com/golang/protobuf/protoc-gen-go@latest \
         && go install github.com/maxbrunsfeld/counterfeiter/v6@latest \
         && go install github.com/axw/gocov/gocov@latest \
-        && go install github.com/axw/gocov/gocov@latest \
         && go install golang.org/x/tools/cmd/goimports@latest \
         && go install github.com/onsi/ginkgo/ginkgo@latest
 

build_image/docker/common/dashboard/Dockerfile.in

@@ -2,7 +2,7 @@ FROM node:20.15
 
 WORKDIR /usr/src/app/
 USER root
-RUN mkdir -p /usr/src/app && cd /usr/src/app
+RUN cd /usr/src/app
 COPY src/dashboard /usr/src/app
 RUN export NODE_OPTIONS=--openssl-legacy-provider && yarn --network-timeout 600000 && yarn run build
 

build_image/docker/common/dashboard/default.conf.tmpl

@@ -13,7 +13,7 @@ server {
     root   /usr/share/nginx/html;
 
     location / {
-        index  index.html index.htm;
+        index  index.html index.html;
 		try_files $uri $uri/ /index.html;
     }
 

build_image/docker/common/api-engine/Dockerfile.in → src/api-engine/Dockerfile.in

@@ -10,20 +10,15 @@ RUN apt-get update \
 # Set the working dir
 WORKDIR /var/www/server
 
-# Install compiled code tools from Artifactory and copy it to opt folder.
-RUN curl -L --retry 5 --retry-delay 3 "https://github.com/hyperledger/fabric/releases/download/v2.5.13/hyperledger-fabric-linux-amd64-2.5.13.tar.gz" | tar xz -C /opt/
-
 # Copy source code to the working dir
 COPY src/api-engine ./
-COPY template/node  /opt/node
+
+# Install compiled code tools from Artifactory and copy it to opt folder.
+RUN curl -L --retry 5 --retry-delay 3 "https://github.com/hyperledger/fabric/releases/download/v2.5.13/hyperledger-fabric-linux-amd64-2.5.10.tar.gz" | tar xz -C ./cello/
 
 # Install python dependencies
 RUN	pip3 install -r requirements.txt
 
-# Add uwsgi configuration file
-COPY build_image/docker/common/api-engine/server.ini /etc/uwsgi/apps-enabled/
-
 ENV RUN_MODE=server
 
-COPY build_image/docker/common/api-engine/entrypoint.sh /
-CMD ["bash", "/entrypoint.sh"]
+CMD ["bash", "entrypoint.sh"]

src/api-engine/api/common/enums.py

@@ -69,146 +69,6 @@ def names(cls):
         return [name.lower() for name, _ in cls.__members__.items()]
 
 
-@unique
-class HostStatus(ExtraEnum):
-    Inactive = 0
-    Active = 1
-
-
-@unique
-class NetworkStatus(ExtraEnum):
-    Stopped = 0
-    Running = 1
-    Error = 2
-
-
-@unique
-class LogLevel(ExtraEnum):
-    Info = 0
-    Warning = 1
-    Debug = 2
-    Error = 3
-    Critical = 4
-
-
-@unique
-class Operation(ExtraEnum):
-    Start = 0
-    Stop = 1
-    Restart = 2
-
-
-@unique
-class NetworkOperation(ExtraEnum):
-    Join = 0
-    Leave = 1
-
-
-@unique
-class HostType(ExtraEnum):
-    Docker = 0
-    Kubernetes = 1
-
-
-@unique
-class ChannelType(ExtraEnum):
-    System = 0
-    Normal = 1
-
-
-@unique
-class NetworkType(ExtraEnum):
-    Fabric = "fabric"
-
-
-@unique
-class FabricCAServerType(ExtraEnum):
-    # every company only can create one TLS type ca server
-    TLS = "tls"
-    Signature = "signature"
-
-
-@unique
-class FabricVersions(ExtraEnum):
-    V1_4 = "1.4.2"
-    V1_5 = "1.5"
-
-
-@unique
-class FabricNodeType(ExtraEnum):
-    Ca = 0
-    Orderer = 1
-    Peer = 2
-
-
-@unique
-class NodeStatus(ExtraEnum):
-    Created = 0
-    Restarting = 1
-    Running = 2
-    Removing = 3
-    Paused = 4
-    Exited = 5
-    Dead = 6
-
-
-@unique
-class FabricCAUserType(ExtraEnum):
-    Peer = "peer"
-    Orderer = "orderer"
-    User = "user"
-
-
-@unique
-class FabricCAUserStatus(ExtraEnum):
-    Registering = "registering"
-    Registered = "registered"
-    Fail = "fail"
-
-
-@unique
-class NetworkCreateType(ExtraEnum):
-    New = 0
-    Import = 1
-
-
-@unique
-class K8SCredentialType(ExtraEnum):
-    CertKey = 0
-    Config = 1
-    UsernamePassword = 2
-
-
-@unique
-class ConsensusPlugin(ExtraEnum):
-    Solo = 0
-    Kafka = 1
-
-
-@unique
-class UserRole(ExtraEnum):
-    Admin = 0
-    Operator = 1
-    User = 2
-
-
-@unique
-class FileType(ExtraEnum):
-    Certificate = 0
-
-
-@unique
-class AgentOperation(ExtraEnum):
-    Create = "create"
-    Start = "start"
-    Stop = "stop"
-    Query = "query"
-    Update = "update"
-    Delete = "delete"
-    FabricCARegister = "fabric:ca:register"
-    NewNetwork = "new:network"
-
-
 class EnumWithDisplayMeta(EnumMeta):
     def __new__(mcs, name, bases, attrs):
         display_strings = attrs.get("DisplayStrings")

src/api-engine/api/common/response.py

@@ -9,11 +9,37 @@
         }
 
     """
+import enum
+from typing import Type, Dict
 
+from rest_framework import serializers
 
-def ok(data):
-    return {"data": data, "msg": None, "status": "successful"}
+class Status(enum.Enum):
+    SUCCESSFUL = "SUCCESSFUL"
+    FAILED = "FAILED"
 
+def make_response_serializer(data_serializer: Type[serializers.Serializer]):
+    class _ResponseBody(serializers.Serializer):
+        status = serializers.ChoiceField(
+            choices=[(s.value, s.name) for s in Status]
+        )
+        msg = serializers.CharField(required=False, allow_null=True, allow_blank=True)
+        data = data_serializer(required=False, allow_null=True)
 
-def err(msg):
-    return {"data": None, "msg": msg, "status": "fail"}
+    _ResponseBody.__name__ = f"ResponseBody[{data_serializer.__name__}]"
+    return _ResponseBody
+
+
+def ok(data: Dict[str, any]) -> Dict[str, any]:
+    return {
+        "status": Status.SUCCESSFUL.value,
+        "msg": None,
+        "data": data
+    }
+
+def err(msg: str) -> Dict[str, any]:
+    return {
+        "status": Status.FAILED.value,
+        "msg": msg,
+        "data": None
+    }