X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fxapp.cc;h=7d5d2b341614abd95453d19de7849169b7063ad6;hb=e86af0d54882624aafd1281eebaa3972921d1a01;hp=54b75fd0e39134a2b8144f6a1ca6617f3b733414;hpb=91d30a6530398a9c7e50a15ea1cf9a027953bd39;p=ric-app%2Fhw.git

diff --git a/src/xapp.cc b/src/xapp.cc
index 54b75fd..7d5d2b3 100644
--- a/src/xapp.cc
+++ b/src/xapp.cc
@@ -1,7 +1,7 @@
 /*
 ==================================================================================
 
-        Copyright (c) 2018-2019 AT&T Intellectual Property.
+        Copyright (c) 2019-2020 AT&T Intellectual Property.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -19,17 +19,20 @@
 /*
  * xapp.cc
  *
- *  Created on: Mar, 2020
+ *  Mar, 2020 (Shraboni Jana)
  */
 
 #include "xapp.hpp"
+#define BUFFER_SIZE 1024
 
-Xapp::Xapp(XappSettings &config, XappRmr &rmr){
-	rmr_ref = &rmr;
-	config_ref = &config;
-	xapp_mutex = NULL;
-	return;
-}
+ Xapp::Xapp(XappSettings &config, XappRmr &rmr){
+
+	  rmr_ref = &rmr;
+	  config_ref = &config;
+	  xapp_mutex = NULL;
+	  subhandler_ref = NULL;
+	  return;
+  }
 
 Xapp::~Xapp(void){
 
@@ -47,43 +50,60 @@ Xapp::~Xapp(void){
 	}
 };
 
-//stop the xapp.
+//Stop the xapp. Note- To be run only from unit test scripts.
 void Xapp::stop(void){
   // Get the mutex lock
 	std::lock_guard<std::mutex> guard(*xapp_mutex);
 	rmr_ref->set_listen(false);
 	rmr_ref->~XappRmr();
 
+	//Detaching the threads....not sure if this is the right way to stop the receiver threads.
+	//Hence function should be called only in Unit Tests
+	int threadcnt = xapp_rcv_thread.size();
+	for(int i=0; i<threadcnt; i++){
+		xapp_rcv_thread[i].detach();
+	}
+	sleep(10);
 }
 
-void Xapp::init() {
-
-	//get rnib information
-	get_rnib_gnblist();
+void Xapp::startup(SubscriptionHandler &sub_ref) {
 
+	subhandler_ref = &sub_ref;
+	set_rnib_gnblist();
 
-}
-void Xapp::startup() {
-	//send subscriptions and read A1 policies.
+	//send subscriptions.
 	startup_subscribe_requests();
-	//startup_get_policies();
+
+	//read A1 policies
+	startup_get_policies();
 	return;
 }
+void Xapp::Run(){
+	rmr_ref->set_listen(true);
+	if(xapp_mutex == NULL){
+		xapp_mutex = new std::mutex();
+	}
+	std::lock_guard<std::mutex> guard(*xapp_mutex);
+
+	for(int j=0; j < _callbacks.size(); j++){
+		std::thread th_recv([&](){ rmr_ref->xapp_rmr_receive(std::move(_callbacks[j]), rmr_ref);});
+		xapp_rcv_thread.push_back(std::move(th_recv));
+	}
 
+	return;
+}
+//Starting a seperate single receiver
 void Xapp::start_xapp_receiver(XappMsgHandler& mp_handler){
 	//start a receiver thread. Can be multiple receiver threads for more than 1 listening port.
 	rmr_ref->set_listen(true);
-	xapp_mutex = new std::mutex();
+	if(xapp_mutex == NULL){
+		xapp_mutex = new std::mutex();
+	}
 
 	mdclog_write(MDCLOG_INFO,"Receiver Thread file= %s, line=%d",__FILE__,__LINE__);
-	//std::unique_ptr<XappMsgHandler> mp_handler = std::make_unique<XappMsgHandler>();
-	//auto mp_handler = _callbacks[0];
 	std::lock_guard<std::mutex> guard(*xapp_mutex);
 	std::thread th_recv([&](){ rmr_ref->xapp_rmr_receive(std::move(mp_handler), rmr_ref);});
-
 	xapp_rcv_thread.push_back(std::move(th_recv));
-
-
 	return;
 
 
@@ -97,38 +117,81 @@ void Xapp::shutdown(){
 
 
 void Xapp::startup_subscribe_requests(void ){
+
+   bool res;
    size_t data_size = ASN_BUFF_MAX_SIZE;
    unsigned char	data[data_size];
+   unsigned char meid[RMR_MAX_MEID];
    std::string xapp_id = config_ref->operator [](XappSettings::SettingName::XAPP_ID);
-   for(auto &it: rnib_gnblist){
-     int attempt = 0;
- 	 XappMsgHandler msg = XappMsgHandler(xapp_id);
 
- 	 //bool res_encode = msg.encode_subscription_request(data, &data_size);
- 	 //if(!res_encode) exit(0);
- 	char *strMsg = "HelloWorld\0";
- 	strncpy((char *)data,strMsg,strlen(strMsg));
- 	data_size = sizeof(data);
+   mdclog_write(MDCLOG_INFO,"Preparing to send subscription in file= %s, line=%d",__FILE__,__LINE__);
+
+   auto gnblist = get_rnib_gnblist();
+
+   int sz = gnblist.size();
+
+   if(sz <= 0)
+	   mdclog_write(MDCLOG_INFO,"Subscriptions cannot be sent as GNBList in RNIB is NULL");
+
+   for(int i = 0; i<sz; i++){
+
+	 //give the message to subscription handler, along with the transmitter.
+	 strcpy((char*)meid,gnblist[i].c_str());
+
+	// char *strMsg = "Subscription Request from HelloWorld XApp\0";
+ 	// strncpy((char *)data,strMsg,strlen(strMsg));
+ 	// data_size = strlen(strMsg);
+
+	 subscription_helper  din;
+	 subscription_helper  dout;
+
+	 subscription_request sub_req;
+	 subscription_request sub_recv;
+
+	 unsigned char buf[BUFFER_SIZE];
+	 size_t buf_size = BUFFER_SIZE;
+	 bool res;
+
+
+	 //Random Data  for request
+	 int request_id = 1;
+	 int function_id = 0;
+	 std::string event_def = "HelloWorld Event Definition";
+
+	 din.set_request(request_id);
+	 din.set_function_id(function_id);
+	 din.set_event_def(event_def.c_str(), event_def.length());
+
+	 std::string act_def = "HelloWorld Action Definition";
+
+	 din.add_action(1,1,(void*)act_def.c_str(), act_def.length(), 0);
+
+	 res = sub_req.encode_e2ap_subscription(&buf[0], &buf_size, din);
 
  	 xapp_rmr_header rmr_header;
- 	 rmr_header.message_type = RIC_SUB_RESP;
- 	 rmr_header.payload_length = data_size;
-     while(1){
+ 	 rmr_header.message_type = RIC_SUB_REQ;
+ 	 rmr_header.payload_length = buf_size; //data_size
+  	 strcpy((char*)rmr_header.meid,gnblist[i].c_str());
 
-     		 auto transmitter = std::bind(&XappRmr::xapp_rmr_send,rmr_ref, &rmr_header, (void*)data);
-     		 transmitter(); //this will go to subscription manager.
-    	 	 //rmr_ref->xapp_rmr_call(&rmr_header,(char*)strMsg);
+ 	 mdclog_write(MDCLOG_INFO,"Sending subscription in file= %s, line=%d for MEID %s",__FILE__,__LINE__, meid);
+     auto transmitter = std::bind(&XappRmr::xapp_rmr_send,rmr_ref, &rmr_header, (void*)buf );//(void*)data);
 
-     		 break;
+     int result = subhandler_ref->manage_subscription_request(gnblist[i], transmitter);
+     if(result==SUBSCR_SUCCESS){
+     	mdclog_write(MDCLOG_INFO,"Subscription SUCCESSFUL in file= %s, line=%d for MEID %s",__FILE__,__LINE__, meid);
+     }
+     else {
+	 	mdclog_write(MDCLOG_ERR,"Subscription FAILED in file= %s, line=%d for MEID %s",__FILE__,__LINE__, meid);
      }
    }
+
 }
 
 void Xapp::startup_get_policies(void){
 
   int policy_id = HELLOWORLD_POLICY_ID;
 
-  std::string policy_query = "{\"policy_id\":" + std::to_string(policy_id) + "}";
+  std::string policy_query = "{\"policy_type_id\":" + std::to_string(policy_id) + "}";
   unsigned char * message = (unsigned char *)calloc(policy_query.length(), sizeof(unsigned char));
   memcpy(message, policy_query.c_str(),  policy_query.length());
   xapp_rmr_header header;
@@ -143,34 +206,51 @@ void Xapp::startup_get_policies(void){
 void Xapp::set_rnib_gnblist(void) {
 
 	   openSdl();
+
 	   void *result = getListGnbIds();
-	   if(result == NULL){
+	   if(strlen((char*)result) < 1){
 		    mdclog_write(MDCLOG_ERR, "ERROR: no data from getListGnbIds\n");
 	        return;
 	    }
 
 	    mdclog_write(MDCLOG_INFO, "GNB List in R-NIB %s\n", (char*)result);
 
+
 	    Document doc;
-	    doc.Parse((char*)result);
-	    assert(doc.HasMember("gnb_list"));
+	    ParseResult parseJson = doc.Parse<kParseStopWhenDoneFlag>((char*)result);
+	    if (!parseJson) {
+	    	std::cerr << "JSON parse error: %s (%u)", GetParseErrorFunc(parseJson.Code());
+	    	return;
+	    }
 
+	    if(!doc.HasMember("gnb_list")){
+	    	mdclog_write(MDCLOG_INFO, "JSON Has No GNB List Object");
+	    	return;
+	    }
+	    assert(doc.HasMember("gnb_list"));
 
 	    const Value& gnblist = doc["gnb_list"];
-	    assert(gnblist.IsArray());
+	    if (gnblist.IsNull())
+	      return;
+
+	    if(!gnblist.IsArray()){
+	    	mdclog_write(MDCLOG_INFO, "GNB List is not an array");
+	    	return;
+	    }
 
+
+	   	assert(gnblist.IsArray());
 	    for (SizeType i = 0; i < gnblist.Size(); i++) // Uses SizeType instead of size_t
 	    {
 	    	assert(gnblist[i].IsObject());
 	    	const Value& gnbobj = gnblist[i];
 	    	assert(gnbobj.HasMember("inventory_name"));
 	    	assert(gnbobj["inventory_name"].IsString());
-	    	rnib_gnblist.push_back(gnbobj["inventory_name"].GetString());
+	    	std::string name = gnbobj["inventory_name"].GetString();
+	    	rnib_gnblist.push_back(name);
 
 	    }
 	    closeSdl();
-
-	    //delete result;
 	    return;
 
 }