Commit 1359da7a authored by Carlos Manso's avatar Carlos Manso
Browse files

Merge branch... 

Merge branch 'feat/147-integrate-support-for-ip-e2e-optical-sdn-controllers-to-manage-hierarchical-virtual' of https://labs.etsi.org/rep/tfs/controller into feat/147-integrate-support-for-ip-e2e-optical-sdn-controllers-to-manage-hierarchical-virtual
parents f4a49079 9661fbdc

manifests/e2e_orchestratorservice.yaml

+0 −2
Original line number Diff line number Diff line
@@ -26,8 +26,6 @@ spec: 
      annotations:

        config.linkerd.io/skip-outbound-ports: "8761"

        config.linkerd.io/skip-inbound-ports: "8761"





      labels:

        app: e2e-orchestratorservice

    spec:

manifests/ztpservice.yaml

+19 −19
Original line number Diff line number Diff line
@@ -104,22 +104,22 @@ spec: 
            limits:

              cpu: 2000m

              memory: 2048Mi

---

apiVersion: autoscaling/v2

kind: HorizontalPodAutoscaler

metadata:

  name: ztpservice-hpa

spec:

  scaleTargetRef:

    apiVersion: apps/v1

    kind: Deployment

    name: ztpservice

  minReplicas: 1

  maxReplicas: 10

  metrics:

    - type: Resource

      resource:

        name: cpu

        target:

          type: Utilization

          averageUtilization: 80
 
# ---

# apiVersion: autoscaling/v2

# kind: HorizontalPodAutoscaler

# metadata:

#  name: ztpservice-hpa

# spec:

#  scaleTargetRef:

#    apiVersion: apps/v1

#    kind: Deployment

#    name: ztpservice

#  minReplicas: 1

#  maxReplicas: 10

#  metrics:

#    - type: Resource

#      resource:

#        name: cpu

#        target:

#          type: Utilization

#          averageUtilization: 80

proto/e2eorchestrator.proto

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import "context.proto"; 
service E2EOrchestratorService {

  rpc Compute(E2EOrchestratorRequest) returns (E2EOrchestratorReply)  {}

  rpc PushTopology(context.Topology)  returns (context.Empty)         {}



}



message E2EOrchestratorRequest {

src/tests/.gitlab-ci.yml

+1 −2
Original line number Diff line number Diff line
@@ -20,5 +20,4 @@ include: 
  #- local: '/src/tests/nfvsdn22/.gitlab-ci.yml'

  #- local: '/src/tests/ofc23/.gitlab-ci.yml'

  - local: '/src/tests/ofc24/.gitlab-ci.yml'

  - local: '/src/tests/ofc24/.gitlab-ci.yml'

 
 No newline at end of file
 
  - local: '/src/tests/ecoc24/.gitlab-ci.yml'

src/tests/ecoc24/deploy.sh

+0 −1
Original line number Diff line number Diff line
@@ -36,4 +36,3 @@ mv tfs_runtime_env_vars.sh tfs_runtime_env_vars_ip.sh 
source ./src/tests/ecoc24/deploy_specs_e2e.sh

./deploy/all.sh

mv tfs_runtime_env_vars.sh tfs_runtime_env_vars_e2e.sh