Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use device reference instead of name to register to SAL #10

Merged
merged 1 commit into from
Oct 15, 2024
Merged

Use device reference instead of name to register to SAL #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .../src/main/java/eu/nebulous/resource/discovery/broker_communication/ExtendedConnector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ public void stop(ArrayList<Consumer> consumers, ArrayList <Publisher> publishers
if (publishers.size()>0) {
stop_publishers(publishers);
}
this.stop();
}


Expand Down
2 changes: 1 addition & 1 deletion ...ry/src/main/java/eu/nebulous/resource/discovery/broker_communication/SALCommunicator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ private static void register_devices(String request_body_file, String sessionID,
}


public static String get_device_registration_json(String internal_ip_address, String external_ip_address, int external_access_port, String os_family, String os_architecture, String jar_url, int os_version, int cpu_cores, int ram_gb, int disk_gb, String device_name,String provider_id, String city_name, String country_name, String device_username, String device_password, String private_key, double device_longitude, double device_latitude) {
public static String get_device_registration_json(String internal_ip_address, String external_ip_address, int external_access_port, String os_family, String os_architecture, String jar_url, int os_version, int cpu_cores, long ram_gb, long disk_gb, String device_name,String provider_id, String city_name, String country_name, String device_username, String device_password, String private_key, double device_longitude, double device_latitude) {

JSONObject root_json_object = new JSONObject();
JSONObject loginCredential = new JSONObject();
Expand Down
21 changes: 16 additions & 5 deletions ...main/java/eu/nebulous/resource/discovery/registration/service/SALRegistrationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,17 @@ public void queueForRegistration(@NonNull Device device) {

public void register(Device device) {

String application_name = ""; //TODO decide on this

String application_name = device.getRef().split("\\|")[1];
if (application_name.equals("all_applications")){
application_name="";
}
String public_ip = System.getenv("NEBULOUS_IP");
if (public_ip.equals("")){
log.warn("Using default IP address as the environmental variable was not set or found");
public_ip = "158.39.201.36";
}

Map<String,String> device_info = device.getDeviceInfo();
/* Information available from the EMS, based on https://gitlab.com/nebulous-project/ems-main/-/blob/master/ems-core/bin/detect.sh?ref_type=heads
echo CPU_SOCKETS=$TMP_NUM_CPUS
Expand All @@ -61,8 +71,8 @@ public void register(Device device) {
String device_name = device.getRef();

int cores = Integer.parseInt(device_info.get("CPU_PROCESSORS"));
int ram_gb = Integer.parseInt(device_info.get("RAM_TOTAL_KB"))/1000000;
int disk_gb = Integer.parseInt(device_info.get("DISK_TOTAL_KB"))/1000000;
long ram_gb = Math.round(Integer.parseInt(device_info.get("RAM_TOTAL_KB"))*1.0/1000000);
long disk_gb = Math.round(Integer.parseInt(device_info.get("DISK_TOTAL_KB"))*1.0/1000000);
String external_ip_address = device.getIpAddress();
String device_username = device.getUsername();
String device_password = new String(device.getPassword());
Expand All @@ -76,8 +86,9 @@ public void register(Device device) {
String internal_ip = ""; //TODO improve this
String os_family = "UBUNTU"; //TODO improve this
//String os_architecture = "ARMv8"; //TODO improve this
String os_architecture = device_info.get("OS_ARCHITECTURE").equals("aarch64") ? "armv8" : device_info.get("OS_ARCHITECTURE").equals("armv8") ?"armv8": device_info.get("OS_ARCHITECTURE").equals("armv7l") ? "armv7l": "AMD";
String jar_url = os_architecture.equals("armv8") ? "https://www.activeeon.com/public_content/nebulous/node_14.1.0-SNAPSHOT_arm_v8.jar" : os_architecture.equals("armv7l") ? "https://www.activeeon.com/public_content/nebulous/node_14.1.0-SNAPSHOT_arm_v7l.jar" : "https://www.activeeon.com/public_content/nebulous/node_14.1.0-SNAPSHOT_amd.jar";
String os_architecture = device_info.get("OS_ARCHITECTURE").equals("aarch64") ? "ARMv8" : device_info.get("OS_ARCHITECTURE").equals("armv8") ?"ARMv8": device_info.get("OS_ARCHITECTURE").equals("armv7l") ? "ARMv7": "AMD";
String jar_url = os_architecture.equals("ARMv8") ? "http://"+public_ip+":8880/rest/node-arm-v8.jar" : os_architecture.equals("ARMv7") ? "http://"+public_ip+":8880/rest/node-arm-v7.jar" : "http://"+public_ip+":8880/rest/node-amd-64.jar";

int os_version = 2204; //TODO improve this
String private_key = ""; //TODO improve this
int external_access_port = device.getPort();
Expand Down