Get API version for NsmfEventExposure

src/api-server/api/IndividualSubscriptionDocumentApi.cpp

@@ -12,6 +12,9 @@
 
 #include "IndividualSubscriptionDocumentApi.h"
 #include "Helpers.h"
+#include "smf_config.hpp"
+
+extern smf::smf_config smf_cfg;
 
 namespace oai {
 namespace smf_server {
@@ -31,9 +34,9 @@ void IndividualSubscriptionDocumentApi::init() {
 void IndividualSubscriptionDocumentApi::setupRoutes() {
     using namespace Pistache::Rest;
 
-    Routes::Delete(*router, base + "/subscriptions/:subId", Routes::bind(&IndividualSubscriptionDocumentApi::delete_individual_subcription_handler, this));
-    Routes::Get(*router, base + "/subscriptions/:subId", Routes::bind(&IndividualSubscriptionDocumentApi::get_individual_subcription_handler, this));
-    Routes::Put(*router, base + "/subscriptions/:subId", Routes::bind(&IndividualSubscriptionDocumentApi::replace_individual_subcription_handler, this));
+    Routes::Delete(*router, base + smf_cfg.sbi_api_version +  "/subscriptions/:subId", Routes::bind(&IndividualSubscriptionDocumentApi::delete_individual_subcription_handler, this));
+    Routes::Get(*router, base + smf_cfg.sbi_api_version +  "/subscriptions/:subId", Routes::bind(&IndividualSubscriptionDocumentApi::get_individual_subcription_handler, this));
+    Routes::Put(*router, base + smf_cfg.sbi_api_version +  "/subscriptions/:subId", Routes::bind(&IndividualSubscriptionDocumentApi::replace_individual_subcription_handler, this));
 
     // Default handler, called when a route is not found
     router->addCustomHandler(Routes::bind(&IndividualSubscriptionDocumentApi::individual_subscription_document_api_default_handler, this));

src/api-server/api/IndividualSubscriptionDocumentApi.h

@@ -41,7 +41,7 @@ public:
     virtual ~IndividualSubscriptionDocumentApi() {}
     void init();
 
-    const std::string base = "/nsmf_event-exposure/v1";
+    const std::string base = "/nsmf_event-exposure/";
 
 private:
     void setupRoutes();

src/api-server/api/SubscriptionsCollectionApi.cpp

@@ -12,6 +12,9 @@
 
 #include "SubscriptionsCollectionApi.h"
 #include "Helpers.h"
+#include "smf_config.hpp"
+
+extern smf::smf_config smf_cfg;
 
 namespace oai {
 namespace smf_server {
@@ -31,7 +34,7 @@ void SubscriptionsCollectionApi::init() {
 void SubscriptionsCollectionApi::setupRoutes() {
     using namespace Pistache::Rest;
 
-    Routes::Post(*router, base + "/subscriptions", Routes::bind(&SubscriptionsCollectionApi::create_individual_subcription_handler, this));
+    Routes::Post(*router, base + smf_cfg.sbi_api_version +  "/subscriptions", Routes::bind(&SubscriptionsCollectionApi::create_individual_subcription_handler, this));
 
     // Default handler, called when a route is not found
     router->addCustomHandler(Routes::bind(&SubscriptionsCollectionApi::subscriptions_collection_api_default_handler, this));

src/api-server/api/SubscriptionsCollectionApi.h

@@ -40,7 +40,7 @@ public:
     virtual ~SubscriptionsCollectionApi() {}
     void init();
 
-    const std::string base = "/nsmf_event-exposure/v1";
+    const std::string base = "/nsmf_event-exposure/";
 
 private:
     void setupRoutes();