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

VSOCK interface #969

Merged
merged 2 commits into from
May 16, 2023
Merged

VSOCK interface #969

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b88c4f4
Add info popover to Watchdog link to be consistent with vsock
skobyda Apr 18, 2023
b21c0c8
Vsock interface can be configured
skobyda Feb 28, 2023
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
5 changes: 5 additions & 0 deletions src/components/common/overviewCard.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
.overview-tab.pf-l-flex {
gap: var(--pf-global--spacer--lg);
}

.overview-icon svg {
color: var(--pf-c-description-list__term-icon--Color);
font-size: var(--pf-c-description-list__term--FontSize);
}
2 changes: 1 addition & 1 deletion src/components/vm/overview/firmware.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import { useDialogs, DialogsContext } from 'dialogs.jsx';

import { ModalError } from 'cockpit-components-inline-notification.jsx';
import { domainSetOSFirmware, domainCanInstall } from "../../../libvirtApi/domain.js";
import { supportsUefiXml, labelForFirmwarePath } from './helpers.js';
import { supportsUefiXml, labelForFirmwarePath } from './helpers.jsx';

const _ = cockpit.gettext;

Expand Down
27 changes: 27 additions & 0 deletions src/components/vm/overview/helpers.js → src/components/vm/overview/helpers.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,33 @@
* You should have received a copy of the GNU Lesser General Public License
* along with Cockpit; If not, see <http://www.gnu.org/licenses/>.
*/
import React from 'react';
import cockpit from 'cockpit';

import { CodeBlock, CodeBlockCode } from "@patternfly/react-core/dist/esm/components/CodeBlock";
import { FlexItem } from "@patternfly/react-core/dist/esm/layouts/Flex";

const _ = cockpit.gettext;

export const WATCHDOG_INFO_MESSAGE = _("Watchdogs act when systems stop responding. To use this virtual watchdog device, the guest system also needs to have an additional driver and a running watchdog service.");
export const VSOCK_INFO_MESSAGE = _("Virtual socket support enables communication between the host and guest over a socket. It still requires special vsock-aware software to communicate over the socket.");
export const SOCAT_EXAMPLE_HEADER = _("An example of vsock-aware software is socat");
export const SOCAT_EXAMPLE = (
<>
<FlexItem>
{_("On the host")}
<CodeBlock>
<CodeBlockCode>socat VSOCK-LISTEN:1234 VSOCK-CONNECT:[vsock_identifier]:1234</CodeBlockCode>
</CodeBlock>
</FlexItem>
<FlexItem>
{_("Inside the VM")}
<CodeBlock>
<CodeBlockCode>nc --vsock -l 1234</CodeBlockCode>
</CodeBlock>
</FlexItem>
</>
);

export function labelForFirmwarePath(path, guest_arch) {
/* Copied from virt-manager code:
Expand Down
64 changes: 62 additions & 2 deletions src/components/vm/overview/vmOverviewCard.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,15 @@ import React from 'react';
import PropTypes from 'prop-types';
import cockpit from 'cockpit';
import { Button } from "@patternfly/react-core/dist/esm/components/Button";
import { Icon } from "@patternfly/react-core/dist/esm/components/Icon";
import { Text, TextVariants } from "@patternfly/react-core/dist/esm/components/Text";
import { Tooltip } from "@patternfly/react-core/dist/esm/components/Tooltip";
import { DescriptionList, DescriptionListDescription, DescriptionListGroup, DescriptionListTerm } from "@patternfly/react-core/dist/esm/components/DescriptionList";
import { Flex, FlexItem } from "@patternfly/react-core/dist/esm/layouts/Flex";
import { Popover } from "@patternfly/react-core/dist/esm/components/Popover";
import { Switch } from "@patternfly/react-core/dist/esm/components/Switch";
import { DialogsContext } from 'dialogs.jsx';
import { HelpIcon } from '@patternfly/react-icons';

import { CPUModal } from './cpuModal.jsx';
import MemoryModal from './memoryModal.jsx';
Expand All @@ -40,9 +43,16 @@ import { BootOrderLink } from './bootOrder.jsx';
import { FirmwareLink } from './firmware.jsx';
import { WatchdogLink } from './watchdog.jsx';
import { needsShutdownCpuModel, NeedsShutdownTooltip, needsShutdownVcpu } from '../../common/needsShutdown.jsx';
import { VsockLink } from './vsock.jsx';
import { StateIcon } from '../../common/stateIcon.jsx';
import { domainChangeAutostart, domainGet } from '../../../libvirtApi/domain.js';
import store from '../../../store.js';
import {
SOCAT_EXAMPLE,
SOCAT_EXAMPLE_HEADER,
VSOCK_INFO_MESSAGE,
WATCHDOG_INFO_MESSAGE,
} from './helpers.jsx';

import '../../common/overviewCard.css';

Expand Down Expand Up @@ -90,7 +100,7 @@ class VmOverviewCard extends React.Component {
}

render() {
const { vm, nodeDevices, libvirtVersion } = this.props;
const { vm, vms, nodeDevices, libvirtVersion } = this.props;
const idPrefix = vmId(vm.name);

const autostart = (
Expand Down Expand Up @@ -192,11 +202,60 @@ class VmOverviewCard extends React.Component {
</DescriptionListGroup>}

<DescriptionListGroup>
<DescriptionListTerm>{_("Watchdog")}</DescriptionListTerm>
<Flex spaceItems={{ default: 'spaceItemsXs' }} alignItems={{ default: 'alignItemsCenter' }}>
<FlexItem>
<DescriptionListTerm>
{_("Watchdog")}
</DescriptionListTerm>
</FlexItem>
<FlexItem>
<Popover alertSeverityVariant="info"
position="right"
bodyContent={WATCHDOG_INFO_MESSAGE}>
<button onClick={e => e.preventDefault()} className="pf-c-form__group-label-help">
<Icon className="overview-icon" status="info">
<HelpIcon noVerticalAlign />
</Icon>
</button>
</Popover>
</FlexItem>
</Flex>
<DescriptionListDescription id={`${idPrefix}-watchdog`}>
<WatchdogLink vm={vm} idPrefix={idPrefix} />
</DescriptionListDescription>
</DescriptionListGroup>

<DescriptionListGroup>
<Flex spaceItems={{ default: 'spaceItemsXs' }} alignItems={{ default: 'alignItemsCenter' }}>
<FlexItem>
<DescriptionListTerm>
{_("Vsock")}
</DescriptionListTerm>
</FlexItem>
<FlexItem>
<Popover alertSeverityVariant="info"
position="right"
headerContent={_("vsock requires special software")}
bodyContent={VSOCK_INFO_MESSAGE}
footerContent={
<Flex direction={{ default: 'column' }}>
<FlexItem>{SOCAT_EXAMPLE_HEADER}</FlexItem>
{SOCAT_EXAMPLE}
</Flex>
}
hasAutoWidth>
<button onClick={e => e.preventDefault()} className="pf-c-form__group-label-help">
<Icon className="overview-icon" status="info">
<HelpIcon noVerticalAlign />
</Icon>
</button>
</Popover>
</FlexItem>
</Flex>
<DescriptionListDescription id={`${idPrefix}-vsock`}>
<VsockLink vm={vm} vms={vms} idPrefix={idPrefix} infoMessage={VSOCK_INFO_MESSAGE} socatMessage={SOCAT_EXAMPLE} />
</DescriptionListDescription>
</DescriptionListGroup>
</DescriptionList>
</FlexItem>
<FlexItem>
Expand Down Expand Up @@ -227,6 +286,7 @@ class VmOverviewCard extends React.Component {

VmOverviewCard.propTypes = {
vm: PropTypes.object.isRequired,
vms: PropTypes.array.isRequired,
config: PropTypes.object.isRequired,
libvirtVersion: PropTypes.number.isRequired,
nodeDevices: PropTypes.array.isRequired,
Expand Down
Loading