Commit fc30a80f authored by Simon Pastor's avatar Simon Pastor
Browse files

commit comments addressed

parent a367ff18

go-apps/meep-loc-serv/server/README.md

+0 −4
Original line number Diff line number Diff line
@@ -13,11 +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.1.1

<<<<<<< HEAD

- Build date: 2020-08-07T09:19:36.498-04:00

=======

- Build date: 2020-08-17T09:50:46.396-04:00

>>>>>>> 767f428... new poa_wifi and poa_5G, renaming cellpoa to poa_4G





### Running the server

go-packages/meep-data-model/docs/PoaWlanConfig.md

deleted100644 → 0
+0 −10
Original line number Diff line number Diff line 
# PoaWlanConfig



## Properties

Name | Type | Description | Notes

------------ | ------------- | ------------- | -------------

**CellId** | **string** | TBD | [optional] [default to null]



[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)

go-packages/meep-data-model/model_poa_wlan_config.go

deleted100644 → 0
+0 −30
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2020  InterDigital Communications, Inc

 *

 * Licensed under the Apache License, Version 2.0 (the \"License\");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 * http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an \"AS IS\" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 *

 * MEEP Model

 *

 * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)

 *

 * API version: 1.0.0

 * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)

 */



package model



// WLAN POA configuration information

type PoaWlanConfig struct {

	// TBD

	CellId string `json:"cellId,omitempty"`

}

go-packages/meep-model/model.go

+15 −16
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ const ( 
	NodeTypeOperatorCell = "OPERATOR-CELLULAR"

	NodeTypeZone         = "ZONE"

	NodeTypePoa          = "POA"

	NodeTypePoaCellularDeprecated = "POA-CELLULAR"

	NodeTypePoa4G        = "POA-4G"

	NodeTypePoa5G        = "POA-5G"

	NodeTypePoaWifi      = "POA-WIFI"

go-packages/meep-model/validator.go

+14 −9
Original line number Diff line number Diff line
@@ -33,14 +33,19 @@ const ( 
	ValidatorStatusError   = "SCENARIO-ERROR"

)



// Deprecated model element values

const (

	NodeTypePoaCellularDeprecated = "POA-CELLULAR"

)



// Current validator version

var ValidatorVersion = semver.Version{Major: 1, Minor: 6, Patch: 0}

var ValidatorVersion = semver.Version{Major: 1, Minor: 5, Patch: 1}



// Versions requiring scenario update

var Version130 = semver.Version{Major: 1, Minor: 3, Patch: 0}

var Version140 = semver.Version{Major: 1, Minor: 4, Patch: 0}

var Version150 = semver.Version{Major: 1, Minor: 5, Patch: 0}

var Version160 = semver.Version{Major: 1, Minor: 6, Patch: 0}

var Version151 = semver.Version{Major: 1, Minor: 5, Patch: 1}



// Default latency distribution

const DEFAULT_LATENCY_DISTRIBUTION = "Normal"
@@ -105,10 +110,10 @@ func ValidateScenario(jsonScenario []byte) (validJsonScenario []byte, status str 
		upgradeScenarioTo150(scenario)

		scenarioVersion = Version150

	}

	// UPGRADE TO 1.6.0

	if scenarioVersion.LT(Version160) {

		upgradeScenarioTo160(scenario)

		scenarioVersion = Version160

	// UPGRADE TO 1.5.1

	if scenarioVersion.LT(Version151) {

		upgradeScenarioTo151(scenario)

		scenarioVersion = Version151

	}



	// Set current scenario version
@@ -284,12 +289,12 @@ func upgradeScenarioTo150(scenario *dataModel.Scenario) { 
	}

}



func upgradeScenarioTo160(scenario *dataModel.Scenario) {

	//changes in 160 vs 150

func upgradeScenarioTo151(scenario *dataModel.Scenario) {

	//changes in 160 (151 for now) vs 150

	//rename POA-CELLULAR to POA-4G



	// Set updated version

	scenario.Version = Version160.String()

	scenario.Version = Version151.String()



	// Migrate netchar information

	if scenario.Deployment != nil {