Daniel Erez has uploaded a new change for review. Change subject: core: add UnregisterLibvritVdsCommand ......................................................................
core: add UnregisterLibvritVdsCommand Adding UnregisterLibvirtSecretsVDSCommand and integrate with vdsm's unregisterSecrets api. Change-Id: Ib27ca3e5fb5a8402650c28baf650c7d3ae7a3226 Bug-Url: https://bugzilla.redhat.com/1185826 Signed-off-by: Daniel Erez <[email protected]> --- A backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/UnregisterLibvirtSecretsVDSParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcVdsServer.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java A backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/UnregisterLibvirtSecretsVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerConnector.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerWrapper.java 7 files changed, 86 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/59/41559/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/UnregisterLibvirtSecretsVDSParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/UnregisterLibvirtSecretsVDSParameters.java new file mode 100644 index 0000000..ee9f2bd --- /dev/null +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/UnregisterLibvirtSecretsVDSParameters.java @@ -0,0 +1,33 @@ +package org.ovirt.engine.core.common.vdscommands; + +import java.util.List; + +import org.ovirt.engine.core.common.utils.ToStringBuilder; +import org.ovirt.engine.core.compat.Guid; + +public class UnregisterLibvirtSecretsVDSParameters extends VdsIdVDSCommandParametersBase { + + private List<Guid> libvirtSecretsUuids; + + public UnregisterLibvirtSecretsVDSParameters(Guid vdsId, List<Guid> libvirtSecretsUuids) { + super(vdsId); + this.libvirtSecretsUuids = libvirtSecretsUuids; + } + + public UnregisterLibvirtSecretsVDSParameters() { + } + + public List<Guid> getLibvirtSecretsUuids() { + return libvirtSecretsUuids; + } + + public void setLibvirtSecretsUuids(List<Guid> libvirtSecretsUuids) { + this.libvirtSecretsUuids = libvirtSecretsUuids; + } + + @Override + protected ToStringBuilder appendAttributes(ToStringBuilder tsb) { + return super.appendAttributes(tsb) + .append("libvirtSecretsUuids", getLibvirtSecretsUuids()); + } +} diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java index ef31f02..fb1818c 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java @@ -194,6 +194,7 @@ Destroy("org.ovirt.engine.core.vdsbroker.vdsbroker"), // Clean a DOWN VM from the vms list HostDevChangeNumVfs("org.ovirt.engine.core.vdsbroker.vdsbroker"), RegisterLibvirtSecrets("org.ovirt.engine.core.vdsbroker.vdsbroker"), + UnregisterLibvirtSecrets("org.ovirt.engine.core.vdsbroker.vdsbroker"), /** * Get Host capabilities */ diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcVdsServer.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcVdsServer.java index 987da0a..692f0db 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcVdsServer.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcVdsServer.java @@ -1887,4 +1887,13 @@ return new StatusOnlyReturnForXmlRpc(response); } + @Override + public StatusOnlyReturnForXmlRpc unregisterSecrets(String[] libvirtSecretsUuids) { + JsonRpcRequest request = + new RequestBuilder("Host.unregisterSecrets").withParameter("uuids", libvirtSecretsUuids) + .build(); + Map<String, Object> response = new FutureMap(this.client, request); + return new StatusOnlyReturnForXmlRpc(response); + } + } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java index 530049f..9324f44 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java @@ -440,4 +440,6 @@ StatusOnlyReturnForXmlRpc hostdevChangeNumvfs(String deviceName, int numOfVfs); StatusOnlyReturnForXmlRpc registerSecrets(Map<String, String>[] libvirtSecrets); + + StatusOnlyReturnForXmlRpc unregisterSecrets(String[] libvirtSecretsUuids); } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/UnregisterLibvirtSecretsVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/UnregisterLibvirtSecretsVDSCommand.java new file mode 100644 index 0000000..348c848 --- /dev/null +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/UnregisterLibvirtSecretsVDSCommand.java @@ -0,0 +1,29 @@ +package org.ovirt.engine.core.vdsbroker.vdsbroker; + +import java.util.ArrayList; +import java.util.List; + +import org.ovirt.engine.core.common.vdscommands.UnregisterLibvirtSecretsVDSParameters; +import org.ovirt.engine.core.compat.Guid; + +public class UnregisterLibvirtSecretsVDSCommand<P extends UnregisterLibvirtSecretsVDSParameters> extends VdsBrokerCommand<P> { + + public UnregisterLibvirtSecretsVDSCommand(P parameters) { + super(parameters); + } + + @Override + protected void executeVdsBrokerCommand() { + status = getBroker().unregisterSecrets(buildStructFromLibvirtSecretsList()); + proceedProxyReturnValue(); + } + + @SuppressWarnings({"unchecked", "SuspiciousToArrayCall"}) + protected String[] buildStructFromLibvirtSecretsList() { + List<String> libvirtSecretsUuids = new ArrayList<>(); + for (Guid libvirtSecretUuid : getParameters().getLibvirtSecretsUuids()) { + libvirtSecretsUuids.add(libvirtSecretUuid.toString()); + } + return libvirtSecretsUuids.toArray(new String[libvirtSecretsUuids.size()]); + } +} diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerConnector.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerConnector.java index 9f90deb..cabf267 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerConnector.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerConnector.java @@ -411,4 +411,6 @@ public Map<String, Object> hostdevChangeNumvfs(String deviceName, int numOfVfs); public Map<String, Object> registerSecrets(Map<String, String>[] libvirtSecrets); + + public Map<String, Object> unregisterSecrets(String[] libvirtSecretsUuids); } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerWrapper.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerWrapper.java index 9397d14..afe2f59 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerWrapper.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerWrapper.java @@ -1869,4 +1869,14 @@ } } + @Override + public StatusOnlyReturnForXmlRpc unregisterSecrets(String[] libvirtSecretsUuids) { + try { + Map<String, Object> xmlRpcReturnValue = vdsServer.unregisterSecrets(libvirtSecretsUuids); + return new StatusOnlyReturnForXmlRpc(xmlRpcReturnValue); + } catch (UndeclaredThrowableException ute) { + throw new XmlRpcRunTimeException(ute); + } + } + } -- To view, visit https://gerrit.ovirt.org/41559 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib27ca3e5fb5a8402650c28baf650c7d3ae7a3226 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Daniel Erez <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
