Drop usage of virtinterfaced

virtinterfaced is being deprecated [1], and at least some distros want
to get rid of the dependency.

Fixes cockpit-project#1777

[1] https://listman.redhat.com/archives/libvir-list/2020-December/msg00183.html

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}

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,

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}

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";

src/helpers.js

@@ -683,23 +683,17 @@ export function getStorageVolumesUsage(vms, storagePool) {
 
 /**
  * Returns a list of potential physical devices suitable as network devices
- * by merging all network node devices and interfaces.
  *
  * @returns {array}
  */
 export function getNetworkDevices() {
-    const { nodeDevices, interfaces } = store.getState();
     const devs = [];
 
-    nodeDevices.forEach(dev => {
+    store.getState().nodeDevices.forEach(dev => {
         if (dev.capability.type === "net")
             devs.push(dev.capability.interface);
     });
 
-    interfaces.forEach(iface => {
-        devs.push(iface.name);
-    });
-
     const uniq = [...new Set(devs)];
     uniq.sort();
 

src/libvirtApi/common.js

@@ -57,9 +57,6 @@ import {
     Enum,
     timeout,
 } from "../libvirtApi/helpers.js";
-import {
-    interfaceGetAll,
-} from "../libvirtApi/interface.js";
 import {
     networkGet,
     networkGetAll,
@@ -455,7 +452,6 @@ export function getApiData({ connectionName }) {
     return Promise.allSettled([
         domainGetAll({ connectionName }),
         storagePoolGetAll({ connectionName }),
-        interfaceGetAll({ connectionName }),
         networkGetAll({ connectionName }),
         nodeDeviceGetAll({ connectionName }),
         getNodeMaxMemory({ connectionName }),

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,

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

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)