compiled successfully after adding Nudm_UECM

etc/udm.conf

@@ -8,14 +8,14 @@ UDM =
 
   INTERFACES:{
     SBI_UDM:{
-        INTERFACE_NAME = "ens32";               #interface for providing udm service
-        IPV4_ADDRESS   = "192.168.2.35/24";   #address for intercafe (cidr)
+        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 = "ens32";               #interface for request for udr service
-        IPV4_ADDRESS   = "192.168.2.35/24";  #udr address (cidr)
+        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"; 
     };

etc/udm.conf.222

+## 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"; 
+    };
+  };
+
+};
+
+

src/api/AMFRegistrationFor3GPPAccessApi.cpp

@@ -32,13 +32,13 @@ void AMFRegistrationFor3GPPAccessApi::init() {
 void AMFRegistrationFor3GPPAccessApi::setupRoutes() {
     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
     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
     auto ueId = request.param(":ueId").as<std::string>();
     
@@ -48,7 +48,7 @@ void AMFRegistrationFor3GPPAccessApi::3_gpp_registration_handler(const Pistache:
     
     try {
       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) {
         //send a 400 error
         response.send(Pistache::Http::Code::Bad_Request, e.what());

src/api/AMFRegistrationFor3GPPAccessApi.h

@@ -47,7 +47,7 @@ public:
 private:
     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);
 
     std::shared_ptr<Pistache::Rest::Router> router;
@@ -60,7 +60,7 @@ private:
     /// </remarks>
     /// <param name="ueId">Identifier of the UE</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;
 
 };
 

src/api/SMFSelectionSubscriptionDataRetrievalApi.h

@@ -29,6 +29,8 @@
 #include "SmfSelectionSubscriptionData.h"
 #include <string>
 
+using namespace org::openapitools::server::model;
+
 namespace oai {
 namespace udm {
 namespace api {

src/api/SMFSmfRegistrationApi.cpp

@@ -48,9 +48,9 @@ void SMFSmfRegistrationApi::get_smf_registration_handler(const Pistache::Rest::R
     Pistache::Optional<Snssai> singleNssai;
     if(!singleNssaiQuery.isEmpty()){
         Snssai valueQuery_instance;
-        if(fromStringValue(singleNssaiQuery.get(), valueQuery_instance)){
-            singleNssai = Pistache::Some(valueQuery_instance);
-        }
+        //if(fromStringValue(singleNssaiQuery.get(), valueQuery_instance)){
+        //    singleNssai = Pistache::Some(valueQuery_instance);
+        //}
     }
     auto dnnQuery = request.query().get("dnn");
     Pistache::Optional<std::string> dnn;

src/api/SMSFDeregistrationFor3GPPAccessApi.cpp

@@ -32,13 +32,13 @@ void SMSFDeregistrationFor3GPPAccessApi::init() {
 void SMSFDeregistrationFor3GPPAccessApi::setupRoutes() {
     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
     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
     auto ueId = request.param(":ueId").as<std::string>();
     
@@ -53,7 +53,7 @@ void SMSFDeregistrationFor3GPPAccessApi::3_gpp_smsf_deregistration_handler(const
     }
     
     try {
-      this->3_gpp_smsf_deregistration(ueId, smsfSetId, response);
+      this->_3_gpp_smsf_deregistration(ueId, smsfSetId, response);
     } catch (nlohmann::detail::exception &e) {
         //send a 400 error
         response.send(Pistache::Http::Code::Bad_Request, e.what());

src/api/SMSFDeregistrationFor3GPPAccessApi.h

@@ -46,7 +46,7 @@ public:
 private:
     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);
 
     std::shared_ptr<Pistache::Rest::Router> router;
@@ -59,7 +59,7 @@ private:
     /// </remarks>
     /// <param name="ueId">Identifier of the UE</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;
 
 };
 

src/api/SMSFRegistrationFor3GPPAccessApi.cpp

@@ -32,13 +32,13 @@ void SMSFRegistrationFor3GPPAccessApi::init() {
 void SMSFRegistrationFor3GPPAccessApi::setupRoutes() {
     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
     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
     auto ueId = request.param(":ueId").as<std::string>();
     
@@ -48,7 +48,7 @@ void SMSFRegistrationFor3GPPAccessApi::3_gpp_smsf_registration_handler(const Pis
     
     try {
       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) {
         //send a 400 error
         response.send(Pistache::Http::Code::Bad_Request, e.what());

src/api/SMSFRegistrationFor3GPPAccessApi.h

@@ -47,7 +47,7 @@ public:
 private:
     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);
 
     std::shared_ptr<Pistache::Rest::Router> router;
@@ -60,7 +60,7 @@ private:
     /// </remarks>
     /// <param name="ueId">Identifier of the UE</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;
 
 };
 

src/api/SMSManagementSubscriptionDataRetrievalApi.h

@@ -34,6 +34,7 @@ namespace udm {
 namespace api {
 
 using namespace oai::udm::model;
+using namespace org::openapitools::server::model;
 
 class SMSManagementSubscriptionDataRetrievalApi {
 public:

src/api/SMSSubscriptionDataRetrievalApi.h

@@ -34,6 +34,7 @@ namespace udm {
 namespace api {
 
 using namespace oai::udm::model;
+using namespace org::openapitools::server::model;
 
 class SMSSubscriptionDataRetrievalApi {
 public:

src/api/SessionManagementSubscriptionDataRetrievalApi.h

@@ -35,6 +35,7 @@ namespace udm {
 namespace api {
 
 using namespace oai::udm::model;
+using namespace org::openapitools::server::model;
 
 class SessionManagementSubscriptionDataRetrievalApi {
 public:

src/api/SubscriptionDeletionApi.cpp

@@ -19,7 +19,7 @@ namespace udm {
 namespace api {
 
 using namespace org::openapitools::server::helpers;
-using namespace oai::udm::model;
+//using namespace oai::udm::model;
 
 SubscriptionDeletionApi::SubscriptionDeletionApi(
     std::shared_ptr<Pistache::Rest::Router> rtr) {

src/api/SubscriptionDeletionApi.h

@@ -31,7 +31,7 @@ namespace oai {
 namespace udm {
 namespace api {
 
-using namespace oai::udm::model;
+//using namespace oai::udm::model;
 
 class SubscriptionDeletionApi {
 public:

src/api/SubscriptionDeletionForSharedDataApi.cpp

@@ -19,7 +19,7 @@ namespace udm {
 namespace api {
 
 using namespace org::openapitools::server::helpers;
-using namespace oai::udm::model;
+//using namespace oai::udm::model;
 
 SubscriptionDeletionForSharedDataApi::SubscriptionDeletionForSharedDataApi(
     std::shared_ptr<Pistache::Rest::Router> rtr) {

src/api/SubscriptionDeletionForSharedDataApi.h

@@ -31,7 +31,7 @@ namespace oai {
 namespace udm {
 namespace api {
 
-using namespace oai::udm::model;
+//using namespace oai::udm::model;
 
 class SubscriptionDeletionForSharedDataApi {
 public:

src/api/TraceConfigurationDataRetrievalApi.h

@@ -29,6 +29,8 @@
 #include "TraceDataResponse.h"
 #include <string>
 
+using namespace org::openapitools::server::model;
+
 namespace oai {
 namespace udm {
 namespace api {

src/api/UECMRegistrationInfoRetrievalApi.cpp

@@ -55,17 +55,17 @@ void UECMRegistrationInfoRetrievalApi::get_registrations_handler(const Pistache:
     Pistache::Optional<std::vector<RegistrationDataSetName>> registrationDatasetNames;
     if(!registrationDatasetNamesQuery.isEmpty()){
         std::vector<RegistrationDataSetName> valueQuery_instance;
-        if(fromStringValue(registrationDatasetNamesQuery.get(), valueQuery_instance)){
-            registrationDatasetNames = Pistache::Some(valueQuery_instance);
-        }
+        //if(fromStringValue(registrationDatasetNamesQuery.get(), valueQuery_instance)){
+        //    registrationDatasetNames = Pistache::Some(valueQuery_instance);
+        //}
     }
     auto singleNssaiQuery = request.query().get("single-nssai");
     Pistache::Optional<Snssai> singleNssai;
     if(!singleNssaiQuery.isEmpty()){
         Snssai valueQuery_instance;
-        if(fromStringValue(singleNssaiQuery.get(), valueQuery_instance)){
-            singleNssai = Pistache::Some(valueQuery_instance);
-        }
+        //if(fromStringValue(singleNssaiQuery.get(), valueQuery_instance)){
+        //    singleNssai = Pistache::Some(valueQuery_instance);
+        //}
     }
     auto dnnQuery = request.query().get("dnn");
     Pistache::Optional<std::string> dnn;
@@ -77,7 +77,7 @@ void UECMRegistrationInfoRetrievalApi::get_registrations_handler(const Pistache:
     }
     
     try {
-      this->get_registrations(ueId, registrationDatasetNames, supportedFeatures, singleNssai, dnn, response);
+      //this->get_registrations(ueId, registrationDatasetNames, supportedFeatures, singleNssai, dnn, response);
     } catch (nlohmann::detail::exception &e) {
         //send a 400 error
         response.send(Pistache::Http::Code::Bad_Request, e.what());

src/api/UECMRegistrationInfoRetrievalApi.h

@@ -28,7 +28,7 @@
 #include "ProblemDetails.h"
 #include "RegistrationDataSetName.h"
 #include "RegistrationDataSets.h"
-#include "Set.h"
+//#include "Set.h"
 #include "Snssai.h"
 #include <string>
 
@@ -66,7 +66,7 @@ private:
     /// <param name="supportedFeatures"> (optional, default to &quot;&quot;)</param>
     /// <param name="singleNssai"> (optional, default to Snssai())</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;
 
 };
 

src/impl/AMFRegistrationFor3GPPAccessApiImpl.cpp

@@ -23,7 +23,7 @@ AMFRegistrationFor3GPPAccessApiImpl::AMFRegistrationFor3GPPAccessApiImpl(std::sh
     : 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");
 }
 

src/impl/AMFRegistrationFor3GPPAccessApiImpl.h

@@ -45,7 +45,7 @@ public:
     AMFRegistrationFor3GPPAccessApiImpl(std::shared_ptr<Pistache::Rest::Router>);
     ~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:
 
 
 
-#endif
\ No newline at end of file
+#endif

src/impl/ConfirmAuthApiImpl.cpp

@@ -15,12 +15,12 @@
 
 using namespace config;
 extern udm_config udm_cfg;
-
+using namespace org::openapitools::server::model;
 namespace oai {
 namespace udm {
 namespace api {
 
-using namespace oai::udm::model;
+//using namespace oai::udm::model;
 
 ConfirmAuthApiImpl::ConfirmAuthApiImpl(
     std::shared_ptr<Pistache::Rest::Router> rtr)

src/impl/DeleteAuthApiImpl.cpp

@@ -15,12 +15,12 @@
 
 using namespace config;
 extern udm_config udm_cfg;
-
+using namespace org::openapitools::server::model;
 namespace oai {
 namespace udm {
 namespace api {
 
-using namespace oai::udm::model;
+//using namespace oai::udm::model;
 
 DeleteAuthApiImpl::DeleteAuthApiImpl(
     std::shared_ptr<Pistache::Rest::Router> rtr)

src/impl/GenerateAuthDataApiImpl.cpp

@@ -19,12 +19,12 @@
 
 using namespace config;
 extern udm_config udm_cfg;
-
+using namespace org::openapitools::server::model;
 namespace oai {
 namespace udm {
 namespace api {
 
-using namespace oai::udm::model;
+//using namespace oai::udm::model;
 
 GenerateAuthDataApiImpl::GenerateAuthDataApiImpl(
     std::shared_ptr<Pistache::Rest::Router> rtr)

src/impl/SMSFDeregistrationFor3GPPAccessApiImpl.cpp

@@ -23,7 +23,7 @@ SMSFDeregistrationFor3GPPAccessApiImpl::SMSFDeregistrationFor3GPPAccessApiImpl(s
     : 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");
 }
 

src/impl/SMSFDeregistrationFor3GPPAccessApiImpl.h

@@ -44,7 +44,7 @@ public:
     SMSFDeregistrationFor3GPPAccessApiImpl(std::shared_ptr<Pistache::Rest::Router>);
     ~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:
 
 
 
-#endif
\ No newline at end of file
+#endif

src/impl/SMSFRegistrationFor3GPPAccessApiImpl.cpp

@@ -23,7 +23,7 @@ SMSFRegistrationFor3GPPAccessApiImpl::SMSFRegistrationFor3GPPAccessApiImpl(std::
     : 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");
 }
 

src/impl/SMSFRegistrationFor3GPPAccessApiImpl.h

@@ -45,7 +45,7 @@ public:
     SMSFRegistrationFor3GPPAccessApiImpl(std::shared_ptr<Pistache::Rest::Router>);
     ~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:
 
 
 
-#endif
\ No newline at end of file
+#endif

src/impl/SubscriptionDeletionApiImpl.cpp

@@ -17,7 +17,7 @@ namespace oai {
 namespace udm {
 namespace api {
 
-using namespace oai::udm::model;
+//using namespace oai::udm::model;
 
 SubscriptionDeletionApiImpl::SubscriptionDeletionApiImpl(
     std::shared_ptr<Pistache::Rest::Router> rtr)

src/impl/SubscriptionDeletionApiImpl.h

@@ -36,7 +36,7 @@ namespace oai {
 namespace udm {
 namespace api {
 
-using namespace oai::udm::model;
+//using namespace oai::udm::model;
 
 class SubscriptionDeletionApiImpl
     : public oai::udm::api::SubscriptionDeletionApi {
@@ -52,4 +52,4 @@ public:
 } // namespace udm
 } // namespace oai
 
-#endif
\ No newline at end of file
+#endif

src/impl/SubscriptionDeletionForSharedDataApiImpl.cpp

@@ -17,7 +17,7 @@ namespace oai {
 namespace udm {
 namespace api {
 
-using namespace oai::udm::model;
+//using namespace oai::udm::model;
 
 SubscriptionDeletionForSharedDataApiImpl::
     SubscriptionDeletionForSharedDataApiImpl(

src/impl/SubscriptionDeletionForSharedDataApiImpl.h

@@ -36,7 +36,7 @@ namespace oai {
 namespace udm {
 namespace api {
 
-using namespace oai::udm::model;
+//using namespace oai::udm::model;
 
 class SubscriptionDeletionForSharedDataApiImpl
     : public oai::udm::api::SubscriptionDeletionForSharedDataApi {
@@ -53,4 +53,4 @@ public:
 } // namespace udm
 } // namespace oai
 
-#endif
\ No newline at end of file
+#endif

src/impl/UECMRegistrationInfoRetrievalApiImpl.cpp

@@ -23,9 +23,9 @@ UECMRegistrationInfoRetrievalApiImpl::UECMRegistrationInfoRetrievalApiImpl(std::
     : 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) {
-    response.send(Pistache::Http::Code::Ok, "Do some magic\n");
-}
+//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");
+//}
 
 }
 }

src/impl/UECMRegistrationInfoRetrievalApiImpl.h

@@ -32,7 +32,7 @@
 #include "ProblemDetails.h"
 #include "RegistrationDataSetName.h"
 #include "RegistrationDataSets.h"
-#include "Set.h"
+//#include "Set.h"
 #include "Snssai.h"
 #include <string>
 
@@ -48,7 +48,7 @@ public:
     UECMRegistrationInfoRetrievalApiImpl(std::shared_ptr<Pistache::Rest::Router>);
     ~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:
 
 
 
-#endif
\ No newline at end of file
+#endif

src/model/HssAuthenticationInfoRequest.h

@@ -26,7 +26,7 @@
 #include "ResynchronizationInfo.h"
 #include <nlohmann/json.hpp>
 #include <string>
-
+using namespace org::openapitools::server::model;
 namespace oai {
 namespace udm {
 namespace model {

src/model/Nssai.h

@@ -24,6 +24,8 @@
 #include <string>
 #include <vector>
 
+using namespace org::openapitools::server::model;
+
 namespace oai {
 namespace udm {
 namespace model {

src/model/PduSession.h

@@ -23,6 +23,8 @@
 #include <nlohmann/json.hpp>
 #include <string>
 
+using namespace org::openapitools::server::model;
+
 namespace oai {
 namespace udm {
 namespace model {

src/model/PgwInfo.h

@@ -22,7 +22,7 @@
 #include "PlmnId.h"
 #include <nlohmann/json.hpp>
 #include <string>
-
+using namespace org::openapitools::server::model;
 namespace oai {
 namespace udm {
 namespace model {

src/model/SdmSubscription.h

@@ -26,6 +26,8 @@
 #include <string>
 #include <vector>
 
+using namespace org::openapitools::server::model;
+
 namespace oai {
 namespace udm {
 namespace model {

src/model/SessionManagementSubscriptionData.h

@@ -28,6 +28,8 @@
 #include <string>
 #include <vector>
 
+using namespace org::openapitools::server::model;
+
 namespace oai {
 namespace udm {
 namespace model {

src/model/SmsfInfo.h

@@ -22,7 +22,7 @@
 #include "PlmnId.h"
 #include <nlohmann/json.hpp>
 #include <string>
-
+using namespace org::openapitools::server::model;
 namespace oai {
 namespace udm {
 namespace model {

src/model/SteeringInfo.h

@@ -23,7 +23,7 @@
 #include "PlmnId.h"
 #include <nlohmann/json.hpp>
 #include <vector>
-
+using namespace org::openapitools::server::model;
 namespace oai {
 namespace udm {
 namespace model {