Commit 2ed5fc63 authored by Simon Pastor's avatar Simon Pastor
Browse files

changing replay to be from one single file to many to use cobra fully

parent 2d390d33

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: 2020-02-18T10:34:45.771-05:00

- Build date: 2020-02-20T15:30:48.431-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: 2020-02-18T10:34:47.914-05:00

- Build date: 2020-02-20T15:30:50.617-05:00





### Running the server

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

+20 −11
Original line number Diff line number Diff line
@@ -408,12 +408,12 @@ paths: 
        type: "string"

        x-exportParamName: "Name"

      - in: "body"

        name: "scenarioInfo"

        description: "Scenario information"

        name: "replayInfo"

        description: "Replay information"

        required: true

        schema:

          $ref: "#/definitions/ScenarioInfo"

        x-exportParamName: "ScenarioInfo"

          $ref: "#/definitions/ReplayInfo"

        x-exportParamName: "ReplayInfo"

      responses:

        200:

          description: "OK"
@@ -555,6 +555,9 @@ definitions: 
      name:

        type: "string"

        description: "Unique scenario name"

      description:

        type: "string"

        description: "User description of the scenario."

      config:

        $ref: "#/definitions/ScenarioConfig"

      deployment:
@@ -1153,6 +1156,9 @@ definitions: 
  Replay:

    type: "object"

    properties:

      description:

        type: "string"

        description: "User description of the content of the replay file."

      events:

        type: "array"

        items:
@@ -1174,12 +1180,15 @@ definitions: 
        $ref: "#/definitions/Event"

    description: "Replay event object"

    example: {}

  ScenarioInfo:

  ReplayInfo:

    type: "object"

    properties:

      name:

      scenarioName:

        type: "string"

        description: "Scenario name"

      description:

        type: "string"

        description: "User description of the replay file"

    description: "Scenario information"

    example: {}

  PodsStatus:
@@ -1270,14 +1279,14 @@ parameters: 
    required: true

    type: "string"

    x-exportParamName: "Name"

  ScenarioInfo:

  ReplayInfo:

    in: "body"

    name: "scenarioInfo"

    description: "Scenario information"

    name: "replayInfo"

    description: "Replay information"

    required: true

    schema:

      $ref: "http://localhost:8291/meep-model.yaml#/definitions/ScenarioInfo"

    x-exportParamName: "ScenarioInfo"

      $ref: "http://localhost:8291/meep-model.yaml#/definitions/ReplayInfo"

    x-exportParamName: "ReplayInfo"

  Replay:

    name: "replay"

    in: "path"

go-apps/meep-ctrl-engine/server/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: 1.0.0

- Build date: 2020-02-18T10:34:28.127-05:00

- Build date: 2020-02-20T15:30:31.361-05:00





### Running the server

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

+5 −5
Original line number Diff line number Diff line
@@ -1012,19 +1012,17 @@ func ceCreateReplayFileFromScenarioExec(w http.ResponseWriter, r *http.Request) 
		http.Error(w, err.Error(), http.StatusBadRequest)

		return

	}

	var scenarioInfo ceModel.ScenarioInfo

	var replayInfo ceModel.ReplayInfo

	decoder := json.NewDecoder(r.Body)

	err := decoder.Decode(&scenarioInfo)

	err := decoder.Decode(&replayInfo)

	if err != nil {

		log.Error(err.Error())

		http.Error(w, err.Error(), http.StatusBadRequest)

		return

	}

	log.Debug("body: ", scenarioInfo)

	log.Debug("scenarioName: ", scenarioInfo.Name)



	var tmpMetricStore *ms.MetricStore

	tmpMetricStore, err = ms.NewMetricStore(scenarioInfo.Name, influxDBAddr, redisDBAddr)

	tmpMetricStore, err = ms.NewMetricStore(replayInfo.ScenarioName, influxDBAddr, redisDBAddr)

	if err != nil {

		log.Error("Failed creating tmp metricStore: ", err)

		return
@@ -1038,6 +1036,8 @@ func ceCreateReplayFileFromScenarioExec(w http.ResponseWriter, r *http.Request) 
	}



	var replay ceModel.Replay

	replay.Description = replayInfo.Description



	var time0 time.Time

	var nbEvents int32 = 0