Commit 256dadad authored by Simon Pastor's avatar Simon Pastor Committed by Kevin Di Lallo
Browse files

backing off on changes for network characteristics element types

parent a69b2843

go-apps/meep-ctrl-engine/api/swagger.yaml

+13 −8
Original line number Diff line number Diff line
@@ -913,14 +913,19 @@ definitions: 
        type: "string"

        description: "Type of the network element to be updated"

        enum:

        - "INTER-DOMAIN"

        - "INTER-ZONE"

        - "INTER-EDGE"

        - "INTER-FOG"

        - "EDGE-FOG"

        - "TERMINAL-LINK"

        - "LINK"

        - "APP"

        - "OPERATOR"

        - "POA"

        - "SCENARIO"

        - "ZONE-INTER-EDGE"

        - "ZONE-INTER-FOG"

        - "ZONE-EDGE-FOG"

        - "EDGE"

        - "FOG"

        - "UE"

        - "DISTANT-CLOUD"

        - "UE-APP"

        - "EDGE-APP"

        - "CLOUD-APP"

      latency:

        type: "integer"

        description: "Latency in ms"

go-apps/meep-ctrl-engine/server/ctrl-engine.go

+3 −11
Original line number Diff line number Diff line
@@ -733,7 +733,7 @@ func sendEventNetworkCharacteristics(event Event) (string, int) { 
		for zIndex, z := range d.Zones {

			if elementFound {

				break

			} else if elementType == "INTER-EDGE" && elementName == z.Name {

			} else if elementType == "ZONE-INTER-EDGE" && elementName == z.Name {

				zone := &scenario.Deployment.Domains[dIndex].Zones[zIndex]

				zone.InterEdgeLatency = netChar.Latency

				zone.InterEdgeLatencyVariation = netChar.LatencyVariation
@@ -741,7 +741,7 @@ func sendEventNetworkCharacteristics(event Event) (string, int) { 
				zone.InterEdgePacketLoss = netChar.PacketLoss

				elementFound = true

				break

			} else if elementType == "INTER-FOG" && elementName == z.Name {

			} else if elementType == "ZONE-INTER-FOG" && elementName == z.Name {

				zone := &scenario.Deployment.Domains[dIndex].Zones[zIndex]

				zone.InterFogLatency = netChar.Latency

				zone.InterFogLatencyVariation = netChar.LatencyVariation
@@ -749,7 +749,7 @@ func sendEventNetworkCharacteristics(event Event) (string, int) { 
				zone.InterFogPacketLoss = netChar.PacketLoss

				elementFound = true

				break

			} else if elementType == "EDGE-FOG" && elementName == z.Name {

			} else if elementType == "ZONE-EDGE-FOG" && elementName == z.Name {

				zone := &scenario.Deployment.Domains[dIndex].Zones[zIndex]

				zone.EdgeFogLatency = netChar.Latency

				zone.EdgeFogLatencyVariation = netChar.LatencyVariation
@@ -948,14 +948,6 @@ func sendEventMobility(event Event) (string, int) { 
			return err.Error(), http.StatusNotFound

		}

		log.Debug("Active scenario updated with rev: ", rev)

		log.WithFields(log.Fields{

			"meep.log.component": "ctrl-engine",

			"meep.log.msgType":   "mobilityEvent",

			"meep.log.oldPoa":    oldNL.Name,

			"meep.log.newPoa":    newNL.Name,

			"meep.log.src":       ue.Name,

			"meep.log.dest":      ue.Name,

		}).Info("Measurements log")



		log.WithFields(log.Fields{

			"meep.log.component": "ctrl-engine",

go-packages/meep-ctrl-engine-client/api/swagger.yaml

+13 −8
Original line number Diff line number Diff line
@@ -913,14 +913,19 @@ definitions: 
        type: "string"

        description: "Type of the network element to be updated"

        enum:

        - "INTER-DOMAIN"

        - "INTER-ZONE"

        - "INTER-EDGE"

        - "INTER-FOG"

        - "EDGE-FOG"

        - "TERMINAL-LINK"

        - "LINK"

        - "APP"

        - "OPERATOR"

        - "POA"

        - "SCENARIO"

        - "ZONE-INTER-EDGE"

        - "ZONE-INTER-FOG"

        - "ZONE-EDGE-FOG"

        - "EDGE"

        - "FOG"

        - "UE"

        - "DISTANT-CLOUD"

        - "UE-APP"

        - "EDGE-APP"

        - "CLOUD-APP"

      latency:

        type: "integer"

        description: "Latency in ms"

go-packages/meep-ctrl-engine-model/api/swagger.yaml

+13 −8
Original line number Diff line number Diff line
@@ -179,14 +179,19 @@ definitions: 
        type: string

        description: Type of the network element to be updated

        enum:

          - INTER-DOMAIN

          - INTER-ZONE

          - INTER-EDGE

          - INTER-FOG

          - EDGE-FOG

          - TERMINAL-LINK

          - LINK

          - APP

          - "OPERATOR"

          - "POA"

          - "SCENARIO"

          - "ZONE-INTER-EDGE"

          - "ZONE-INTER-FOG"

          - "ZONE-EDGE-FOG"

          - "EDGE"

          - "FOG"

          - "UE"

          - "DISTANT-CLOUD"

          - "UE-APP"

          - "EDGE-APP"

          - "CLOUD-APP"

      latency:

        type: integer

        description: Latency in ms

js-packages/meep-ctrl-engine-client/docs/EventNetworkCharacteristicsUpdate.md

+18 −8
Original line number Diff line number Diff line
@@ -15,21 +15,31 @@ Name | Type | Description | Notes 
## Enum: ElementTypeEnum





* `INTER-DOMAIN` (value: `"INTER-DOMAIN"`)

* `OPERATOR` (value: `"OPERATOR"`)



* `INTER-ZONE` (value: `"INTER-ZONE"`)

* `POA` (value: `"POA"`)



* `INTER-EDGE` (value: `"INTER-EDGE"`)

* `SCENARIO` (value: `"SCENARIO"`)



* `INTER-FOG` (value: `"INTER-FOG"`)

* `ZONE-INTER-EDGE` (value: `"ZONE-INTER-EDGE"`)



* `EDGE-FOG` (value: `"EDGE-FOG"`)

* `ZONE-INTER-FOG` (value: `"ZONE-INTER-FOG"`)



* `TERMINAL-LINK` (value: `"TERMINAL-LINK"`)

* `ZONE-EDGE-FOG` (value: `"ZONE-EDGE-FOG"`)



* `LINK` (value: `"LINK"`)

* `EDGE` (value: `"EDGE"`)



* `APP` (value: `"APP"`)

* `FOG` (value: `"FOG"`)



* `UE` (value: `"UE"`)



* `DISTANT-CLOUD` (value: `"DISTANT-CLOUD"`)



* `UE-APP` (value: `"UE-APP"`)



* `EDGE-APP` (value: `"EDGE-APP"`)



* `CLOUD-APP` (value: `"CLOUD-APP"`)