Unverified Commit 19a246c9 authored by Kevin Di Lallo's avatar Kevin Di Lallo Committed by GitHub
Browse files

Merge pull request #46 from pastorsx/kd_sp32_zone_net_char 

Model update for Zone network characteristics
parents bd1c0b37 5d81eaf4

charts/meep-webhook/templates/deployment.yaml

+1 −1
Original line number Diff line number Diff line
@@ -56,4 +56,4 @@ spec: 
        - name: init-{{ .Values.deployment.dependency }}

          image: busybox

          imagePullPolicy: IfNotPresent

          command: ['sh', '-c', 'until nslookup {{ .Values.deployment.dependency }} ; do echo wiating for {{ .Values.deployment.dependency }}; sleep2; done;']
 
          command: ['sh', '-c', 'until nslookup {{ .Values.deployment.dependency }} ; do echo waiting for {{ .Values.deployment.dependency }}; sleep 0.25; done;']

examples/demo1/src/demo-server/go/README.md

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ To see how to make this your own, look here: 
[README](https://github.com/swagger-api/swagger-codegen/blob/master/README.md)



- API version: 0.0.1

- Build date: 2019-11-18T07:48:18.197-05:00

- Build date: 2019-11-18T11:17:35.705-05:00





### Running the server

examples/demo1/src/iperf-proxy/go/README.md

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ To see how to make this your own, look here: 
[README](https://github.com/swagger-api/swagger-codegen/blob/master/README.md)



- API version: 0.0.1

- Build date: 2019-11-18T07:48:20.656-05:00

- Build date: 2019-11-18T11:17:37.842-05:00





### Running the server

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

+37 −24
Original line number Diff line number Diff line
@@ -349,6 +349,9 @@ definitions: 
  Scenario:

    type: "object"

    properties:

      version:

        type: "string"

        description: "Scenario version"

      name:

        type: "string"

        description: "Unique scenario name"
@@ -464,53 +467,47 @@ definitions: 
        enum:

        - "ZONE"

        - "COMMON"

      netChar:

        $ref: "#/definitions/NetworkCharacteristics"

      interFogLatency:

        type: "integer"

        description: "Latency in ms between fog nodes (or PoAs) within zone"

        description: "**DEPRECATED** As of release 1.3.0, no longer supported"

      interFogLatencyVariation:

        type: "integer"

        description: "Latency variation in ms between fog nodes (or PoAs) within zone"

        description: "**DEPRECATED** As of release 1.3.0, no longer supported"

      interFogThroughput:

        type: "integer"

        description: "The limit of the traffic supported between fog nodes (or PoAs)\

          \ within the zone"

        description: "**DEPRECATED** As of release 1.3.0, no longer supported"

      interFogPacketLoss:

        type: "number"

        format: "double"

        description: "Packet lost (in terms of percentage) between fog nodes (or PoAs)\

          \ within the zone"

        description: "**DEPRECATED** As of release 1.3.0, no longer supported"

      interEdgeLatency:

        type: "integer"

        description: "Latency in ms between edge nodes within zone"

        description: "**DEPRECATED** As of release 1.3.0, no longer supported"

      interEdgeLatencyVariation:

        type: "integer"

        description: "Latency variation in ms between edge nodes within zone"

        description: "**DEPRECATED** As of release 1.3.0, no longer supported"

      interEdgeThroughput:

        type: "integer"

        description: "The limit of the traffic supported between edge nodes within\

          \ the zone"

        description: "**DEPRECATED** As of release 1.3.0, no longer supported"

      interEdgePacketLoss:

        type: "number"

        format: "double"

        description: "Packet lost (in terms of percentage) between edge nodes within\

          \ the zone"

        description: "**DEPRECATED** As of release 1.3.0, no longer supported"

      edgeFogLatency:

        type: "integer"

        description: "Latency in ms between fog nodes (or PoAs) and edge nodes within\

          \ zone"

        description: "**DEPRECATED** As of release 1.3.0, replaced by netChar latency"

      edgeFogLatencyVariation:

        type: "integer"

        description: "Latency variation in ms between fog nodes (or PoAs) and edge\

          \ nodes within zone"

        description: "**DEPRECATED** As of release 1.3.0, replaced by netChar latencyVariation"

      edgeFogThroughput:

        type: "integer"

        description: "The limit of the traffic supported between fog nodes (or PoAs)\

          \ and edge nodes within the zone"

        description: "**DEPRECATED** As of release 1.3.0, replaced by netChar throughput"

      edgeFogPacketLoss:

        type: "number"

        format: "double"

        description: "Packet lost (in terms of percentage) between fog nodes (or PoAs)\

          \ and edge nodes within the zone"

        description: "**DEPRECATED** As of release 1.3.0, replaced by netChar packetLoss"

      meta:

        type: "object"

        description: "Key/Value Pair Map (string, string)"
@@ -527,6 +524,24 @@ definitions: 
          $ref: "#/definitions/NetworkLocation"

    description: "Logical zone (MEC network) object"

    example: {}

  NetworkCharacteristics:

    type: "object"

    properties:

      latency:

        type: "integer"

        description: "Latency in ms"

      latencyVariation:

        type: "integer"

        description: "Latency variation in ms"

      throughput:

        type: "integer"

        description: "Throughput limit in Mbps"

      packetLoss:

        type: "number"

        format: "double"

        description: "Packet loss percentage"

    description: "Network characteristics object"

    example: {}

  NetworkLocation:

    type: "object"

    properties:
@@ -861,12 +876,10 @@ definitions: 
        type: "string"

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

        enum:

        - "SCENARIO"

        - "OPERATOR"

        - "ZONE"

        - "POA"

        - "SCENARIO"

        - "ZONE-INTER-EDGE"

        - "ZONE-INTER-FOG"

        - "ZONE-EDGE-FOG"

        - "EDGE"

        - "FOG"

        - "UE"

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

+2 −0
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ github.com/RyanCarrier/dijkstra-1 v0.0.0-20170512020943-0e5801a26345 h1:fgSpoKVi 
github.com/RyanCarrier/dijkstra-1 v0.0.0-20170512020943-0e5801a26345/go.mod h1:OK4EvWJ441LQqGzed5NGB6vKBAE34n3z7iayPcEwr30=

github.com/albertorestifo/dijkstra v0.0.0-20160910063646-aba76f725f72 h1:uGeGZl8PxSq8VZGG4QK5njJTFA4/G/x5CYORvQVXtAE=

github.com/albertorestifo/dijkstra v0.0.0-20160910063646-aba76f725f72/go.mod h1:o+JdB7VetTHjLhU0N57x18B9voDBQe0paApdEAEoEfw=

github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ=

github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=

github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=

github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

github.com/flimzy/diff v0.1.5 h1:QfOwp+TuGCeWWFxFtXqCdepnz0SeaImgNfMm6vWz3y8=