R1 candidate changes

resource-discovery/src/main/java/eu/nebulous/resource/discovery/monitor/DeviceProcessor.java

@@ -145,8 +145,8 @@ private void processFailedDevices() {
                 lost_device_message.put("device_name",device.getName());
                 Clock clock = Clock.systemUTC();
                 lost_device_message.put("timestamp",(int)(clock.millis()/1000));
-                log.info("Creating new BrokerPublisher to publish device lost message");
-                device_lost_publisher = new BrokerPublisher(processorProperties.getLost_device_topic(), processorProperties.getNebulous_broker_ip_address(), processorProperties.getNebulous_broker_port(), processorProperties.getNebulous_broker_username(), processorProperties.getNebulous_broker_password(), "");
+                log.info("Trying to use existing BrokerPublisher to publish device lost message");
+                //device_lost_publisher = new BrokerPublisher(processorProperties.getLost_device_topic(), processorProperties.getNebulous_broker_ip_address(), processorProperties.getNebulous_broker_port(), processorProperties.getNebulous_broker_username(), processorProperties.getNebulous_broker_password(), "");
                 int sending_attempt = 1;
                 while (device_lost_publisher.is_publisher_null()){
 
@@ -166,7 +166,7 @@ private void processFailedDevices() {
                 log.warn("processFailedDevices: Marked as FAILED device with Id: {}", device.getId());
                 //device_lost_publisher.stop();
             }
-
+            device.setStatus(DeviceStatus.OFFBOARDED);
             deviceManagementService.update(device);
         }
 

resource-discovery/src/main/java/eu/nebulous/resource/discovery/registration/RegistrationRequestProcessor.java

@@ -290,6 +290,20 @@ private void processResponse(@NonNull Map<String, Object> response) {
 			boolean doArchive = false;
 			Object obj = response.get("nodeInfo");
 			log.warn("RegistrationRequestProcessor: processResponse: nodeInfo: {} {}", obj==null?null:obj.getClass().getTypeName(), obj);
+
+			// If device info are missing copy them from the registration request
+			if (obj==null || obj instanceof Map && ((Map) obj).isEmpty()) {
+				log.warn("RegistrationRequestProcessor: processResponse: nodeInfo: ** NO DEVICE INFO IN RESPONSE **");
+				if (! registrationRequest.getDevice().getDeviceInfo().isEmpty()) {
+					obj = registrationRequest.getDevice().getDeviceInfo();
+					log.warn("RegistrationRequestProcessor: processResponse: nodeInfo: ** DEVICE INFO COPIED FROM REGISTRATION REQUEST **");
+					log.warn("RegistrationRequestProcessor: processResponse: nodeInfo: {}", obj);
+				} else {
+					log.warn("RegistrationRequestProcessor: processResponse: nodeInfo: ** PROBLEM: REGISTRATION REQUEST DOES NOT CONTAIN DEVICE INFO EITHER **");
+				}
+			}
+			log.warn("RegistrationRequestProcessor: processResponse: CHECK: ** NOT A REAL EXCEPTION **\n", new RuntimeException("NOT A REAL EXCEPTION"));
+
 			if (obj instanceof Map devInfo) {
 				// Update request info
 				registrationRequest.setLastUpdateDate(Instant.ofEpochMilli(timestamp));

resource-discovery/src/main/java/eu/nebulous/resource/discovery/registration/service/SALRegistrationService.java

@@ -47,11 +47,11 @@ public String register(Device device) {
         if (application_name.equals("all_applications")){
             application_name="";
         }
-        String public_ip = System.getenv("NEBULOUS_IP");
+        /*String public_ip = System.getenv("NEBULOUS_IP");
         if (public_ip==null || public_ip.isEmpty()){
             public_ip = processorProperties.getNebulous_server_ip_address();
-            log.warn("Using default IP address ({}) to fetch Proactive client jar files from, as the environmental variable was not set or found", public_ip);
-        }
+            log.warn("Using default IP address ({}) to fetch Proactive client jar files from, as the environmental variable was not set or found", public_ip);}*/
+        String public_ip = processorProperties.getNebulous_server_ip_address();
 
         Map<String,String> device_info = device.getDeviceInfo();
         log.warn("SALRegistrationService: register: DEVICE-INFO: {}", device_info);