Arik Hadas has uploaded a new change for review.
Change subject: temp ui
......................................................................
temp ui
Change-Id: I02fe5d8edfb98c1f6c427c863f38dd6efb87fbaf
Signed-off-by: Arik Hadas <aha...@redhat.com>
---
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmsModel.java
2 files changed, 42 insertions(+), 3 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/53/33053/1
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java
index 7dd3047..3c5336c 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java
@@ -84,8 +84,8 @@
import org.ovirt.engine.core.common.businessentities.profiles.DiskProfile;
import org.ovirt.engine.core.common.interfaces.SearchType;
import org.ovirt.engine.core.common.mode.ApplicationMode;
-import
org.ovirt.engine.core.common.queries.ArchCapabilitiesParameters.ArchCapabilitiesVerb;
import org.ovirt.engine.core.common.queries.ArchCapabilitiesParameters;
+import
org.ovirt.engine.core.common.queries.ArchCapabilitiesParameters.ArchCapabilitiesVerb;
import org.ovirt.engine.core.common.queries.CommandVersionsInfo;
import org.ovirt.engine.core.common.queries.ConfigurationValues;
import
org.ovirt.engine.core.common.queries.GetAgentFenceOptionsQueryParameters;
@@ -111,12 +111,13 @@
import org.ovirt.engine.core.common.queries.GetTagsByVmIdParameters;
import org.ovirt.engine.core.common.queries.GetVmTemplateParameters;
import
org.ovirt.engine.core.common.queries.GetVmUpdatesOnNextRunExistsParameters;
+import
org.ovirt.engine.core.common.queries.GetVmsFromExternalServerQueryParameters;
import org.ovirt.engine.core.common.queries.IdQueryParameters;
import org.ovirt.engine.core.common.queries.InterfaceAndIdQueryParameters;
import
org.ovirt.engine.core.common.queries.MultilevelAdministrationsQueriesParameters;
import org.ovirt.engine.core.common.queries.NameQueryParameters;
-import org.ovirt.engine.core.common.queries.OsQueryParameters.OsRepositoryVerb;
import org.ovirt.engine.core.common.queries.OsQueryParameters;
+import org.ovirt.engine.core.common.queries.OsQueryParameters.OsRepositoryVerb;
import org.ovirt.engine.core.common.queries.ProviderQueryParameters;
import org.ovirt.engine.core.common.queries.SearchParameters;
import org.ovirt.engine.core.common.queries.ServerParameters;
@@ -2351,6 +2352,22 @@
aQuery);
}
+ public void getVmsFromExternalServer(AsyncQuery aQuery, Guid vdsId, String
url, String username, String password) {
+ aQuery.converterCallback = new IAsyncConverter() {
+ @Override
+ public Object Convert(Object source, AsyncQuery _asyncQuery) {
+ if (source == null) {
+ return new ArrayList<VM>();
+ }
+ return source;
+ }
+ };
+
+ Frontend.getInstance().runQuery(VdcQueryType.GetVmsFromExternalServer,
+ new GetVmsFromExternalServerQueryParameters(url, username,
password),
+ aQuery);
+ }
+
public void getVmDiskList(AsyncQuery aQuery, Guid id) {
aQuery.converterCallback = new IAsyncConverter() {
@Override
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmsModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmsModel.java
index e9e004b..e56efbd 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmsModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmsModel.java
@@ -123,9 +123,31 @@
case EXPORT_DOMAIN:
onExportDomainChosen();
break;
+ case VMWARE:
+ onVmwareChosen();
+ break;
default:
ImportVmsModel.this.stopProgress();
}
+ }
+
+ private void onVmwareChosen() {
+ AsyncDataProvider.getInstance().getVmsFromExternalServer(new
AsyncQuery(this, new INewAsyncCallback() {
+ @Override
+ public void onSuccess(Object target, Object returnValue) {
+ List<VM> vms = (List<VM>) returnValue;
+ List<ExternalVm> externalVms = new ArrayList<ExternalVm>();
+ for (VM vm : vms) {
+ externalVms.add(new ExternalVm(vm));
+ }
+ ImportVmsModel.this.externalVms.setItems(externalVms);
+ ImportVmsModel.this.stopProgress();
+ }
+ }),
+ null,
+ "esx://10.35.5.45/?no_verify=1", //$NON-NLS-1$
+ "root", //$NON-NLS-1$
+ "password"); //$NON-NLS-1$
}
private void onExportDomainChosen() {
@@ -163,7 +185,7 @@
_asyncQuery1.asyncCallback = new INewAsyncCallback() {
@Override
public void onSuccess(Object model1, Object ReturnValue1) {
- List<VM> vms = (ArrayList<VM>) ((VdcQueryReturnValue)
ReturnValue1).getReturnValue();
+ List<VM> vms = ((VdcQueryReturnValue)
ReturnValue1).getReturnValue();
List<ExternalVm> externalVms = new ArrayList<ExternalVm>();
nameToVmFromExportDomain = new HashMap<String, VM>();
for (VM vm : vms) {
--
To view, visit http://gerrit.ovirt.org/33053
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I02fe5d8edfb98c1f6c427c863f38dd6efb87fbaf
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Arik Hadas <aha...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
