From ab91def10c22b9a19423ba91146b4262a3af9a53 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessicawang@apache.org>
Date: Fri, 2 Aug 2013 14:21:15 -0700
Subject: [PATCH] CLOUDSTACK-2569: UI > Infrastructure > zone > physical
 network > VNMC provider > fix a bug that queryAsyncJobResult API kept being
 called even after the async job was finished.

---
 .../vnmcNetworkProvider.js                    | 29 +++++--------------
 1 file changed, 7 insertions(+), 22 deletions(-)

diff --git a/ui/modules/vnmcNetworkProvider/vnmcNetworkProvider.js b/ui/modules/vnmcNetworkProvider/vnmcNetworkProvider.js
index 2e1e12e80a1..f1d22d193bc 100644
--- a/ui/modules/vnmcNetworkProvider/vnmcNetworkProvider.js
+++ b/ui/modules/vnmcNetworkProvider/vnmcNetworkProvider.js
@@ -376,15 +376,14 @@
                                                 jobid: jid
                                             },
                                             success: function (json) {
-                                                var result = json.queryasyncjobresultresponse;
+                                                var result = json.queryasyncjobresultresponse;                                                
                                                 if (result.jobstatus == 0) {
                                                     return; //Job has not completed
                                                 } else {
+                                                	clearInterval(enableVnmcProviderIntervalID);
                                                     if (result.jobstatus == 1) {
                                                         args.response.success({
-                                                            data: {
-                                                                state: 'Enabled'
-                                                            }
+                                                            data: result.jobresult.networkserviceprovider
                                                         });
                                                     } else if (result.jobstatus == 2) {
                                                         args.response.error(_s(result.jobresult.errortext));
@@ -419,13 +418,7 @@
                                 }
                             });
                         }
-                    },
-
-                    notification: {
-                        poll: function (args) {
-                            args.complete();
-                        }
-                    }
+                    }                    
                 },
 
                 disable: {
@@ -475,16 +468,14 @@
                                                 jobid: jid
                                             },
                                             success: function (json) {
-                                                var result = json.queryasyncjobresultresponse;
+                                                var result = json.queryasyncjobresultresponse;                                             
                                                 if (result.jobstatus == 0) {
                                                     return; //Job has not completed
                                                 } else {
                                                     clearInterval(disableVnmcProviderIntervalID);
                                                     if (result.jobstatus == 1) {
                                                         args.response.success({
-                                                            data: {
-                                                                state: 'Disabled'
-                                                            }
+                                                            data: result.jobresult.networkserviceprovider
                                                         });
                                                     } else if (result.jobstatus == 2) {
                                                         args.response.error(_s(result.jobresult.errortext));
@@ -519,13 +510,7 @@
                                 }
                             });
                         }
-                    },
-
-                    notification: {
-                        poll: function (args) {
-                            args.complete();
-                        }
-                    }
+                    }                    
                 }
             },
             tabs: {