Skip to content

Commit 2b62e97

Browse files
authored
Merge pull request #742 from dodo920306/refactor/backend-applications
Restructure backend into separate Django applications
2 parents 510ebb8 + 78ca7bf commit 2b62e97

File tree

113 files changed

+1501
-7015
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

113 files changed

+1501
-7015
lines changed

build_image/docker/cello-hlf/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ RUN wget -O /go/bin/yq https://github.com/mikefarah/yq/releases/download/2.4.1/y
102102
RUN go install github.com/golang/protobuf/protoc-gen-go@latest \
103103
&& go install github.com/maxbrunsfeld/counterfeiter/v6@latest \
104104
&& go install github.com/axw/gocov/gocov@latest \
105-
&& go install github.com/axw/gocov/gocov@latest \
106105
&& go install golang.org/x/tools/cmd/goimports@latest \
107106
&& go install github.com/onsi/ginkgo/ginkgo@latest
108107

src/api-engine/api/auth.py

Lines changed: 0 additions & 53 deletions
This file was deleted.

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

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -90,32 +90,6 @@ class LogLevel(ExtraEnum):
9090
Error = 3
9191
Critical = 4
9292

93-
94-
@unique
95-
class Operation(ExtraEnum):
96-
Start = 0
97-
Stop = 1
98-
Restart = 2
99-
100-
101-
@unique
102-
class NetworkOperation(ExtraEnum):
103-
Join = 0
104-
Leave = 1
105-
106-
107-
@unique
108-
class HostType(ExtraEnum):
109-
Docker = 0
110-
Kubernetes = 1
111-
112-
113-
@unique
114-
class ChannelType(ExtraEnum):
115-
System = 0
116-
Normal = 1
117-
118-
11993
@unique
12094
class NetworkType(ExtraEnum):
12195
Fabric = "fabric"
@@ -134,24 +108,6 @@ class FabricVersions(ExtraEnum):
134108
V1_5 = "1.5"
135109

136110

137-
@unique
138-
class FabricNodeType(ExtraEnum):
139-
Ca = 0
140-
Orderer = 1
141-
Peer = 2
142-
143-
144-
@unique
145-
class NodeStatus(ExtraEnum):
146-
Created = 0
147-
Restarting = 1
148-
Running = 2
149-
Removing = 3
150-
Paused = 4
151-
Exited = 5
152-
Dead = 6
153-
154-
155111
@unique
156112
class FabricCAUserType(ExtraEnum):
157113
Peer = "peer"

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

Lines changed: 30 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,37 @@
99
}
1010
1111
"""
12+
import enum
13+
from typing import Type, Dict
1214

15+
from rest_framework import serializers
1316

14-
def ok(data):
15-
return {"data": data, "msg": None, "status": "successful"}
17+
class Status(enum.Enum):
18+
SUCCESSFUL = "SUCCESSFUL"
19+
FAILED = "FAILED"
1620

21+
def make_response_serializer(data_serializer: Type[serializers.Serializer]):
22+
class _ResponseBody(serializers.Serializer):
23+
status = serializers.ChoiceField(
24+
choices=[(s.value, s.name) for s in Status]
25+
)
26+
msg = serializers.CharField(required=False, allow_null=True, allow_blank=True)
27+
data = data_serializer(required=False, allow_null=True)
1728

18-
def err(msg):
19-
return {"data": None, "msg": msg, "status": "fail"}
29+
_ResponseBody.__name__ = f"ResponseBody[{data_serializer.__name__}]"
30+
return _ResponseBody
31+
32+
33+
def ok(data: Dict[str, any]) -> Dict[str, any]:
34+
return {
35+
"status": Status.SUCCESSFUL.value,
36+
"msg": None,
37+
"data": data
38+
}
39+
40+
def err(msg: str) -> Dict[str, any]:
41+
return {
42+
"status": Status.FAILED.value,
43+
"msg": msg,
44+
"data": None
45+
}

src/api-engine/api/config.py

Lines changed: 0 additions & 16 deletions
This file was deleted.
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
#
22
# SPDX-License-Identifier: Apache-2.0
3-
#
4-
from api.lib.agent.handler import AgentHandler
3+
#

src/api-engine/api/lib/agent/docker/fabric/__init__.py

Lines changed: 0 additions & 64 deletions
This file was deleted.

src/api-engine/api/lib/agent/handler.py

Lines changed: 0 additions & 76 deletions
This file was deleted.

0 commit comments

Comments
 (0)