Commit 4c919467 authored by Chenyu's avatar Chenyu

compiled successfully after adding Nudm_UECM

parent 2f7ee36a
...@@ -8,14 +8,14 @@ UDM = ...@@ -8,14 +8,14 @@ UDM =
INTERFACES:{ INTERFACES:{
SBI_UDM:{ SBI_UDM:{
INTERFACE_NAME = "ens32"; #interface for providing udm service INTERFACE_NAME = "eno1"; #interface for providing udm service
IPV4_ADDRESS = "192.168.2.35/24"; #address for intercafe (cidr) IPV4_ADDRESS = "192.168.199.222/24"; #address for intercafe (cidr)
PORT = 8181; #udm service port PORT = 8181; #udm service port
PPID = 60; PPID = 60;
}; };
NUDR:{ NUDR:{
INTERFACE_NAME = "ens32"; #interface for request for udr service INTERFACE_NAME = "eno1"; #interface for request for udr service
IPV4_ADDRESS = "192.168.2.35/24"; #udr address (cidr) IPV4_ADDRESS = "192.168.199.222/24"; #udr address (cidr)
PORT = 8080; #udr port PORT = 8080; #udr port
VERSION = "v2"; VERSION = "v2";
}; };
......
## udm configuration file
UDM =
{
INSTANCE_ID = 10;
PID_DIRECTORY = "/var/run";
UDM_NAME = "bupt-amf";
INTERFACES:{
SBI_UDM:{
INTERFACE_NAME = "eno1"; #interface for providing udm service
IPV4_ADDRESS = "192.168.199.222/24"; #address for intercafe (cidr)
PORT = 8181; #udm service port
PPID = 60;
};
NUDR:{
INTERFACE_NAME = "eno1"; #interface for request for udr service
IPV4_ADDRESS = "192.168.199.222/24"; #udr address (cidr)
PORT = 8080; #udr port
VERSION = "v2";
};
};
};
...@@ -32,13 +32,13 @@ void AMFRegistrationFor3GPPAccessApi::init() { ...@@ -32,13 +32,13 @@ void AMFRegistrationFor3GPPAccessApi::init() {
void AMFRegistrationFor3GPPAccessApi::setupRoutes() { void AMFRegistrationFor3GPPAccessApi::setupRoutes() {
using namespace Pistache::Rest; using namespace Pistache::Rest;
Routes::Put(*router, base + "/:ueId/registrations/amf-3gpp-access", Routes::bind(&AMFRegistrationFor3GPPAccessApi::3_gpp_registration_handler, this)); Routes::Put(*router, base + "/:ueId/registrations/amf-3gpp-access", Routes::bind(&AMFRegistrationFor3GPPAccessApi::xg_3gpp_registration_handler, this));
// Default handler, called when a route is not found // Default handler, called when a route is not found
router->addCustomHandler(Routes::bind(&AMFRegistrationFor3GPPAccessApi::amf_registration_for3_gpp_access_api_default_handler, this)); router->addCustomHandler(Routes::bind(&AMFRegistrationFor3GPPAccessApi::amf_registration_for3_gpp_access_api_default_handler, this));
} }
void AMFRegistrationFor3GPPAccessApi::3_gpp_registration_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response) { void AMFRegistrationFor3GPPAccessApi::xg_3gpp_registration_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response) {
// Getting the path params // Getting the path params
auto ueId = request.param(":ueId").as<std::string>(); auto ueId = request.param(":ueId").as<std::string>();
...@@ -48,7 +48,7 @@ void AMFRegistrationFor3GPPAccessApi::3_gpp_registration_handler(const Pistache: ...@@ -48,7 +48,7 @@ void AMFRegistrationFor3GPPAccessApi::3_gpp_registration_handler(const Pistache:
try { try {
nlohmann::json::parse(request.body()).get_to(amf3GppAccessRegistration); nlohmann::json::parse(request.body()).get_to(amf3GppAccessRegistration);
this->3_gpp_registration(ueId, amf3GppAccessRegistration, response); this->xg_3gpp_registration(ueId, amf3GppAccessRegistration, response);
} catch (nlohmann::detail::exception &e) { } catch (nlohmann::detail::exception &e) {
//send a 400 error //send a 400 error
response.send(Pistache::Http::Code::Bad_Request, e.what()); response.send(Pistache::Http::Code::Bad_Request, e.what());
......
...@@ -47,7 +47,7 @@ public: ...@@ -47,7 +47,7 @@ public:
private: private:
void setupRoutes(); void setupRoutes();
void 3_gpp_registration_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response); void xg_3gpp_registration_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response);
void amf_registration_for3_gpp_access_api_default_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response); void amf_registration_for3_gpp_access_api_default_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response);
std::shared_ptr<Pistache::Rest::Router> router; std::shared_ptr<Pistache::Rest::Router> router;
...@@ -60,7 +60,7 @@ private: ...@@ -60,7 +60,7 @@ private:
/// </remarks> /// </remarks>
/// <param name="ueId">Identifier of the UE</param> /// <param name="ueId">Identifier of the UE</param>
/// <param name="amf3GppAccessRegistration"></param> /// <param name="amf3GppAccessRegistration"></param>
virtual void 3_gpp_registration(const std::string &ueId, const Amf3GppAccessRegistration &amf3GppAccessRegistration, Pistache::Http::ResponseWriter &response) = 0; virtual void xg_3gpp_registration(const std::string &ueId, const Amf3GppAccessRegistration &amf3GppAccessRegistration, Pistache::Http::ResponseWriter &response) = 0;
}; };
......
...@@ -29,6 +29,8 @@ ...@@ -29,6 +29,8 @@
#include "SmfSelectionSubscriptionData.h" #include "SmfSelectionSubscriptionData.h"
#include <string> #include <string>
using namespace org::openapitools::server::model;
namespace oai { namespace oai {
namespace udm { namespace udm {
namespace api { namespace api {
......
...@@ -48,9 +48,9 @@ void SMFSmfRegistrationApi::get_smf_registration_handler(const Pistache::Rest::R ...@@ -48,9 +48,9 @@ void SMFSmfRegistrationApi::get_smf_registration_handler(const Pistache::Rest::R
Pistache::Optional<Snssai> singleNssai; Pistache::Optional<Snssai> singleNssai;
if(!singleNssaiQuery.isEmpty()){ if(!singleNssaiQuery.isEmpty()){
Snssai valueQuery_instance; Snssai valueQuery_instance;
if(fromStringValue(singleNssaiQuery.get(), valueQuery_instance)){ //if(fromStringValue(singleNssaiQuery.get(), valueQuery_instance)){
singleNssai = Pistache::Some(valueQuery_instance); // singleNssai = Pistache::Some(valueQuery_instance);
} //}
} }
auto dnnQuery = request.query().get("dnn"); auto dnnQuery = request.query().get("dnn");
Pistache::Optional<std::string> dnn; Pistache::Optional<std::string> dnn;
......
...@@ -32,13 +32,13 @@ void SMSFDeregistrationFor3GPPAccessApi::init() { ...@@ -32,13 +32,13 @@ void SMSFDeregistrationFor3GPPAccessApi::init() {
void SMSFDeregistrationFor3GPPAccessApi::setupRoutes() { void SMSFDeregistrationFor3GPPAccessApi::setupRoutes() {
using namespace Pistache::Rest; using namespace Pistache::Rest;
Routes::Delete(*router, base + "/:ueId/registrations/smsf-3gpp-access", Routes::bind(&SMSFDeregistrationFor3GPPAccessApi::3_gpp_smsf_deregistration_handler, this)); Routes::Delete(*router, base + "/:ueId/registrations/smsf-3gpp-access", Routes::bind(&SMSFDeregistrationFor3GPPAccessApi::_3_gpp_smsf_deregistration_handler, this));
// Default handler, called when a route is not found // Default handler, called when a route is not found
router->addCustomHandler(Routes::bind(&SMSFDeregistrationFor3GPPAccessApi::smsf_deregistration_for3_gpp_access_api_default_handler, this)); router->addCustomHandler(Routes::bind(&SMSFDeregistrationFor3GPPAccessApi::smsf_deregistration_for3_gpp_access_api_default_handler, this));
} }
void SMSFDeregistrationFor3GPPAccessApi::3_gpp_smsf_deregistration_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response) { void SMSFDeregistrationFor3GPPAccessApi::_3_gpp_smsf_deregistration_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response) {
// Getting the path params // Getting the path params
auto ueId = request.param(":ueId").as<std::string>(); auto ueId = request.param(":ueId").as<std::string>();
...@@ -53,7 +53,7 @@ void SMSFDeregistrationFor3GPPAccessApi::3_gpp_smsf_deregistration_handler(const ...@@ -53,7 +53,7 @@ void SMSFDeregistrationFor3GPPAccessApi::3_gpp_smsf_deregistration_handler(const
} }
try { try {
this->3_gpp_smsf_deregistration(ueId, smsfSetId, response); this->_3_gpp_smsf_deregistration(ueId, smsfSetId, response);
} catch (nlohmann::detail::exception &e) { } catch (nlohmann::detail::exception &e) {
//send a 400 error //send a 400 error
response.send(Pistache::Http::Code::Bad_Request, e.what()); response.send(Pistache::Http::Code::Bad_Request, e.what());
......
...@@ -46,7 +46,7 @@ public: ...@@ -46,7 +46,7 @@ public:
private: private:
void setupRoutes(); void setupRoutes();
void 3_gpp_smsf_deregistration_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response); void _3_gpp_smsf_deregistration_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response);
void smsf_deregistration_for3_gpp_access_api_default_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response); void smsf_deregistration_for3_gpp_access_api_default_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response);
std::shared_ptr<Pistache::Rest::Router> router; std::shared_ptr<Pistache::Rest::Router> router;
...@@ -59,7 +59,7 @@ private: ...@@ -59,7 +59,7 @@ private:
/// </remarks> /// </remarks>
/// <param name="ueId">Identifier of the UE</param> /// <param name="ueId">Identifier of the UE</param>
/// <param name="smsfSetId"> (optional, default to &quot;&quot;)</param> /// <param name="smsfSetId"> (optional, default to &quot;&quot;)</param>
virtual void 3_gpp_smsf_deregistration(const std::string &ueId, const Pistache::Optional<std::string> &smsfSetId, Pistache::Http::ResponseWriter &response) = 0; virtual void _3_gpp_smsf_deregistration(const std::string &ueId, const Pistache::Optional<std::string> &smsfSetId, Pistache::Http::ResponseWriter &response) = 0;
}; };
......
...@@ -32,13 +32,13 @@ void SMSFRegistrationFor3GPPAccessApi::init() { ...@@ -32,13 +32,13 @@ void SMSFRegistrationFor3GPPAccessApi::init() {
void SMSFRegistrationFor3GPPAccessApi::setupRoutes() { void SMSFRegistrationFor3GPPAccessApi::setupRoutes() {
using namespace Pistache::Rest; using namespace Pistache::Rest;
Routes::Put(*router, base + "/:ueId/registrations/smsf-3gpp-access", Routes::bind(&SMSFRegistrationFor3GPPAccessApi::3_gpp_smsf_registration_handler, this)); Routes::Put(*router, base + "/:ueId/registrations/smsf-3gpp-access", Routes::bind(&SMSFRegistrationFor3GPPAccessApi::_3_gpp_smsf_registration_handler, this));
// Default handler, called when a route is not found // Default handler, called when a route is not found
router->addCustomHandler(Routes::bind(&SMSFRegistrationFor3GPPAccessApi::smsf_registration_for3_gpp_access_api_default_handler, this)); router->addCustomHandler(Routes::bind(&SMSFRegistrationFor3GPPAccessApi::smsf_registration_for3_gpp_access_api_default_handler, this));
} }
void SMSFRegistrationFor3GPPAccessApi::3_gpp_smsf_registration_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response) { void SMSFRegistrationFor3GPPAccessApi::_3_gpp_smsf_registration_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response) {
// Getting the path params // Getting the path params
auto ueId = request.param(":ueId").as<std::string>(); auto ueId = request.param(":ueId").as<std::string>();
...@@ -48,7 +48,7 @@ void SMSFRegistrationFor3GPPAccessApi::3_gpp_smsf_registration_handler(const Pis ...@@ -48,7 +48,7 @@ void SMSFRegistrationFor3GPPAccessApi::3_gpp_smsf_registration_handler(const Pis
try { try {
nlohmann::json::parse(request.body()).get_to(smsfRegistration); nlohmann::json::parse(request.body()).get_to(smsfRegistration);
this->3_gpp_smsf_registration(ueId, smsfRegistration, response); this->_3_gpp_smsf_registration(ueId, smsfRegistration, response);
} catch (nlohmann::detail::exception &e) { } catch (nlohmann::detail::exception &e) {
//send a 400 error //send a 400 error
response.send(Pistache::Http::Code::Bad_Request, e.what()); response.send(Pistache::Http::Code::Bad_Request, e.what());
......
...@@ -47,7 +47,7 @@ public: ...@@ -47,7 +47,7 @@ public:
private: private:
void setupRoutes(); void setupRoutes();
void 3_gpp_smsf_registration_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response); void _3_gpp_smsf_registration_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response);
void smsf_registration_for3_gpp_access_api_default_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response); void smsf_registration_for3_gpp_access_api_default_handler(const Pistache::Rest::Request &request, Pistache::Http::ResponseWriter response);
std::shared_ptr<Pistache::Rest::Router> router; std::shared_ptr<Pistache::Rest::Router> router;
...@@ -60,7 +60,7 @@ private: ...@@ -60,7 +60,7 @@ private:
/// </remarks> /// </remarks>
/// <param name="ueId">Identifier of the UE</param> /// <param name="ueId">Identifier of the UE</param>
/// <param name="smsfRegistration"></param> /// <param name="smsfRegistration"></param>
virtual void 3_gpp_smsf_registration(const std::string &ueId, const SmsfRegistration &smsfRegistration, Pistache::Http::ResponseWriter &response) = 0; virtual void _3_gpp_smsf_registration(const std::string &ueId, const SmsfRegistration &smsfRegistration, Pistache::Http::ResponseWriter &response) = 0;
}; };
......
...@@ -34,6 +34,7 @@ namespace udm { ...@@ -34,6 +34,7 @@ namespace udm {
namespace api { namespace api {
using namespace oai::udm::model; using namespace oai::udm::model;
using namespace org::openapitools::server::model;
class SMSManagementSubscriptionDataRetrievalApi { class SMSManagementSubscriptionDataRetrievalApi {
public: public:
......
...@@ -34,6 +34,7 @@ namespace udm { ...@@ -34,6 +34,7 @@ namespace udm {
namespace api { namespace api {
using namespace oai::udm::model; using namespace oai::udm::model;
using namespace org::openapitools::server::model;
class SMSSubscriptionDataRetrievalApi { class SMSSubscriptionDataRetrievalApi {
public: public:
......
...@@ -35,6 +35,7 @@ namespace udm { ...@@ -35,6 +35,7 @@ namespace udm {
namespace api { namespace api {
using namespace oai::udm::model; using namespace oai::udm::model;
using namespace org::openapitools::server::model;
class SessionManagementSubscriptionDataRetrievalApi { class SessionManagementSubscriptionDataRetrievalApi {
public: public:
......
...@@ -19,7 +19,7 @@ namespace udm { ...@@ -19,7 +19,7 @@ namespace udm {
namespace api { namespace api {
using namespace org::openapitools::server::helpers; using namespace org::openapitools::server::helpers;
using namespace oai::udm::model; //using namespace oai::udm::model;
SubscriptionDeletionApi::SubscriptionDeletionApi( SubscriptionDeletionApi::SubscriptionDeletionApi(
std::shared_ptr<Pistache::Rest::Router> rtr) { std::shared_ptr<Pistache::Rest::Router> rtr) {
......
...@@ -31,7 +31,7 @@ namespace oai { ...@@ -31,7 +31,7 @@ namespace oai {
namespace udm { namespace udm {
namespace api { namespace api {
using namespace oai::udm::model; //using namespace oai::udm::model;
class SubscriptionDeletionApi { class SubscriptionDeletionApi {
public: public:
......
...@@ -19,7 +19,7 @@ namespace udm { ...@@ -19,7 +19,7 @@ namespace udm {
namespace api { namespace api {
using namespace org::openapitools::server::helpers; using namespace org::openapitools::server::helpers;
using namespace oai::udm::model; //using namespace oai::udm::model;
SubscriptionDeletionForSharedDataApi::SubscriptionDeletionForSharedDataApi( SubscriptionDeletionForSharedDataApi::SubscriptionDeletionForSharedDataApi(
std::shared_ptr<Pistache::Rest::Router> rtr) { std::shared_ptr<Pistache::Rest::Router> rtr) {
......
...@@ -31,7 +31,7 @@ namespace oai { ...@@ -31,7 +31,7 @@ namespace oai {
namespace udm { namespace udm {
namespace api { namespace api {
using namespace oai::udm::model; //using namespace oai::udm::model;
class SubscriptionDeletionForSharedDataApi { class SubscriptionDeletionForSharedDataApi {
public: public:
......
...@@ -29,6 +29,8 @@ ...@@ -29,6 +29,8 @@
#include "TraceDataResponse.h" #include "TraceDataResponse.h"
#include <string> #include <string>
using namespace org::openapitools::server::model;
namespace oai { namespace oai {
namespace udm { namespace udm {
namespace api { namespace api {
......
...@@ -55,17 +55,17 @@ void UECMRegistrationInfoRetrievalApi::get_registrations_handler(const Pistache: ...@@ -55,17 +55,17 @@ void UECMRegistrationInfoRetrievalApi::get_registrations_handler(const Pistache:
Pistache::Optional<std::vector<RegistrationDataSetName>> registrationDatasetNames; Pistache::Optional<std::vector<RegistrationDataSetName>> registrationDatasetNames;
if(!registrationDatasetNamesQuery.isEmpty()){ if(!registrationDatasetNamesQuery.isEmpty()){
std::vector<RegistrationDataSetName> valueQuery_instance; std::vector<RegistrationDataSetName> valueQuery_instance;
if(fromStringValue(registrationDatasetNamesQuery.get(), valueQuery_instance)){ //if(fromStringValue(registrationDatasetNamesQuery.get(), valueQuery_instance)){
registrationDatasetNames = Pistache::Some(valueQuery_instance); // registrationDatasetNames = Pistache::Some(valueQuery_instance);
} //}
} }
auto singleNssaiQuery = request.query().get("single-nssai"); auto singleNssaiQuery = request.query().get("single-nssai");
Pistache::Optional<Snssai> singleNssai; Pistache::Optional<Snssai> singleNssai;
if(!singleNssaiQuery.isEmpty()){ if(!singleNssaiQuery.isEmpty()){
Snssai valueQuery_instance; Snssai valueQuery_instance;
if(fromStringValue(singleNssaiQuery.get(), valueQuery_instance)){ //if(fromStringValue(singleNssaiQuery.get(), valueQuery_instance)){
singleNssai = Pistache::Some(valueQuery_instance); // singleNssai = Pistache::Some(valueQuery_instance);
} //}
} }
auto dnnQuery = request.query().get("dnn"); auto dnnQuery = request.query().get("dnn");
Pistache::Optional<std::string> dnn; Pistache::Optional<std::string> dnn;
...@@ -77,7 +77,7 @@ void UECMRegistrationInfoRetrievalApi::get_registrations_handler(const Pistache: ...@@ -77,7 +77,7 @@ void UECMRegistrationInfoRetrievalApi::get_registrations_handler(const Pistache:
} }
try { try {
this->get_registrations(ueId, registrationDatasetNames, supportedFeatures, singleNssai, dnn, response); //this->get_registrations(ueId, registrationDatasetNames, supportedFeatures, singleNssai, dnn, response);
} catch (nlohmann::detail::exception &e) { } catch (nlohmann::detail::exception &e) {
//send a 400 error //send a 400 error
response.send(Pistache::Http::Code::Bad_Request, e.what()); response.send(Pistache::Http::Code::Bad_Request, e.what());
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#include "ProblemDetails.h" #include "ProblemDetails.h"
#include "RegistrationDataSetName.h" #include "RegistrationDataSetName.h"
#include "RegistrationDataSets.h" #include "RegistrationDataSets.h"
#include "Set.h" //#include "Set.h"
#include "Snssai.h" #include "Snssai.h"
#include <string> #include <string>
...@@ -66,7 +66,7 @@ private: ...@@ -66,7 +66,7 @@ private:
/// <param name="supportedFeatures"> (optional, default to &quot;&quot;)</param> /// <param name="supportedFeatures"> (optional, default to &quot;&quot;)</param>
/// <param name="singleNssai"> (optional, default to Snssai())</param> /// <param name="singleNssai"> (optional, default to Snssai())</param>
/// <param name="dnn"> (optional, default to &quot;&quot;)</param> /// <param name="dnn"> (optional, default to &quot;&quot;)</param>
virtual void get_registrations(const std::string &ueId, const Pistache::Optional<Set<RegistrationDataSetName>> &registrationDatasetNames, const Pistache::Optional<std::string> &supportedFeatures, const Pistache::Optional<Snssai> &singleNssai, const Pistache::Optional<std::string> &dnn, Pistache::Http::ResponseWriter &response) = 0; //virtual void get_registrations(const std::string &ueId, const Pistache::Optional<Set<RegistrationDataSetName>> &registrationDatasetNames, const Pistache::Optional<std::string> &supportedFeatures, const Pistache::Optional<Snssai> &singleNssai, const Pistache::Optional<std::string> &dnn, Pistache::Http::ResponseWriter &response) = 0;
}; };
......
...@@ -23,7 +23,7 @@ AMFRegistrationFor3GPPAccessApiImpl::AMFRegistrationFor3GPPAccessApiImpl(std::sh ...@@ -23,7 +23,7 @@ AMFRegistrationFor3GPPAccessApiImpl::AMFRegistrationFor3GPPAccessApiImpl(std::sh
: AMFRegistrationFor3GPPAccessApi(rtr) : AMFRegistrationFor3GPPAccessApi(rtr)
{ } { }
void AMFRegistrationFor3GPPAccessApiImpl::3_gpp_registration(const std::string &ueId, const Amf3GppAccessRegistration &amf3GppAccessRegistration, Pistache::Http::ResponseWriter &response) { void AMFRegistrationFor3GPPAccessApiImpl::_3_gpp_registration(const std::string &ueId, const Amf3GppAccessRegistration &amf3GppAccessRegistration, Pistache::Http::ResponseWriter &response) {
response.send(Pistache::Http::Code::Ok, "Do some magic\n"); response.send(Pistache::Http::Code::Ok, "Do some magic\n");
} }
......
...@@ -45,7 +45,7 @@ public: ...@@ -45,7 +45,7 @@ public:
AMFRegistrationFor3GPPAccessApiImpl(std::shared_ptr<Pistache::Rest::Router>); AMFRegistrationFor3GPPAccessApiImpl(std::shared_ptr<Pistache::Rest::Router>);
~AMFRegistrationFor3GPPAccessApiImpl() {} ~AMFRegistrationFor3GPPAccessApiImpl() {}
void 3_gpp_registration(const std::string &ueId, const Amf3GppAccessRegistration &amf3GppAccessRegistration, Pistache::Http::ResponseWriter &response); void _3_gpp_registration(const std::string &ueId, const Amf3GppAccessRegistration &amf3GppAccessRegistration, Pistache::Http::ResponseWriter &response);
}; };
...@@ -56,4 +56,4 @@ public: ...@@ -56,4 +56,4 @@ public:
#endif #endif
\ No newline at end of file
...@@ -15,12 +15,12 @@ ...@@ -15,12 +15,12 @@
using namespace config; using namespace config;
extern udm_config udm_cfg; extern udm_config udm_cfg;
using namespace org::openapitools::server::model;
namespace oai { namespace oai {
namespace udm { namespace udm {
namespace api { namespace api {
using namespace oai::udm::model; //using namespace oai::udm::model;
ConfirmAuthApiImpl::ConfirmAuthApiImpl( ConfirmAuthApiImpl::ConfirmAuthApiImpl(
std::shared_ptr<Pistache::Rest::Router> rtr) std::shared_ptr<Pistache::Rest::Router> rtr)
......
...@@ -15,12 +15,12 @@ ...@@ -15,12 +15,12 @@
using namespace config; using namespace config;
extern udm_config udm_cfg; extern udm_config udm_cfg;
using namespace org::openapitools::server::model;
namespace oai { namespace oai {
namespace udm { namespace udm {
namespace api { namespace api {
using namespace oai::udm::model; //using namespace oai::udm::model;
DeleteAuthApiImpl::DeleteAuthApiImpl( DeleteAuthApiImpl::DeleteAuthApiImpl(
std::shared_ptr<Pistache::Rest::Router> rtr) std::shared_ptr<Pistache::Rest::Router> rtr)
......
...@@ -19,12 +19,12 @@ ...@@ -19,12 +19,12 @@
using namespace config; using namespace config;
extern udm_config udm_cfg; extern udm_config udm_cfg;
using namespace org::openapitools::server::model;
namespace oai { namespace oai {
namespace udm { namespace udm {
namespace api { namespace api {
using namespace oai::udm::model; //using namespace oai::udm::model;
GenerateAuthDataApiImpl::GenerateAuthDataApiImpl( GenerateAuthDataApiImpl::GenerateAuthDataApiImpl(
std::shared_ptr<Pistache::Rest::Router> rtr) std::shared_ptr<Pistache::Rest::Router> rtr)
......
...@@ -23,7 +23,7 @@ SMSFDeregistrationFor3GPPAccessApiImpl::SMSFDeregistrationFor3GPPAccessApiImpl(s ...@@ -23,7 +23,7 @@ SMSFDeregistrationFor3GPPAccessApiImpl::SMSFDeregistrationFor3GPPAccessApiImpl(s
: SMSFDeregistrationFor3GPPAccessApi(rtr) : SMSFDeregistrationFor3GPPAccessApi(rtr)
{ } { }
void SMSFDeregistrationFor3GPPAccessApiImpl::3_gpp_smsf_deregistration(const std::string &ueId, const Pistache::Optional<std::string> &smsfSetId, Pistache::Http::ResponseWriter &response) { void SMSFDeregistrationFor3GPPAccessApiImpl::_3_gpp_smsf_deregistration(const std::string &ueId, const Pistache::Optional<std::string> &smsfSetId, Pistache::Http::ResponseWriter &response) {
response.send(Pistache::Http::Code::Ok, "Do some magic\n"); response.send(Pistache::Http::Code::Ok, "Do some magic\n");
} }
......
...@@ -44,7 +44,7 @@ public: ...@@ -44,7 +44,7 @@ public:
SMSFDeregistrationFor3GPPAccessApiImpl(std::shared_ptr<Pistache::Rest::Router>); SMSFDeregistrationFor3GPPAccessApiImpl(std::shared_ptr<Pistache::Rest::Router>);
~SMSFDeregistrationFor3GPPAccessApiImpl() {} ~SMSFDeregistrationFor3GPPAccessApiImpl() {}
void 3_gpp_smsf_deregistration(const std::string &ueId, const Pistache::Optional<std::string> &smsfSetId, Pistache::Http::ResponseWriter &response); void _3_gpp_smsf_deregistration(const std::string &ueId, const Pistache::Optional<std::string> &smsfSetId, Pistache::Http::ResponseWriter &response);
}; };
...@@ -55,4 +55,4 @@ public: ...@@ -55,4 +55,4 @@ public:
#endif #endif
\ No newline at end of file
...@@ -23,7 +23,7 @@ SMSFRegistrationFor3GPPAccessApiImpl::SMSFRegistrationFor3GPPAccessApiImpl(std:: ...@@ -23,7 +23,7 @@ SMSFRegistrationFor3GPPAccessApiImpl::SMSFRegistrationFor3GPPAccessApiImpl(std::
: SMSFRegistrationFor3GPPAccessApi(rtr) : SMSFRegistrationFor3GPPAccessApi(rtr)
{ } { }
void SMSFRegistrationFor3GPPAccessApiImpl::3_gpp_smsf_registration(const std::string &ueId, const SmsfRegistration &smsfRegistration, Pistache::Http::ResponseWriter &response) { void SMSFRegistrationFor3GPPAccessApiImpl::_3_gpp_smsf_registration(const std::string &ueId, const SmsfRegistration &smsfRegistration, Pistache::Http::ResponseWriter &response) {
response.send(Pistache::Http::Code::Ok, "Do some magic\n"); response.send(Pistache::Http::Code::Ok, "Do some magic\n");
} }
......
...@@ -45,7 +45,7 @@ public: ...@@ -45,7 +45,7 @@ public:
SMSFRegistrationFor3GPPAccessApiImpl(std::shared_ptr<Pistache::Rest::Router>); SMSFRegistrationFor3GPPAccessApiImpl(std::shared_ptr<Pistache::Rest::Router>);
~SMSFRegistrationFor3GPPAccessApiImpl() {} ~SMSFRegistrationFor3GPPAccessApiImpl() {}
void 3_gpp_smsf_registration(const std::string &ueId, const SmsfRegistration &smsfRegistration, Pistache::Http::ResponseWriter &response); void _3_gpp_smsf_registration(const std::string &ueId, const SmsfRegistration &smsfRegistration, Pistache::Http::ResponseWriter &response);
}; };
...@@ -56,4 +56,4 @@ public: ...@@ -56,4 +56,4 @@ public:
#endif #endif
\ No newline at end of file
...@@ -17,7 +17,7 @@ namespace oai { ...@@ -17,7 +17,7 @@ namespace oai {
namespace udm { namespace udm {
namespace api { namespace api {
using namespace oai::udm::model; //using namespace oai::udm::model;
SubscriptionDeletionApiImpl::SubscriptionDeletionApiImpl( SubscriptionDeletionApiImpl::SubscriptionDeletionApiImpl(
std::shared_ptr<Pistache::Rest::Router> rtr) std::shared_ptr<Pistache::Rest::Router> rtr)
......
...@@ -36,7 +36,7 @@ namespace oai { ...@@ -36,7 +36,7 @@ namespace oai {
namespace udm { namespace udm {
namespace api { namespace api {
using namespace oai::udm::model; //using namespace oai::udm::model;
class SubscriptionDeletionApiImpl class SubscriptionDeletionApiImpl
: public oai::udm::api::SubscriptionDeletionApi { : public oai::udm::api::SubscriptionDeletionApi {
...@@ -52,4 +52,4 @@ public: ...@@ -52,4 +52,4 @@ public:
} // namespace udm } // namespace udm
} // namespace oai } // namespace oai
#endif #endif
\ No newline at end of file
...@@ -17,7 +17,7 @@ namespace oai { ...@@ -17,7 +17,7 @@ namespace oai {
namespace udm { namespace udm {
namespace api { namespace api {
using namespace oai::udm::model; //using namespace oai::udm::model;
SubscriptionDeletionForSharedDataApiImpl:: SubscriptionDeletionForSharedDataApiImpl::
SubscriptionDeletionForSharedDataApiImpl( SubscriptionDeletionForSharedDataApiImpl(
......
...@@ -36,7 +36,7 @@ namespace oai { ...@@ -36,7 +36,7 @@ namespace oai {
namespace udm { namespace udm {
namespace api { namespace api {
using namespace oai::udm::model; //using namespace oai::udm::model;
class SubscriptionDeletionForSharedDataApiImpl class SubscriptionDeletionForSharedDataApiImpl
: public oai::udm::api::SubscriptionDeletionForSharedDataApi { : public oai::udm::api::SubscriptionDeletionForSharedDataApi {
...@@ -53,4 +53,4 @@ public: ...@@ -53,4 +53,4 @@ public:
} // namespace udm } // namespace udm
} // namespace oai } // namespace oai
#endif #endif
\ No newline at end of file
...@@ -23,9 +23,9 @@ UECMRegistrationInfoRetrievalApiImpl::UECMRegistrationInfoRetrievalApiImpl(std:: ...@@ -23,9 +23,9 @@ UECMRegistrationInfoRetrievalApiImpl::UECMRegistrationInfoRetrievalApiImpl(std::
: UECMRegistrationInfoRetrievalApi(rtr) : UECMRegistrationInfoRetrievalApi(rtr)
{ } { }
void UECMRegistrationInfoRetrievalApiImpl::get_registrations(const std::string &ueId, const Pistache::Optional<Set<RegistrationDataSetName>> &registrationDatasetNames, const Pistache::Optional<std::string> &supportedFeatures, const Pistache::Optional<Snssai> &singleNssai, const Pistache::Optional<std::string> &dnn, Pistache::Http::ResponseWriter &response) { //void UECMRegistrationInfoRetrievalApiImpl::get_registrations(const std::string &ueId, const Pistache::Optional<Set<RegistrationDataSetName>> &registrationDatasetNames, const Pistache::Optional<std::string> &supportedFeatures, const Pistache::Optional<Snssai> &singleNssai, const Pistache::Optional<std::string> &dnn, Pistache::Http::ResponseWriter &response) {
response.send(Pistache::Http::Code::Ok, "Do some magic\n"); // response.send(Pistache::Http::Code::Ok, "Do some magic\n");
} //}
} }
} }
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#include "ProblemDetails.h" #include "ProblemDetails.h"
#include "RegistrationDataSetName.h" #include "RegistrationDataSetName.h"
#include "RegistrationDataSets.h" #include "RegistrationDataSets.h"
#include "Set.h" //#include "Set.h"
#include "Snssai.h" #include "Snssai.h"
#include <string> #include <string>
...@@ -48,7 +48,7 @@ public: ...@@ -48,7 +48,7 @@ public:
UECMRegistrationInfoRetrievalApiImpl(std::shared_ptr<Pistache::Rest::Router>); UECMRegistrationInfoRetrievalApiImpl(std::shared_ptr<Pistache::Rest::Router>);
~UECMRegistrationInfoRetrievalApiImpl() {} ~UECMRegistrationInfoRetrievalApiImpl() {}
void get_registrations(const std::string &ueId, const Pistache::Optional<Set<RegistrationDataSetName>> &registrationDatasetNames, const Pistache::Optional<std::string> &supportedFeatures, const Pistache::Optional<Snssai> &singleNssai, const Pistache::Optional<std::string> &dnn, Pistache::Http::ResponseWriter &response); //void get_registrations(const std::string &ueId, const Pistache::Optional<Set<RegistrationDataSetName>> &registrationDatasetNames, const Pistache::Optional<std::string> &supportedFeatures, const Pistache::Optional<Snssai> &singleNssai, const Pistache::Optional<std::string> &dnn, Pistache::Http::ResponseWriter &response);
}; };
...@@ -59,4 +59,4 @@ public: ...@@ -59,4 +59,4 @@ public:
#endif #endif
\ No newline at end of file
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include "ResynchronizationInfo.h" #include "ResynchronizationInfo.h"
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>
#include <string> #include <string>
using namespace org::openapitools::server::model;
namespace oai { namespace oai {
namespace udm { namespace udm {
namespace model { namespace model {
......
...@@ -24,6 +24,8 @@ ...@@ -24,6 +24,8 @@
#include <string> #include <string>
#include <vector> #include <vector>
using namespace org::openapitools::server::model;
namespace oai { namespace oai {
namespace udm { namespace udm {
namespace model { namespace model {
......
...@@ -23,6 +23,8 @@ ...@@ -23,6 +23,8 @@
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>
#include <string> #include <string>
using namespace org::openapitools::server::model;
namespace oai { namespace oai {
namespace udm { namespace udm {
namespace model { namespace model {
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include "PlmnId.h" #include "PlmnId.h"
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>
#include <string> #include <string>
using namespace org::openapitools::server::model;
namespace oai { namespace oai {
namespace udm { namespace udm {
namespace model { namespace model {
......
...@@ -26,6 +26,8 @@ ...@@ -26,6 +26,8 @@
#include <string> #include <string>
#include <vector> #include <vector>
using namespace org::openapitools::server::model;
namespace oai { namespace oai {
namespace udm { namespace udm {
namespace model { namespace model {
......
...@@ -28,6 +28,8 @@ ...@@ -28,6 +28,8 @@
#include <string> #include <string>
#include <vector> #include <vector>
using namespace org::openapitools::server::model;
namespace oai { namespace oai {
namespace udm { namespace udm {
namespace model { namespace model {
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include "PlmnId.h" #include "PlmnId.h"
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>
#include <string> #include <string>
using namespace org::openapitools::server::model;
namespace oai { namespace oai {
namespace udm { namespace udm {
namespace model { namespace model {
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include "PlmnId.h" #include "PlmnId.h"
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>
#include <vector> #include <vector>
using namespace org::openapitools::server::model;
namespace oai { namespace oai {
namespace udm { namespace udm {
namespace model { namespace model {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment