Gilad Chaplik has uploaded a new change for review.

Change subject: webadmin: fix cpu profile changes for import
......................................................................

webadmin: fix cpu profile changes for import

When importing vm/template and changing cluster didn't
change corresponding cpu profile.

Change-Id: Ia524e72fcff6d3cc655e6aee9f078b9365faaba3
Bug-Url: https://bugzilla.redhat.com/1168532
Signed-off-by: Gilad Chaplik <[email protected]>
---
M 
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmFromExportDomainModel.java
1 file changed, 19 insertions(+), 18 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/31/35931/1

diff --git 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmFromExportDomainModel.java
 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmFromExportDomainModel.java
index 9455ef8..652cd3d 100644
--- 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmFromExportDomainModel.java
+++ 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmFromExportDomainModel.java
@@ -139,7 +139,8 @@
 
         @Override
         public void eventRaised(Event<? extends EventArgs> ev, Object sender, 
EventArgs args) {
-            
Frontend.getInstance().runQuery(VdcQueryType.GetAllRelevantQuotasForVdsGroup,
+            if (hasQuota) {
+                
Frontend.getInstance().runQuery(VdcQueryType.GetAllRelevantQuotasForVdsGroup,
                     new IdQueryParameters(((VDSGroup) 
getCluster().getSelectedItem()).getId()),
                     new AsyncQuery(ImportVmFromExportDomainModel.this,
                             new INewAsyncCallback() {
@@ -162,6 +163,8 @@
                                     }
                                 }
                             }));
+            }
+            fetchCpuProfiles(((VDSGroup) 
getCluster().getSelectedItem()).getId());
         }
     };
 
@@ -218,8 +221,8 @@
                }
                if (hasQuota) {
                    getClusterQuota().setIsAvailable(true);
-                   
getCluster().getSelectedItemChangedEvent().addListener(quotaClusterListener);
                }
+               
getCluster().getSelectedItemChangedEvent().addListener(clusterChangedListener);
                // get cluster
                if (dataCenter != null) {
                    AsyncDataProvider.getInstance().getClusterByServiceList(new 
AsyncQuery(ImportVmFromExportDomainModel.this, new INewAsyncCallback() {
@@ -267,23 +270,7 @@
 
                                    }),
                                    getStoragePool().getId());
-
-                           fetchCpuProfiles(cluster.getId());
                        }
-
-                    private void fetchCpuProfiles(Guid clusterId) {
-                        
Frontend.getInstance().runQuery(VdcQueryType.GetCpuProfilesByClusterId,
-                                new IdQueryParameters(clusterId),
-                                new AsyncQuery(new INewAsyncCallback() {
-
-                                    @Override
-                                    public void onSuccess(Object model, Object 
returnValue) {
-                                        List<CpuProfile> cpuProfiles =
-                                                (List<CpuProfile>) 
((VdcQueryReturnValue) returnValue).getReturnValue();
-                                        getCpuProfiles().setItems(cpuProfiles);
-                                    }
-                                }));
-                    }
 
                    }),
                            dataCenter.getId(), true, false);
@@ -293,6 +280,20 @@
                storageDomainId);
     }
 
+    private void fetchCpuProfiles(Guid clusterId) {
+        Frontend.getInstance().runQuery(VdcQueryType.GetCpuProfilesByClusterId,
+                new IdQueryParameters(clusterId),
+                new AsyncQuery(new INewAsyncCallback() {
+                    
+                    @Override
+                    public void onSuccess(Object model, Object returnValue) {
+                        List<CpuProfile> cpuProfiles =
+                                (List<CpuProfile>) ((VdcQueryReturnValue) 
returnValue).getReturnValue();
+                        getCpuProfiles().setItems(cpuProfiles);
+                    }
+                }));
+    }
+
     private void initQuotaForStorageDomains() {
         ArrayList<VdcQueryType> queryTypeList = new ArrayList<VdcQueryType>();
         ArrayList<VdcQueryParametersBase> queryParamsList =


-- 
To view, visit http://gerrit.ovirt.org/35931
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia524e72fcff6d3cc655e6aee9f078b9365faaba3
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Gilad Chaplik <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to