F #2312: Fireedge socket connections (VMRC) (#242)

* VMRC with fireedge server * Linting VMRC server Signed-off-by: Frederick Borges <[email protected]>
OpenNebula · Sep 24, 2020 · 6b624d7 · 6b624d7
1 parent e18170f
commit 6b624d7
Show file tree

Hide file tree

Showing 17 changed files with 313 additions and 323 deletions.
diff --git a/install.sh b/install.sh
@@ -900,7 +900,7 @@ RUBY_LIB_FILES="src/mad/ruby/ActionManager.rb \
                 src/oca/ruby/opennebula.rb \
                 src/sunstone/OpenNebulaVNC.rb \
                 src/sunstone/OpenNebulaGuac.rb \
-                src/sunstone/OpenNebulaVMRC.rb \
+                src/sunstone/opennebula_vmrc.rb \
                 src/sunstone/OpenNebulaAddons.rb \
                 src/vmm_mad/remotes/vcenter/vcenter_driver.rb \
                 src/vmm_mad/remotes/nsx/nsx_driver.rb \
@@ -2408,8 +2408,7 @@ SUNSTONE_MODELS_FILES="src/sunstone/models/OpenNebulaJSON.rb \
                        src/sunstone/models/OpenNebula2FA/SunstoneWebAuthn.rb \
                        src/sunstone/models/OpenNebula2FA/sunstone_qr_code.rb \
                        src/sunstone/models/OpenNebula2FA/sunstone_optp.rb \
-                       src/sunstone/models/OpenNebula2FA/sunstone_2f_auth.rb \
-                       src/sunstone/models/OpenNebulaValidateFireedge.rb"
+                       src/sunstone/models/OpenNebula2FA/sunstone_2f_auth.rb"
 
 SUNSTONE_MODELS_JSON_FILES="src/sunstone/models/OpenNebulaJSON/HostJSON.rb \
                     src/sunstone/models/OpenNebulaJSON/ImageJSON.rb \

diff --git a/src/sunstone/OpenNebulaVMRC.rb b/src/sunstone/OpenNebulaVMRC.rb
diff --git a/src/sunstone/etc/sunstone-server.conf b/src/sunstone/etc/sunstone-server.conf
@@ -158,13 +158,6 @@
 :vnc_request_password: false
 :allow_vnc_federation: no
 
-:guac_port: 29877
-:guacd_port: 4822
-
-:vmrc_port: 2616
-:fireedge_server_endpoint: "http://localhost:2616"
-:max_waiting_tries: 5
-
 # Login Session Length in seconds, defaults to 1 hour.
 #:session_expire_time: 3600
 
@@ -269,3 +262,15 @@
 
 :zeromq_server: tcp://localhost:2101
 :autorefresh_ip: 127.0.0.1
+
+################################################################################
+# Fireedge
+################################################################################
+
+:fireedge_endpoint: http://localhost:2616
+
+# Number of tries when connecting to fireedge_endpoint
+:max_waiting_tries: 5
+
+:guac_port: 29877
+:guacd_port: 4822
diff --git a/src/sunstone/models/OpenNebulaValidateFireedge.rb b/src/sunstone/models/OpenNebulaValidateFireedge.rb
diff --git a/src/sunstone/models/SunstoneServer.rb b/src/sunstone/models/SunstoneServer.rb
@@ -21,7 +21,7 @@
 
 require 'OpenNebulaVNC'
 require 'OpenNebulaGuac'
-require 'OpenNebulaVMRC'
+require 'opennebula_vmrc'
 require 'OpenNebulaAddons'
 require 'OpenNebulaJSON/JSONUtils'
 #include JSONUtils