Initial refactoring for P5 messages in Aerial VNF

nfapi/open-nFAPI/vnf/src/vnf_interface.c

@@ -579,8 +579,7 @@ int nfapi_nr_vnf_config_req(nfapi_vnf_config_t* config, int p5_idx, nfapi_nr_con
 		return -1;
   AssertFatal(config->send_p5_msg, "Function pointer must be configured\n");
 	vnf_t* _this = (vnf_t*)(config);
-#ifndef ENABLE_WLS
-
+#if !defined(ENABLE_WLS) && !defined(ENABLE_AERIAL)
 	nfapi_vnf_phy_info_t* phy = nfapi_vnf_phy_info_list_find(config, req->header.phy_id);
 
 	if(phy == NULL)

nfapi/open-nFAPI/vnf/src/vnf_p7_interface.c

@@ -450,12 +450,12 @@ int nfapi_vnf_p7_add_pnf(nfapi_vnf_p7_config_t* config, const char* pnf_p7_addr,
     node->slot = 0;
 	node->min_sync_cycle_count = 8;
   node->mu = mu;
-
+#ifndef ENABLE_AERIAL
 	// save the remote endpoint information
 	node->remote_addr.sin_family = AF_INET;
 	node->remote_addr.sin_port =  pnf_p7_port;//htons(pnf_p7_port);
 	node->remote_addr.sin_addr.s_addr = inet_addr(pnf_p7_addr);
-
+#endif
 	vnf_p7_connection_info_list_add(vnf_p7, node);
 
 	return 0;