Drop usage of virtinterfaced

Nothing uses this any more. `HostVmsList` already didn't expect an `interfaces` property any more, so drop specifying it. Fixes cockpit-project#1777
martinpitt · Aug 26, 2024 · 95d35ce · 95d35ce
1 parent 28e2e32
commit 95d35ce
Show file tree

Hide file tree

Showing 8 changed files with 1 addition and 122 deletions.
diff --git a/packaging/cockpit-machines.spec.in b/packaging/cockpit-machines.spec.in
@@ -43,7 +43,6 @@ Requires: libvirt-daemon-driver-qemu
 Requires: libvirt-daemon-driver-network
 Requires: libvirt-daemon-driver-nodedev
 Requires: libvirt-daemon-driver-storage-core
-Requires: (libvirt-daemon-driver-interface if virt-install)
 Requires: (libvirt-daemon-config-network if virt-install)
 Recommends: libvirt-daemon-driver-storage-disk
 %if 0%{?rhel}

diff --git a/src/actions/store-actions.js b/src/actions/store-actions.js
@@ -26,7 +26,6 @@ import {
     UNDEFINE_NETWORK,
     UNDEFINE_STORAGE_POOL,
     UNDEFINE_VM,
-    UPDATE_ADD_INTERFACE,
     UPDATE_ADD_NETWORK,
     UPDATE_ADD_NODE_DEVICE,
     UPDATE_ADD_STORAGE_POOL,
@@ -141,13 +140,6 @@ export function updateDomainSnapshots({ connectionName, domainPath, snaps }) {
     };
 }
 
-export function updateOrAddInterface(props) {
-    return {
-        type: UPDATE_ADD_INTERFACE,
-        payload: { iface: props },
-    };
-}
-
 export function updateOrAddNetwork(props, updateOnly) {
     return {
         type: UPDATE_ADD_NETWORK,

diff --git a/src/app.jsx b/src/app.jsx
@@ -247,7 +247,7 @@ class AppActive extends React.Component {
     }
 
     render() {
-        const { vms, config, storagePools, systemInfo, ui, networks, nodeDevices, interfaces } = store.getState();
+        const { vms, config, storagePools, systemInfo, ui, networks, nodeDevices } = store.getState();
         const { path, cloudInitSupported, downloadOSSupported, unattendedSupported, unattendedUserLogin, virtInstallAvailable } = this.state;
         const combinedVms = [...vms, ...dummyVmsFilter(vms, ui.vms)];
         const properties = {
@@ -337,7 +337,6 @@ class AppActive extends React.Component {
                     ui={ui}
                     libvirtVersion={systemInfo.libvirtVersion}
                     storagePools={storagePools}
-                    interfaces={interfaces}
                     networks={networks}
                     actions={vmActions}
                     resourceHasError={this.state.resourceHasError}

diff --git a/src/constants/store-action-types.js b/src/constants/store-action-types.js
@@ -30,7 +30,6 @@ export const SET_NODE_MAX_MEMORY = "SET_NODE_MAX_MEMORY";
 export const UNDEFINE_NETWORK = "UNDEFINE_NETWORK";
 export const UNDEFINE_STORAGE_POOL = "UNDEFINE_STORAGE_POOL";
 export const UNDEFINE_VM = "UNDEFINE_VM";
-export const UPDATE_ADD_INTERFACE = "UPDATE_ADD_INTERFACE";
 export const UPDATE_ADD_NETWORK = "UPDATE_ADD_NETWORK";
 export const UPDATE_ADD_NODE_DEVICE = "UPDATE_ADD_NODE_DEVICE";
 export const UPDATE_ADD_VM = "UPDATE_ADD_VM";

diff --git a/src/libvirtApi/interface.js b/src/libvirtApi/interface.js
diff --git a/src/reducers.js b/src/reducers.js
@@ -29,7 +29,6 @@ import {
     UNDEFINE_NETWORK,
     UNDEFINE_STORAGE_POOL,
     UNDEFINE_VM,
-    UPDATE_ADD_INTERFACE,
     UPDATE_ADD_NETWORK,
     UPDATE_ADD_NODE_DEVICE,
     UPDATE_ADD_VM,
@@ -93,33 +92,6 @@ function lazyComposedReducer({ parentReducer, getSubreducer, getSubstate, setSub
     };
 }
 
-function interfaces(state, action) {
-    state = state || [];
-
-    switch (action.type) {
-    case UPDATE_ADD_INTERFACE: {
-        const { iface } = action.payload;
-
-        if (isObjectEmpty(iface))
-            return [...state, iface]; // initialize iface to empty object
-
-        const connectionName = iface.connectionName;
-        const index = getFirstIndexOfResource(state, 'name', iface.name, connectionName);
-        if (index < 0) { // add
-            const initObjIndex = state.findIndex(obj => isObjectEmpty(obj));
-            if (initObjIndex >= 0)
-                state.splice(initObjIndex, 1); // remove empty initial object
-            return [...state, iface];
-        }
-
-        const updatedIface = Object.assign({}, state[index], iface);
-        return replaceResource({ state, updatedResource: updatedIface, index });
-    }
-    default:
-        return state;
-    }
-}
-
 function networks(state, action) {
     state = state || [];
 
@@ -428,7 +400,6 @@ export default combineReducers({
         getSubstate: (state) => state.providerState,
         setSubstate: (state, subState) => Object.assign({}, state, { providerState: subState }),
     }),
-    interfaces,
     networks,
     nodeDevices,
     vms,

diff --git a/test/browser/browser.sh b/test/browser/browser.sh
@@ -67,7 +67,6 @@ sh -x test/vm.install
 
 if [ "${PLATFORM_ID:-}" != "platform:el8" ]; then
     # https://gitlab.com/libvirt/libvirt/-/issues/219
-    systemctl start virtinterfaced.socket
     systemctl start virtnetworkd.socket
     systemctl start virtnodedevd.socket
     systemctl start virtstoraged.socket

diff --git a/test/vm.install b/test/vm.install
@@ -7,11 +7,6 @@ if grep -q 'ID=debian' /usr/lib/os-release; then
     echo '* soft core unlimited' >> /etc/security/limits.conf
 fi
 
-if grep -q 'ID="opensuse' /usr/lib/os-release; then
-    # Make sure virtinterfaced.socket is enabled
-    systemctl enable --now virtinterfaced.socket
-fi
-
 systemctl enable cockpit.socket
 
 # don't force https:// (self-signed cert)