Merge branch 'feat/context-webui-refinements' into 'develop' (98f594d3) · Commits · TFS / controller

manifests/computeservice.yaml

+7 −4

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ spec:
		selector:
		matchLabels:
		app: computeservice
		replicas: 1
		template:
		metadata:
		labels:
		@@ -44,16 +45,18 @@ spec:
		command: ["/bin/grpc_health_probe", "-addr=:9090"]
		resources:
		requests:
		cpu: 250m
		memory: 512Mi
		cpu: 50m
		memory: 64Mi
		limits:
		cpu: 700m
		memory: 1024Mi
		cpu: 500m
		memory: 512Mi
		---
		apiVersion: v1
		kind: Service
		metadata:
		name: computeservice
		labels:
		app: computeservice
		spec:
		type: ClusterIP
		selector:

+10 −7

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ spec:
		selector:
		matchLabels:
		app: webuiservice
		replicas: 1
		template:
		metadata:
		labels:
		@@ -55,11 +56,11 @@ spec:
		timeoutSeconds: 1
		resources:
		requests:
		cpu: 100m
		memory: 512Mi
		cpu: 50m
		memory: 64Mi
		limits:
		cpu: 700m
		memory: 1024Mi
		cpu: 500m
		memory: 512Mi
		- name: grafana
		image: grafana/grafana:8.5.11
		imagePullPolicy: IfNotPresent
		@@ -92,16 +93,18 @@ spec:
		timeoutSeconds: 1
		resources:
		requests:
		cpu: 250m
		memory: 750Mi
		cpu: 150m
		memory: 512Mi
		limits:
		cpu: 700m
		cpu: 500m
		memory: 1024Mi
		---
		apiVersion: v1
		kind: Service
		metadata:
		name: webuiservice
		labels:
		app: webuiservice
		spec:
		type: ClusterIP
		selector:

+2 −1

Original line number	Diff line number	Diff line
		@@ -64,13 +64,14 @@ def link_set(db_engine : Engine, request : Link) -> Tuple[Dict, bool]:
		topology_uuids : Set[str] = set()
		related_topologies : List[Dict] = list()
		link_endpoints_data : List[Dict] = list()
		for endpoint_id in request.link_endpoint_ids:
		for i,endpoint_id in enumerate(request.link_endpoint_ids):
		endpoint_topology_uuid, _, endpoint_uuid = endpoint_get_uuid(
		endpoint_id, allow_random=False)

		link_endpoints_data.append({
		'link_uuid' : link_uuid,
		'endpoint_uuid': endpoint_uuid,
		'position' : i,
		})

		if endpoint_topology_uuid not in topology_uuids:

+1 −0

Original line number	Diff line number	Diff line
		@@ -91,6 +91,7 @@ def service_set(db_engine : Engine, request : Service) -> Tuple[Dict, bool]:
		service_endpoints_data.append({
		'service_uuid' : service_uuid,
		'endpoint_uuid': endpoint_uuid,
		'position' : i,
		})

		constraints = compose_constraints_data(request.service_constraints, now, service_uuid=service_uuid)

+1 −0

Original line number	Diff line number	Diff line
		@@ -91,6 +91,7 @@ def slice_set(db_engine : Engine, request : Slice) -> Tuple[Dict, bool]:
		slice_endpoints_data.append({
		'slice_uuid' : slice_uuid,
		'endpoint_uuid': endpoint_uuid,
		'position' : i,
		})

		slice_services_data : List[Dict] = list()