From: is005q <idan.shalom@intl.att.com>
Date: Mon, 30 Dec 2019 12:04:50 +0000 (+0200)
Subject: Update RoutingManagerSimulator according to latest RM Swagger
X-Git-Tag: R5_RC~137^2
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F23%2F2123%2F1;p=ric-plt%2Fe2mgr.git

Update RoutingManagerSimulator according to latest RM Swagger

Change-Id: If4308ae55068b9575315c6bf224fcc579cbc5790
Signed-off-by: is005q <idan.shalom@intl.att.com>
---

diff --git a/E2Manager/resources/configuration.yaml b/E2Manager/resources/configuration.yaml
index f10d275..0914b88 100644
--- a/E2Manager/resources/configuration.yaml
+++ b/E2Manager/resources/configuration.yaml
@@ -6,7 +6,7 @@ rmr:
   port: 3801
   maxMsgSize: 65536
 routingManager:
-  baseUrl: http://10.0.2.15:12020/ric/v1/handles/v1/
+  baseUrl: http://10.0.2.15:12020/ric/v1/handles/
 notificationResponseBuffer: 100
 bigRedButtonTimeoutSec: 5
 maxConnectionAttempts: 3
diff --git a/tools/RoutingManagerSimulator/api/swagger.yaml b/tools/RoutingManagerSimulator/api/swagger.yaml
index db343d7..2510d78 100755
--- a/tools/RoutingManagerSimulator/api/swagger.yaml
+++ b/tools/RoutingManagerSimulator/api/swagger.yaml
@@ -158,7 +158,7 @@ paths:
           description: "Xapp list received"
         "400":
           description: "Invalid data"
-  /handles/v1/e2t:
+  /handles/e2t:
     post:
       tags:
       - "handle"
@@ -213,7 +213,7 @@ paths:
           description: "new e2t instance is considered and platform routes are established"
         "400":
           description: "Invalid data"
-  /handles/v1/associate-ran-to-e2t:
+  /handles/associate-ran-to-e2t:
     post:
       tags:
       - "handle"
@@ -239,7 +239,7 @@ paths:
           description: "e2t ran mapping recieved, platform routes"
         "400":
           description: "Invalid data"
-  /handles/v1/dissociate-ran:
+  /handles/dissociate-ran:
     post:
       tags:
       - "handle"
diff --git a/tools/RoutingManagerSimulator/go/README.md b/tools/RoutingManagerSimulator/go/README.md
new file mode 100755
index 0000000..f146cbf
--- /dev/null
+++ b/tools/RoutingManagerSimulator/go/README.md
@@ -0,0 +1,25 @@
+# Go API Server for swagger
+
+This is the Swagger/OpenAPI 2.0 definition of Routing Manager's Northbound API.
+
+## Overview
+This server was generated by the [swagger-codegen]
+(https://github.com/swagger-api/swagger-codegen) project.  
+By using the [OpenAPI-Spec](https://github.com/OAI/OpenAPI-Specification) from a remote server, you can easily generate a server stub.  
+-
+
+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.4.0
+- Build date: 2019-12-30T10:52:31.803Z
+
+
+### Running the server
+To run the server, follow these simple steps:
+
+```
+go run main.go
+```
+
diff --git a/tools/RoutingManagerSimulator/go/routers.go b/tools/RoutingManagerSimulator/go/routers.go
index 6c34230..d37b9ae 100755
--- a/tools/RoutingManagerSimulator/go/routers.go
+++ b/tools/RoutingManagerSimulator/go/routers.go
@@ -77,21 +77,21 @@ var routes = Routes{
 	Route{
 		"AssociateRanToE2tHandle",
 		strings.ToUpper("Post"),
-		"/ric/v1/handles/v1/associate-ran-to-e2t",
+		"/ric/v1/handles/associate-ran-to-e2t",
 		AssociateRanToE2tHandle,
 	},
 
 	Route{
 		"CreateNewE2tHandle",
 		strings.ToUpper("Post"),
-		"/ric/v1/handles/v1/e2t",
+		"/ric/v1/handles/e2t",
 		CreateNewE2tHandle,
 	},
 
 	Route{
 		"DeleteE2tHandle",
 		strings.ToUpper("Delete"),
-		"/ric/v1/handles/v1/e2t",
+		"/ric/v1/handles/e2t",
 		DeleteE2tHandle,
 	},
 
@@ -105,7 +105,7 @@ var routes = Routes{
 	Route{
 		"DissociateRan",
 		strings.ToUpper("Post"),
-		"/ric/v1/handles/v1/dissociate-ran",
+		"/ric/v1/handles/dissociate-ran",
 		DissociateRan,
 	},