Skip to content
Snippets Groups Projects
Commit bc0f2b82 authored by Hartung, Michael's avatar Hartung, Michael
Browse files

separate groups from config in standalone

parent f9d0118a
Branches
No related tags found
No related merge requests found
Pipeline #12085 failed
...@@ -215,3 +215,4 @@ class Network(models.Model): ...@@ -215,3 +215,4 @@ class Network(models.Model):
nodes = models.TextField(null=True, default='') nodes = models.TextField(null=True, default='')
edges = models.TextField(null=True, default='') edges = models.TextField(null=True, default='')
config = models.TextField(null=True, default='') config = models.TextField(null=True, default='')
groups = models.TextField(null=True, default='')
...@@ -279,12 +279,15 @@ def create_network(request) -> Response: ...@@ -279,12 +279,15 @@ def create_network(request) -> Response:
request.data['network']['edges'] = [] request.data['network']['edges'] = []
if 'config' not in request.data: if 'config' not in request.data:
request.data['config'] = {} request.data['config'] = {}
if 'groups' not in request.data:
request.data['groups'] = {}
id = uuid.uuid4().hex id = uuid.uuid4().hex
while True: while True:
try: try:
Network.objects.create(id=id, nodes=request.data['network']['nodes'], Network.objects.create(id=id, nodes=request.data['network']['nodes'],
edges=request.data['network']['edges'], config=request.data['config']) edges=request.data['network']['edges'], config=request.data['config'],
groups=request.data['groups'])
break break
except IntegrityError: except IntegrityError:
id = uuid.uuid4().hex id = uuid.uuid4().hex
...@@ -297,7 +300,9 @@ def load_network(request) -> Response: ...@@ -297,7 +300,9 @@ def load_network(request) -> Response:
result = {'network': {'nodes': json.loads(network['nodes'].replace("'", '"')), result = {'network': {'nodes': json.loads(network['nodes'].replace("'", '"')),
'edges': json.loads(network['edges'].replace("'", '"'))}, 'edges': json.loads(network['edges'].replace("'", '"'))},
'config': json.loads( 'config': json.loads(
network['config'].replace("'", '"').replace('True', 'true').replace('False', 'false'))} network['config'].replace("'", '"').replace('True', 'true').replace('False', 'false')),
'groups': json.loads(
network['groups'].replace("'", '"').replace('True', 'true').replace('False', 'false'))}
return Response(result) return Response(result)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment