[GitHub] [cloudstack] blueorangutan commented on pull request #4128: Role based users in Projects
blueorangutan commented on pull request #4128: URL: https://github.com/apache/cloudstack/pull/4128#issuecomment-642448505 @Pearl1594 a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] Pearl1594 commented on pull request #4128: Role based users in Projects
Pearl1594 commented on pull request #4128: URL: https://github.com/apache/cloudstack/pull/4128#issuecomment-642448105 @blueorangutan test This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4128: Role based users in Projects
blueorangutan commented on pull request #4128: URL: https://github.com/apache/cloudstack/pull/4128#issuecomment-642447225 Packaging result: ✔centos7 ✔debian. JID-1336 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4128: Role based users in Projects
blueorangutan commented on pull request #4128: URL: https://github.com/apache/cloudstack/pull/4128#issuecomment-642434735 @Pearl1594 a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] Pearl1594 commented on pull request #4128: Role based users in Projects
Pearl1594 commented on pull request #4128: URL: https://github.com/apache/cloudstack/pull/4128#issuecomment-642434468 @blueorangutan package This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] shwstppr commented on a change in pull request #4068: Adding Centos8 Support
shwstppr commented on a change in pull request #4068:
URL: https://github.com/apache/cloudstack/pull/4068#discussion_r438561981
##
File path: python/bindir/cloud-grab-dependent-library-versions
##
@@ -27,7 +27,7 @@ def runCmd(cmds):
stdout, stderr = process.communicate()
if process.returncode != 0:
raise Exception(stderr)
-return stdout
+return stdout.decode('utf-8')
Review comment:
@GabrielBrascher centos8 has python2 as python2 python3 as python36 and
centos7 has python2 as python and python3 as python3 so I've added condition
for that in the script.
Though I'm not sure where that script is used. Could see it getting installed
https://github.com/apache/cloudstack/pull/4068/commits/41a69cb3d985b55f76d1f47b51aae34b60e61763
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [cloudstack] shwstppr removed a comment on pull request #4068: Adding Centos8 Support
shwstppr removed a comment on pull request #4068: URL: https://github.com/apache/cloudstack/pull/4068#issuecomment-631044318 @blueorangutan package This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4137: Adding VPN options for IKE version and IKE split connections.
blueorangutan commented on pull request #4137: URL: https://github.com/apache/cloudstack/pull/4137#issuecomment-642392650 @rhtyd a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] rhtyd commented on pull request #4137: Adding VPN options for IKE version and IKE split connections.
rhtyd commented on pull request #4137: URL: https://github.com/apache/cloudstack/pull/4137#issuecomment-642392359 @blueorangutan test This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4137: Adding VPN options for IKE version and IKE split connections.
blueorangutan commented on pull request #4137: URL: https://github.com/apache/cloudstack/pull/4137#issuecomment-642387957 Packaging result: ✔centos7 ✔debian. JID-1335 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4137: Adding VPN options for IKE version and IKE split connections.
blueorangutan commented on pull request #4137: URL: https://github.com/apache/cloudstack/pull/4137#issuecomment-642380967 @rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] rhtyd commented on pull request #4137: Adding VPN options for IKE version and IKE split connections.
rhtyd commented on pull request #4137: URL: https://github.com/apache/cloudstack/pull/4137#issuecomment-642380623 @ggoodrich-ipp np, that's why we've Travis. Yes, please send PR for Primate. @blueorangutan package This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4140: Adding showunique parameter to list templates and isos
blueorangutan commented on pull request #4140: URL: https://github.com/apache/cloudstack/pull/4140#issuecomment-642299747 Trillian test result (tid-1669) Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7 Total time taken: 34408 seconds Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr4140-t1669-kvm-centos7.zip Intermittent failure detected: /marvin/tests/smoke/test_privategw_acl.py Smoke tests completed. 76 look OK, 1 have error(s) Only failed tests results shown below: Test | Result | Time (s) | Test File --- | --- | --- | --- test_02_vpc_privategw_static_routes | `Failure` | 237.41 | test_privategw_acl.py test_03_vpc_privategw_restart_vpc_cleanup | `Failure` | 213.80 | test_privategw_acl.py test_04_rvpc_privategw_static_routes | `Failure` | 288.37 | test_privategw_acl.py This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] weizhouapache opened a new pull request #4141: [WIP] Load balancer customization (haproxy-based)
weizhouapache opened a new pull request #4141: URL: https://github.com/apache/cloudstack/pull/4141 ## Description As discussed in mailing list, create this PR for haproxy config customization. It supports (or will support) - Basic haproxy configurations: haproxy statistics uri, auth, enable/disable global maxconn and maxpipes - Basic configurations on rule timeout connection, client ,server globally and per rule http, httpalive per rule maxconn, fullconn per rule maxconn, minconn, maxqueue per server in rule - advanced features transparent load balancer SSL offloading http2 support Variable SSL configurations ## Types of changes - [ ] Breaking change (fix or feature that would cause existing functionality to change) - [X] New feature (non-breaking change which adds functionality) - [ ] Bug fix (non-breaking change which fixes an issue) - [ ] Enhancement (improves an existing feature and functionality) - [ ] Cleanup (Code refactoring and cleanup, that may add test cases) ## Screenshots (if appropriate): ## How Has This Been Tested? This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4068: Adding Centos8 Support
blueorangutan commented on pull request #4068: URL: https://github.com/apache/cloudstack/pull/4068#issuecomment-642173939 Packaging result: ✔centos7 ✔debian. JID-1334 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] ggoodrich-ipp commented on pull request #4137: Adding VPN options for IKE version and IKE split connections.
ggoodrich-ipp commented on pull request #4137: URL: https://github.com/apache/cloudstack/pull/4137#issuecomment-642102847 @rhtyd I've fixed the python lint issue. I apologize, I didn't realize there were linting rules on that. @svenvogel I made the change you requested to the German translation. I will be evaluating the changes necessary for primate. We pushed this PR largely due to the issue #3138, as we have been using this change in our environment for some time, so I dug up the commit from our local repo. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4138: Fixed incorrect error message on invalid template type download
blueorangutan commented on pull request #4138: URL: https://github.com/apache/cloudstack/pull/4138#issuecomment-642030628 @Spaceman1984 a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] Spaceman1984 commented on pull request #4138: Fixed incorrect error message on invalid template type download
Spaceman1984 commented on pull request #4138: URL: https://github.com/apache/cloudstack/pull/4138#issuecomment-642029807 @blueorangutan test This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4138: Fixed incorrect error message on invalid template type download
blueorangutan commented on pull request #4138: URL: https://github.com/apache/cloudstack/pull/4138#issuecomment-642028871 Packaging result: ✔centos7 ✔debian. JID-1333 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4138: Fixed incorrect error message on invalid template type download
blueorangutan commented on pull request #4138: URL: https://github.com/apache/cloudstack/pull/4138#issuecomment-642015982 @Spaceman1984 a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] Spaceman1984 commented on pull request #4138: Fixed incorrect error message on invalid template type download
Spaceman1984 commented on pull request #4138: URL: https://github.com/apache/cloudstack/pull/4138#issuecomment-642015660 @blueorangutan package This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4140: Adding showunique parameter to list templates and isos
blueorangutan commented on pull request #4140: URL: https://github.com/apache/cloudstack/pull/4140#issuecomment-641966829 @davidjumani a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] davidjumani commented on pull request #4140: Adding showunique parameter to list templates and isos
davidjumani commented on pull request #4140: URL: https://github.com/apache/cloudstack/pull/4140#issuecomment-641966078 @blueorangutan test This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4140: Adding showunique parameter to list templates and isos
blueorangutan commented on pull request #4140: URL: https://github.com/apache/cloudstack/pull/4140#issuecomment-641965660 Packaging result: ✔centos7 ✔debian. JID-1332 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4140: Adding showunique parameter to list templates and isos
blueorangutan commented on pull request #4140: URL: https://github.com/apache/cloudstack/pull/4140#issuecomment-641956086 @davidjumani a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] davidjumani opened a new pull request #4140: Adding showunique parameter to list templates and isos
davidjumani opened a new pull request #4140: URL: https://github.com/apache/cloudstack/pull/4140 ## Description Adds a new parameter `showunique` to listTemplate and listIsos to return only unique templates / isos across all zones Fixes #4041 ## Types of changes - [ ] Breaking change (fix or feature that would cause existing functionality to change) - [ ] New feature (non-breaking change which adds functionality) - [ ] Bug fix (non-breaking change which fixes an issue) - [x] Enhancement (improves an existing feature and functionality) - [ ] Cleanup (Code refactoring and cleanup, that may add test cases) This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] davidjumani commented on pull request #4140: Adding showunique parameter to list templates and isos
davidjumani commented on pull request #4140: URL: https://github.com/apache/cloudstack/pull/4140#issuecomment-641955817 @blueorangutan package This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] davidjumani closed pull request #4139: Adding showunique parameter to list templates and isos
davidjumani closed pull request #4139: URL: https://github.com/apache/cloudstack/pull/4139 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4139: Adding showunique parameter to list templates and isos
blueorangutan commented on pull request #4139: URL: https://github.com/apache/cloudstack/pull/4139#issuecomment-641948916 Packaging result: ✖centos7 ✖debian. JID-1331 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] Spaceman1984 commented on a change in pull request #4138: Fixed incorrect error message on invalid template type download
Spaceman1984 commented on a change in pull request #4138:
URL: https://github.com/apache/cloudstack/pull/4138#discussion_r438056979
##
File path:
core/src/main/java/com/cloud/storage/template/HttpTemplateDownloader.java
##
@@ -218,7 +218,10 @@ public long download(boolean resume,
DownloadCompleteCallback callback) {
errorString = hte.getMessage();
} catch (IOException ioe) {
status = TemplateDownloader.Status.UNRECOVERABLE_ERROR; //probably
a file write error?
-errorString = ioe.getMessage();
+// Let's not overwrite the original error message.
+if (errorString.isEmpty()){
Review comment:
You are correct @DaanHoogland, I have made the change.
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4139: Adding showunique parameter to list templates and isos
blueorangutan commented on pull request #4139: URL: https://github.com/apache/cloudstack/pull/4139#issuecomment-641944899 @davidjumani a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] davidjumani commented on pull request #4139: Adding showunique parameter to list templates and isos
davidjumani commented on pull request #4139: URL: https://github.com/apache/cloudstack/pull/4139#issuecomment-641944511 @blueorangutan package This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] davidjumani commented on pull request #4139: Adding showunique parameter to list templates and isos
davidjumani commented on pull request #4139: URL: https://github.com/apache/cloudstack/pull/4139#issuecomment-641935360 @rhtyd Tested and working fine locally. Ready to go! This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] davidjumani opened a new pull request #4139: Adding showunique parameter to list templates and isos
davidjumani opened a new pull request #4139: URL: https://github.com/apache/cloudstack/pull/4139 ## Description Adds a new parameter `showunique` to listTemplate and listIsos to return only unique templates / isos across all zones Fixes #4041 ## Types of changes - [ ] Breaking change (fix or feature that would cause existing functionality to change) - [ ] New feature (non-breaking change which adds functionality) - [ ] Bug fix (non-breaking change which fixes an issue) - [x] Enhancement (improves an existing feature and functionality) - [ ] Cleanup (Code refactoring and cleanup, that may add test cases) This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] DaanHoogland commented on a change in pull request #4138: Fixed incorrect error message on invalid template type download
DaanHoogland commented on a change in pull request #4138:
URL: https://github.com/apache/cloudstack/pull/4138#discussion_r438040173
##
File path:
core/src/main/java/com/cloud/storage/template/HttpTemplateDownloader.java
##
@@ -218,7 +218,10 @@ public long download(boolean resume,
DownloadCompleteCallback callback) {
errorString = hte.getMessage();
} catch (IOException ioe) {
status = TemplateDownloader.Status.UNRECOVERABLE_ERROR; //probably
a file write error?
-errorString = ioe.getMessage();
+// Let's not overwrite the original error message.
+if (errorString.isEmpty()){
Review comment:
errorString contains a single space initially. String.isEmpty returns
(this.value.length == 0)
so this is never happening.
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4138: Fixed incorrect error message on invalid template type download
blueorangutan commented on pull request #4138: URL: https://github.com/apache/cloudstack/pull/4138#issuecomment-641891176 @Spaceman1984 a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] Spaceman1984 commented on pull request #4138: Fixed incorrect error message on invalid template type download
Spaceman1984 commented on pull request #4138: URL: https://github.com/apache/cloudstack/pull/4138#issuecomment-641890461 @blueorangutan test This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4138: Fixed incorrect error message on invalid template type download
blueorangutan commented on pull request #4138: URL: https://github.com/apache/cloudstack/pull/4138#issuecomment-641888270 Packaging result: ✔centos7 ✔debian. JID-1330 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4138: Fixed incorrect error message on invalid template type download
blueorangutan commented on pull request #4138: URL: https://github.com/apache/cloudstack/pull/4138#issuecomment-641876771 @Spaceman1984 a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] Spaceman1984 commented on pull request #4138: Fixed incorrect error message on invalid template type download
Spaceman1984 commented on pull request #4138: URL: https://github.com/apache/cloudstack/pull/4138#issuecomment-641875909 @blueorangutan package This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] Spaceman1984 opened a new pull request #4138: Fixed incorrect error message on invalid template type download
Spaceman1984 opened a new pull request #4138: URL: https://github.com/apache/cloudstack/pull/4138 ## Description When a template is downloaded, the first 1MB of the template is validated to determine if the template is of correct file type. On failure, the download is aborted and the input stream is set to null. This leads to a second error when the try-with-resources block tries to auto-close the stream and throws an ioexception. The "stream closed" error message is then written to the db. This PR checks if an error has been stored before setting a new error message. Cleanup code is also added for when template sync runs to remove the dead template. Fixes: #4127 ## Types of changes - [ ] Breaking change (fix or feature that would cause existing functionality to change) - [ ] New feature (non-breaking change which adds functionality) - [x] Bug fix (non-breaking change which fixes an issue) - [ ] Enhancement (improves an existing feature and functionality) - [x] Cleanup (Code refactoring and cleanup, that may add test cases) ## Screenshots (if appropriate): ## How Has This Been Tested? This has been tested by downloading an invalid template and checking the error message from the UI or in cloud.template_store_ref.error_str in the db. The cleanup has been tested by restarting the management server to trigger template sync to verify if the dead template has been removed. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[cloudstack-primate] branch master updated: dashboard: refresh on project change, fix project handlers
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack-primate.git
The following commit(s) were added to refs/heads/master by this push:
new a783141 dashboard: refresh on project change, fix project handlers
a783141 is described below
commit a7831413c6fe3cb1a650b41229dcfcc9f6a31584
Author: Rohit Yadav
AuthorDate: Wed Jun 10 13:39:30 2020 +0530
dashboard: refresh on project change, fix project handlers
Signed-off-by: Rohit Yadav
---
src/components/header/ProjectMenu.vue | 17 +
src/store/modules/user.js | 2 +-
src/views/dashboard/Dashboard.vue | 11 +++
src/views/dashboard/UsageDashboard.vue | 8
4 files changed, 29 insertions(+), 9 deletions(-)
diff --git a/src/components/header/ProjectMenu.vue
b/src/components/header/ProjectMenu.vue
index bddbf3f..25c6c23 100644
--- a/src/components/header/ProjectMenu.vue
+++ b/src/components/header/ProjectMenu.vue
@@ -20,7 +20,7 @@
{{ $t('label.projects') }}
-
+
+
+
+
@@ -49,7 +52,8 @@ export default {
name: 'ProjectMenu',
data () {
return {
- projects: []
+ projects: [],
+ loading: false
}
},
mounted () {
@@ -62,6 +66,7 @@ export default {
}
var page = 1
const getNextPage = () => {
+this.loading = true
api('listProjects', { listAll: true, details: 'min', page: page,
pageSize: 500 }).then(json => {
if (page === 1) {
this.projects = [{ name: 'Default View' }]
@@ -73,6 +78,8 @@ export default {
page++
getNextPage()
}
+}).finally(() => {
+ this.loading = false
})
}
getNextPage()
@@ -85,7 +92,9 @@ export default {
this.$store.dispatch('SetProject', project)
this.$store.dispatch('ToggleTheme', project.id === undefined ? 'light' :
'dark')
this.$message.success(`Switched to "${project.name}"`)
- this.$router.push({ name: 'dashboard' })
+ if (this.$route.name !== 'dashboard') {
+this.$router.push({ name: 'dashboard' })
+ }
},
filterProject (input, option) {
return
option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase())
>= 0
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index ad7497c..10c56db 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -42,7 +42,7 @@ const user = {
SET_TOKEN: (state, token) => {
state.token = token
},
-SET_PROJECT: (state, project) => {
+SET_PROJECT: (state, project = {}) => {
Vue.ls.set(CURRENT_PROJECT, project)
state.project = project
},
diff --git a/src/views/dashboard/Dashboard.vue
b/src/views/dashboard/Dashboard.vue
index 0147b4f..8f86c67 100644
--- a/src/views/dashboard/Dashboard.vue
+++ b/src/views/dashboard/Dashboard.vue
@@ -45,14 +45,17 @@ export default {
},
mounted () {
this.showCapacityDashboard =
Object.prototype.hasOwnProperty.call(store.getters.apis, 'listCapacity')
-this.project = store.getters.project !== undefined &&
store.getters.project.id !== undefined
+this.project = false
+if (store.getters.project && store.getters.project.id) {
+ this.project = true
+}
this.$store.watch(
(state, getters) => getters.project,
(newValue, oldValue) => {
-if (newValue === undefined || newValue.id === undefined) {
- this.project = false
-} else {
+if (newValue && newValue.id) {
this.project = true
+} else {
+ this.project = false
}
}
)
diff --git a/src/views/dashboard/UsageDashboard.vue
b/src/views/dashboard/UsageDashboard.vue
index 6bba43b..f3f8c16 100644
--- a/src/views/dashboard/UsageDashboard.vue
+++ b/src/views/dashboard/UsageDashboard.vue
@@ -122,6 +122,14 @@ export default {
mounted () {
this.project = store.getters.project
this.fetchData()
+this.$store.watch(
+ (state, getters) => getters.project,
+ (newValue, oldValue) => {
+if (newValue && newValue.id) {
+ this.fetchData()
+}
+ }
+)
},
watch: {
'$route' (to, from) {
[GitHub] [cloudstack] blueorangutan commented on pull request #4131: Health Checkplease don't merge this
blueorangutan commented on pull request #4131: URL: https://github.com/apache/cloudstack/pull/4131#issuecomment-641796213 Trillian test result (tid-1664) Environment: xenserver-71 (x2), Advanced Networking with Mgmt server 7 Total time taken: 59269 seconds Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr4131-t1664-xenserver-71.zip Intermittent failure detected: /marvin/tests/smoke/test_kubernetes_clusters.py Intermittent failure detected: /marvin/tests/smoke/test_scale_vm.py Intermittent failure detected: /marvin/tests/smoke/test_vpc_redundant.py Smoke tests completed. 80 look OK, 3 have error(s) Only failed tests results shown below: Test | Result | Time (s) | Test File --- | --- | --- | --- test_02_deploy_kubernetes_ha_cluster | `Error` | 3617.91 | test_kubernetes_clusters.py test_04_deploy_and_upgrade_kubernetes_cluster | `Error` | 0.03 | test_kubernetes_clusters.py test_05_deploy_and_upgrade_kubernetes_ha_cluster | `Error` | 0.03 | test_kubernetes_clusters.py test_06_deploy_and_invalid_upgrade_kubernetes_cluster | `Error` | 0.03 | test_kubernetes_clusters.py test_07_deploy_and_scale_kubernetes_cluster | `Error` | 0.03 | test_kubernetes_clusters.py ContextSuite context=TestKubernetesCluster>:teardown | `Error` | 45.78 | test_kubernetes_clusters.py test_01_scale_vm | `Failure` | 19.51 | test_scale_vm.py test_03_create_redundant_VPC_1tier_2VMs_2IPs_2PF_ACL_reboot_routers | `Failure` | 419.61 | test_vpc_redundant.py This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
