Merge pull request #1192 from hstastna/Open_vm_console_setVmSessions

Allow opening a VM console for all console types
oVirt · May 12, 2020 · 088f401 · 088f401
2 parents 755fe4a + d36e52d
commit 088f401
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/src/actions/vm.js b/src/actions/vm.js
@@ -26,6 +26,7 @@ import {
   SET_VM_ACTION_RESULT,
   SET_VM_DISKS,
   SET_VM_NICS,
+  SET_VM_SESSIONS,
   SET_VM_SNAPSHOTS,
   SET_VM_SORT,
   SHUTDOWN_VM,
@@ -325,6 +326,16 @@ export function vmActionInProgress ({ vmId, name, started }) {
   }
 }
 
+export function setVmSessions ({ vmId, sessions }) {
+  return {
+    type: SET_VM_SESSIONS,
+    payload: {
+      vmId,
+      sessions,
+    },
+  }
+}
+
 export function setVmSnapshots ({ vmId, snapshots }) {
   return {
     type: SET_VM_SNAPSHOTS,

diff --git a/src/constants/index.js b/src/constants/index.js
@@ -104,6 +104,7 @@ export const SET_USERMSG_NOTIFIED = 'SET_USERMSG_NOTIFIED'
 export const SET_VM_ACTION_RESULT = 'SET_VM_ACTION_RESULT'
 export const SET_VM_DISKS = 'SET_VM_DISKS'
 export const SET_VM_NICS = 'SET_VM_NICS'
+export const SET_VM_SESSIONS = 'SET_VM_SESSIONS'
 export const SET_VM_SORT = 'SET_VM_SORT'
 export const SET_VNIC_PROFILES = 'SET_VNIC_PROFILES'
 export const SET_VM_SNAPSHOTS = 'SET_VM_SNAPSHOTS'

diff --git a/src/reducers/vms.js b/src/reducers/vms.js
@@ -14,7 +14,6 @@ import {
   SET_VM_SORT,
   SET_VM_ACTION_RESULT,
   SET_VM_CDROM,
-  SET_VM_CONSOLES,
   SET_VM_DISKS,
   SET_VM_NICS,
   SET_VM_SESSIONS,
@@ -163,9 +162,6 @@ const vms = actionReducer(initialState, {
     }
     return state
   },
-  [SET_VM_CONSOLES] (state, { payload: { vmId, consoles } }) {
-    return state.setIn(['vms', vmId, 'consoles'], Immutable.fromJS(consoles))
-  },
   [SET_VM_SESSIONS] (state, { payload: { vmId, sessions } }) {
     let consoleInUse = false
     for (var i in sessions) {