[GitHub] blueorangutan commented on issue #2576: Fix Python code checkstyle execute by "systemvm\test\runtests.sh"
blueorangutan commented on issue #2576: Fix Python code checkstyle execute by "systemvm\test\runtests.sh" URL: https://github.com/apache/cloudstack/pull/2576#issuecomment-381868051 @rafaelweingartner 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 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 With regards, Apache Git Services
[GitHub] rafaelweingartner commented on issue #2576: Fix Python code checkstyle execute by "systemvm\test\runtests.sh"
rafaelweingartner commented on issue #2576: Fix Python code checkstyle execute by "systemvm\test\runtests.sh" URL: https://github.com/apache/cloudstack/pull/2576#issuecomment-381781382 @DaanHoogland, @rhtyd, @wido and others Python gurus. Can you guys take a look at this PR? Today, while working on #2574 I noticed some odd problems that were happening with a single Travis test. The error always appeared with the test "test_certauthority_root". However, the problem is not related to both my code and the test python code. It looks like some of the libraries that we install at the beginning of the Travis execution were updated and started causing problems. I am not a Python savvy, so I cannot explain why I needed to apply the changes I did. I basically googled the problems and applied the suggested solutions. Among the things I needed to code, there are changes related to indentations and one extra line that the “pep8” wanted. This is an automated message from the Apache Git Service. To respond to the message, please log on 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 With regards, Apache Git Services
[GitHub] GabrielBrascher commented on issue #2524: [CLOUDSTACK-9261] Upgrate jQuery-UI to 1.11 (JQuery UI 1.8.4 prone to XSS)
GabrielBrascher commented on issue #2524: [CLOUDSTACK-9261] Upgrate jQuery-UI to 1.11 (JQuery UI 1.8.4 prone to XSS) URL: https://github.com/apache/cloudstack/pull/2524#issuecomment-381739698 I spent some time testing it in a test environment and it seems to be all good. However, two buttons need some attention: (i) 'About' button: here the user cannot get out of the info screen unless clicking on some button as the 'add instance' (or a respective button in another view, as the 'add network offering', 'add' a template, ...). ![image](https://user-images.githubusercontent.com/5025148/38833088-e91593de-419a-11e8-8a6d-33f2ad289e11.png) (ii) 'Add network offering' button on Home > Service Offerings - Network Offerings: in this case, the add network offering view requires a scroll down from the user. ![image](https://user-images.githubusercontent.com/5025148/38833181-2fbe754e-419b-11e8-98b4-cbdb2ae25869.png) It should be something like the 'Add compute offering': ![image](https://user-images.githubusercontent.com/5025148/38833485-0eb45eda-419c-11e8-9ac5-687d46f8be1e.png) Thanks for the PR @rafaelweingartner . So far these are the points that I could raise in my test environment. This is an automated message from the Apache Git Service. To respond to the message, please log on 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 With regards, Apache Git Services
[GitHub] GabrielBrascher commented on issue #2524: [CLOUDSTACK-9261] Upgrate jQuery-UI to 1.11 (JQuery UI 1.8.4 prone to XSS)
GabrielBrascher commented on issue #2524: [CLOUDSTACK-9261] Upgrate jQuery-UI to 1.11 (JQuery UI 1.8.4 prone to XSS) URL: https://github.com/apache/cloudstack/pull/2524#issuecomment-381739698 I spent some time testing it in a test environment and seems to be all good. However, two buttons need some attention: (i) 'About' button: here the user cannot get out of the info screen unless clicking on some button as the 'add instance' (or a respective button in another view, as the 'add network offering', 'add' a template, ...). ![image](https://user-images.githubusercontent.com/5025148/38833088-e91593de-419a-11e8-8a6d-33f2ad289e11.png) (ii) 'Add network offering' button on Home > Service Offerings - Network Offerings: in this case, the add network offering view requires a scroll down from the user. ![image](https://user-images.githubusercontent.com/5025148/38833181-2fbe754e-419b-11e8-98b4-cbdb2ae25869.png) It should be something like the 'Add compute offering': ![image](https://user-images.githubusercontent.com/5025148/38833485-0eb45eda-419c-11e8-9ac5-687d46f8be1e.png) Thanks for the PR @rafaelweingartner . So far these are the points that I could raise in my test environment. This is an automated message from the Apache Git Service. To respond to the message, please log on 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 With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2576: Fix Python code checkstyle execute by "systemvm\test\runtests.sh"
blueorangutan commented on issue #2576: Fix Python code checkstyle execute by "systemvm\test\runtests.sh" URL: https://github.com/apache/cloudstack/pull/2576#issuecomment-381713917 Packaging result: ✔centos6 ✔centos7 ✔debian. JID-1935 This is an automated message from the Apache Git Service. To respond to the message, please log on 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 With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2576: Fix Python code checkstyle execute by "systemvm\test\runtests.sh"
blueorangutan commented on issue #2576: Fix Python code checkstyle execute by "systemvm\test\runtests.sh" URL: https://github.com/apache/cloudstack/pull/2576#issuecomment-381705772 @rafaelweingartner 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 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 With regards, Apache Git Services
[GitHub] rafaelweingartner opened a new pull request #2576: Fix Python code checkstyle execute by "systemvm\test\runtests.sh"
rafaelweingartner opened a new pull request #2576: Fix Python code checkstyle execute by "systemvm\test\runtests.sh" URL: https://github.com/apache/cloudstack/pull/2576 ## Description I noticed a failure in travis for PR #2574 relating to Python code check style. While investigating that error, I found out that when running `cloudstack/systemvm/test/runtests.sh` I was receiving the following errors: ``` [root@AcsBuildVm test]# ./runtests.sh Running pep8 to check systemvm/python code for errors ../debian/opt/cloud/bin/configure.py:199:33: E126 continuation line over-indented for hanging indent ../debian/opt/cloud/bin/configure.py:207:37: E126 continuation line over-indented for hanging indent ../debian/opt/cloud/bin/configure.py:210:28: E121 continuation line indentation is not a multiple of four ../debian/opt/cloud/bin/configure.py:817:17: E121 continuation line indentation is not a multiple of four ../debian/opt/cloud/bin/configure.py:818:17: E121 continuation line indentation is not a multiple of four ../debian/opt/cloud/bin/configure.py:819:17: E121 continuation line indentation is not a multiple of four ../debian/opt/cloud/bin/configure.py:820:17: E121 continuation line indentation is not a multiple of four ../debian/opt/cloud/bin/configure.py:821:17: E121 continuation line indentation is not a multiple of four ../debian/opt/cloud/bin/configure.py:822:17: E121 continuation line indentation is not a multiple of four ../debian/opt/cloud/bin/configure.py:823:17: E121 continuation line indentation is not a multiple of four ../debian/opt/cloud/bin/configure.py:827:17: E121 continuation line indentation is not a multiple of four ../debian/opt/cloud/bin/configure.py:828:17: E121 continuation line indentation is not a multiple of four ../debian/opt/cloud/bin/configure.py:829:17: E121 continuation line indentation is not a multiple of four ../debian/opt/cloud/bin/configure.py:830:17: E121 continuation line indentation is not a multiple of four ../debian/opt/cloud/bin/configure.py:831:17: E121 continuation line indentation is not a multiple of four ../debian/opt/cloud/bin/configure.py:832:17: E121 continuation line indentation is not a multiple of four ../debian/opt/cloud/bin/configure.py:833:17: E121 continuation line indentation is not a multiple of four ../debian/opt/cloud/bin/configure.py:837:17: E121 continuation line indentation is not a multiple of four ../debian/opt/cloud/bin/configure.py:838:17: E121 continuation line indentation is not a multiple of four ../debian/opt/cloud/bin/configure.py:839:17: E121 continuation line indentation is not a multiple of four ../debian/opt/cloud/bin/configure.py:840:17: E121 continuation line indentation is not a multiple of four ../debian/opt/cloud/bin/configure.py:841:17: E121 continuation line indentation is not a multiple of four ../debian/opt/cloud/bin/configure.py:842:17: E121 continuation line indentation is not a multiple of four ../debian/opt/cloud/bin/configure.py:846:17: E121 continuation line indentation is not a multiple of four ../debian/opt/cloud/bin/configure.py:847:17: E121 continuation line indentation is not a multiple of four ../debian/opt/cloud/bin/configure.py:848:17: E121 continuation line indentation is not a multiple of four ../debian/opt/cloud/bin/configure.py:849:17: E121 continuation line indentation is not a multiple of four ../debian/opt/cloud/bin/configure.py:850:17: E121 continuation line indentation is not a multiple of four ../debian/opt/cloud/bin/configure.py:851:17: E121 continuation line indentation is not a multiple of four ../debian/opt/cloud/bin/configure.py:852:17: E121 continuation line indentation is not a multiple of four ../debian/opt/cloud/bin/configure.py:856:17: E121 continuation line indentation is not a multiple of four ../debian/opt/cloud/bin/configure.py:857:17: E121 continuation line indentation is not a multiple of four ../debian/opt/cloud/bin/configure.py:858:17: E121 continuation line indentation is not a multiple of four ../debian/opt/cloud/bin/configure.py:859:17: E121 continuation line indentation is not a multiple of four ../debian/opt/cloud/bin/configure.py:860:17: E121 continuation line indentation is not a multiple of four ../debian/opt/cloud/bin/configure.py:861:17: E121 continuation line indentation is not a multiple of four ../debian/opt/cloud/bin/configure.py:865:17: E121 continuation line indentation is not a multiple of four ../debian/opt/cloud/bin/configure.py:866:17: E121 continuation line indentation is not a multiple of four ../debian/opt/cloud/bin/configure.py:867:17: E121 continuation line indentation is not a multiple of four ../debian/opt/cloud/bin/configure.py:868:17: E121 continuation line indentation is not a multiple of four ../debian/opt/cloud/bin/configure.py:869:17: E121 continuation line indentation
[GitHub] blueorangutan commented on issue #2574: [CLOUDSTACK-5235] ask users old password when they are executing a password update
blueorangutan commented on issue #2574: [CLOUDSTACK-5235] ask users old password when they are executing a password update URL: https://github.com/apache/cloudstack/pull/2574#issuecomment-381681349 Packaging result: ✔centos6 ✔centos7 ✔debian. JID-1934 This is an automated message from the Apache Git Service. To respond to the message, please log on 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 With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2574: [CLOUDSTACK-5235] ask users old password when they are executing a password update
blueorangutan commented on issue #2574: [CLOUDSTACK-5235] ask users old password when they are executing a password update URL: https://github.com/apache/cloudstack/pull/2574#issuecomment-381672665 @rafaelweingartner 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 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 With regards, Apache Git Services
[GitHub] rafaelweingartner commented on issue #2574: [CLOUDSTACK-5235] ask users old password when they are executing a password update
rafaelweingartner commented on issue #2574: [CLOUDSTACK-5235] ask users old password when they are executing a password update URL: https://github.com/apache/cloudstack/pull/2574#issuecomment-381672017 @blueorangutan package This is an automated message from the Apache Git Service. To respond to the message, please log on 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 With regards, Apache Git Services
[GitHub] MartinEmrich commented on issue #2561: cloud-early-config detects unknown hypervisor type "xen-domU"
MartinEmrich commented on issue #2561: cloud-early-config detects unknown hypervisor type "xen-domU" URL: https://github.com/apache/cloudstack/issues/2561#issuecomment-381661246 I wiped everything and started over: Install 4.9.2.0 with some test VMs, Upgrade to 4.11.0-SNAPSHOT with the systemvm template from @rhtyd. I registered the System VM template as Debian 7, with no checkboxes except "HVM" (the default selection). After clicking "Update", the new systemVMs this time come up as paravirtualized, but the UI still shows them as 4.6.0 in state "Starting" This is an automated message from the Apache Git Service. To respond to the message, please log on 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 With regards, Apache Git Services
[GitHub] lujiefsi commented on a change in pull request #2573: Cloudstack 10356
lujiefsi commented on a change in pull request #2573: Cloudstack 10356 URL: https://github.com/apache/cloudstack/pull/2573#discussion_r181792497 ## File path: plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java ## @@ -2337,8 +2337,9 @@ public int compare(final DiskTO arg0, final DiskTO arg1) { disk.setCacheMode(DiskDef.DiskCacheMode.valueOf(volumeObjectTO.getCacheMode().toString().toUpperCase())); } } - -vm.getDevices().addDevice(disk); +if (vm.getDevices() != null) { Review comment: i got, the exception stack can help us where error happens accurately . This is an automated message from the Apache Git Service. To respond to the message, please log on 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 With regards, Apache Git Services
[cloudstack-cloudmonkey] branch master updated: cmk: fix presentational issues
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-cloudmonkey.git The following commit(s) were added to refs/heads/master by this push: new e83ce7f cmk: fix presentational issues e83ce7f is described below commit e83ce7f96896b48ca13eb0c691caecd1fc8660d4 Author: Rohit Yadav AuthorDate: Mon Apr 16 21:20:16 2018 +0530 cmk: fix presentational issues Signed-off-by: Rohit Yadav --- cli/completer.go | 10 + cmd/api.go | 2 +- cmd/help.go | 8 +-- cmd/network.go | 5 ++--- config/config.go | 65 ++-- 5 files changed, 55 insertions(+), 35 deletions(-) diff --git a/cli/completer.go b/cli/completer.go index 8ade3f6..2444fd2 100644 --- a/cli/completer.go +++ b/cli/completer.go @@ -174,17 +174,18 @@ func (t *autoCompleter) Do(line []rune, pos int) (options [][]rune, offset int) return } + argName := strings.Replace(arg.Name, "=", "", -1) var autocompleteAPI *config.API var relatedNoun string - if arg.Name == "id=" || arg.Name == "ids=" { + if argName == "id" || argName == "ids" { relatedNoun = apiFound.Noun if apiFound.Verb != "list" { relatedNoun += "s" } - } else if arg.Name == "account=" { + } else if argName == "account" { relatedNoun = "accounts" } else { - relatedNoun = strings.Replace(strings.Replace(arg.Name, "ids=", "", -1), "id=", "", -1) + "s" + relatedNoun = strings.Replace(strings.Replace(argName, "ids", "", -1), "id", "", -1) + "s" } for _, related := range apiMap["list"] { if relatedNoun == related.Noun { @@ -202,7 +203,9 @@ func (t *autoCompleter) Do(line []rune, pos int) (options [][]rune, offset int) if autocompleteAPI.Noun == "templates" { autocompleteAPIArgs = append(autocompleteAPIArgs, "templatefilter=all") } + fmt.Printf("\nFetching options, please wait...") response, _ := cmd.NewAPIRequest(r, autocompleteAPI.Name, autocompleteAPIArgs) + fmt.Printf("\r") var autocompleteOptions []selectOption for _, v := range response { @@ -240,7 +243,6 @@ func (t *autoCompleter) Do(line []rune, pos int) (options [][]rune, offset int) sort.Slice(autocompleteOptions, func(i, j int) bool { return autocompleteOptions[i].Name < autocompleteOptions[j].Name }) - fmt.Println() selectedOption := showSelector(autocompleteOptions) if strings.HasSuffix(arg.Name, "id=") || strings.HasSuffix(arg.Name, "ids=") { selected = selectedOption.ID diff --git a/cmd/api.go b/cmd/api.go index 47a0f0f..215e58c 100644 --- a/cmd/api.go +++ b/cmd/api.go @@ -68,7 +68,7 @@ func init() { } } if !provided { - missingArgs = append(missingArgs, required) + missingArgs = append(missingArgs, strings.Replace(required, "=", "", -1)) } } diff --git a/cmd/help.go b/cmd/help.go index dc31e51..d027510 100644 --- a/cmd/help.go +++ b/cmd/help.go @@ -45,14 +45,18 @@ func init() { fmt.Println("This API is \033[35masynchronous\033[0m.") } if len(api.RequiredArgs) > 0 { - fmt.Println("Required params:", strings.Join(api.RequiredArgs, ", ")) + fmt.Printf("Required params: ") + for _, requiredArg := range api.RequiredArgs { + fmt.Printf("%s, ", strings.Replace(requiredArg, "=", "", -1)) + } + fmt.Println() } if len(api.Args) > 0 { fmt.Printf("%-24s %-8s %s\n", "API Params", "Type", "Description") fmt.Printf("%-24s %-8s %s\n", "==", "", "==
[GitHub] rafaelweingartner commented on a change in pull request #2573: Cloudstack 10356
rafaelweingartner commented on a change in pull request #2573: Cloudstack 10356 URL: https://github.com/apache/cloudstack/pull/2573#discussion_r181790641 ## File path: engine/schema/src/main/java/com/cloud/configuration/dao/ResourceCountDaoImpl.java ## @@ -126,8 +126,10 @@ public void updateDomainCount(long domainId, ResourceType type, boolean incremen delta = increment ? delta : delta * -1; ResourceCountVO resourceCountVO = findByOwnerAndType(domainId, ResourceOwnerType.Domain, type); -resourceCountVO.setCount(resourceCountVO.getCount() + delta); -update(resourceCountVO.getId(), resourceCountVO); +if (resourceCountVO != null) { Review comment: Yes. If it is not used. So, it is better to delete it. This is an automated message from the Apache Git Service. To respond to the message, please log on 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 With regards, Apache Git Services
[GitHub] lujiefsi commented on a change in pull request #2573: Cloudstack 10356
lujiefsi commented on a change in pull request #2573: Cloudstack 10356 URL: https://github.com/apache/cloudstack/pull/2573#discussion_r181790224 ## File path: engine/schema/src/main/java/com/cloud/configuration/dao/ResourceCountDaoImpl.java ## @@ -126,8 +126,10 @@ public void updateDomainCount(long domainId, ResourceType type, boolean incremen delta = increment ? delta : delta * -1; ResourceCountVO resourceCountVO = findByOwnerAndType(domainId, ResourceOwnerType.Domain, type); -resourceCountVO.setCount(resourceCountVO.getCount() + delta); -update(resourceCountVO.getId(), resourceCountVO); +if (resourceCountVO != null) { Review comment: hum, you mean delete the updateDomainCount ? This is an automated message from the Apache Git Service. To respond to the message, please log on 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 With regards, Apache Git Services
[GitHub] rafaelweingartner commented on a change in pull request #2573: Cloudstack 10356
rafaelweingartner commented on a change in pull request #2573: Cloudstack 10356 URL: https://github.com/apache/cloudstack/pull/2573#discussion_r181789714 ## File path: plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java ## @@ -2337,8 +2337,9 @@ public int compare(final DiskTO arg0, final DiskTO arg1) { disk.setCacheMode(DiskDef.DiskCacheMode.valueOf(volumeObjectTO.getCacheMode().toString().toUpperCase())); } } - -vm.getDevices().addDevice(disk); +if (vm.getDevices() != null) { Review comment: Actually, I am not talking about the variable `vm`. I am instead, referring to the return of `vm.getDevices()` method. This is an automated message from the Apache Git Service. To respond to the message, please log on 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 With regards, Apache Git Services
[GitHub] lujiefsi commented on a change in pull request #2573: Cloudstack 10356
lujiefsi commented on a change in pull request #2573: Cloudstack 10356 URL: https://github.com/apache/cloudstack/pull/2573#discussion_r181789077 ## File path: plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java ## @@ -2337,8 +2337,9 @@ public int compare(final DiskTO arg0, final DiskTO arg1) { disk.setCacheMode(DiskDef.DiskCacheMode.valueOf(volumeObjectTO.getCacheMode().toString().toUpperCase())); } } - -vm.getDevices().addDevice(disk); +if (vm.getDevices() != null) { Review comment: hum. I mean another three "vm.getDevices;" are all in the same function, vm.getDevices can always return same object, so add checker at line 2340 mean that check the parameter vm is legal. This is an automated message from the Apache Git Service. To respond to the message, please log on 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 With regards, Apache Git Services
[GitHub] rafaelweingartner commented on a change in pull request #2573: Cloudstack 10356
rafaelweingartner commented on a change in pull request #2573: Cloudstack 10356 URL: https://github.com/apache/cloudstack/pull/2573#discussion_r181783355 ## File path: plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java ## @@ -2337,8 +2337,9 @@ public int compare(final DiskTO arg0, final DiskTO arg1) { disk.setCacheMode(DiskDef.DiskCacheMode.valueOf(volumeObjectTO.getCacheMode().toString().toUpperCase())); } } - -vm.getDevices().addDevice(disk); +if (vm.getDevices() != null) { Review comment: I only mentioned an exception for a single reason. Right now the code works; and, if we ever get a null calling `vm.getDevices() `, a run time exception will be thrown, and we will be able to easily pin point the problem. However, after applying your code, for sure something else will break or not work as expected, which will make more difficult for us to pin point the problem later (if it ever happens). This is an automated message from the Apache Git Service. To respond to the message, please log on 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 With regards, Apache Git Services
[GitHub] lujiefsi commented on a change in pull request #2573: Cloudstack 10356
lujiefsi commented on a change in pull request #2573: Cloudstack 10356 URL: https://github.com/apache/cloudstack/pull/2573#discussion_r181781752 ## File path: plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java ## @@ -2337,8 +2337,9 @@ public int compare(final DiskTO arg0, final DiskTO arg1) { disk.setCacheMode(DiskDef.DiskCacheMode.valueOf(volumeObjectTO.getCacheMode().toString().toUpperCase())); } } - -vm.getDevices().addDevice(disk); +if (vm.getDevices() != null) { Review comment: Yes, an exception is better, but checker should need shift to an earlier position, because there exist another three "vm.getDevices;" in the flowing code . Move to line 2340 is suitable, code can be if (vm.getDevices() == null){ throw new CloudRuntimeException(There is no devices for " + vm); } This is an automated message from the Apache Git Service. To respond to the message, please log on 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 With regards, Apache Git Services
[GitHub] rafaelweingartner commented on a change in pull request #2573: Cloudstack 10356
rafaelweingartner commented on a change in pull request #2573: Cloudstack 10356 URL: https://github.com/apache/cloudstack/pull/2573#discussion_r181777342 ## File path: engine/schema/src/main/java/com/cloud/configuration/dao/ResourceCountDaoImpl.java ## @@ -126,8 +126,10 @@ public void updateDomainCount(long domainId, ResourceType type, boolean incremen delta = increment ? delta : delta * -1; ResourceCountVO resourceCountVO = findByOwnerAndType(domainId, ResourceOwnerType.Domain, type); -resourceCountVO.setCount(resourceCountVO.getCount() + delta); -update(resourceCountVO.getId(), resourceCountVO); +if (resourceCountVO != null) { Review comment: Then, what about if you delete it? This is an automated message from the Apache Git Service. To respond to the message, please log on 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 With regards, Apache Git Services
[GitHub] lujiefsi commented on a change in pull request #2573: Cloudstack 10356
lujiefsi commented on a change in pull request #2573: Cloudstack 10356 URL: https://github.com/apache/cloudstack/pull/2573#discussion_r181776550 ## File path: engine/schema/src/main/java/com/cloud/configuration/dao/ResourceCountDaoImpl.java ## @@ -126,8 +126,10 @@ public void updateDomainCount(long domainId, ResourceType type, boolean incremen delta = increment ? delta : delta * -1; ResourceCountVO resourceCountVO = findByOwnerAndType(domainId, ResourceOwnerType.Domain, type); -resourceCountVO.setCount(resourceCountVO.getCount() + delta); -update(resourceCountVO.getId(), resourceCountVO); +if (resourceCountVO != null) { Review comment: It have no any callers This is an automated message from the Apache Git Service. To respond to the message, please log on 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 With regards, Apache Git Services
[GitHub] rafaelweingartner commented on a change in pull request #2573: Cloudstack 10356
rafaelweingartner commented on a change in pull request #2573: Cloudstack 10356 URL: https://github.com/apache/cloudstack/pull/2573#discussion_r181776039 ## File path: engine/schema/src/main/java/com/cloud/configuration/dao/ResourceCountDaoImpl.java ## @@ -126,8 +126,10 @@ public void updateDomainCount(long domainId, ResourceType type, boolean incremen delta = increment ? delta : delta * -1; ResourceCountVO resourceCountVO = findByOwnerAndType(domainId, ResourceOwnerType.Domain, type); -resourceCountVO.setCount(resourceCountVO.getCount() + delta); -update(resourceCountVO.getId(), resourceCountVO); +if (resourceCountVO != null) { Review comment: I did not check the code. Is it used somewhere else? I think we can ignore (it has been working so far...). This is an automated message from the Apache Git Service. To respond to the message, please log on 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 With regards, Apache Git Services
[GitHub] rafaelweingartner commented on a change in pull request #2573: Cloudstack 10356
rafaelweingartner commented on a change in pull request #2573: Cloudstack 10356 URL: https://github.com/apache/cloudstack/pull/2573#discussion_r181775760 ## File path: engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java ## @@ -499,6 +499,9 @@ public VolumeInfo copyVolumeFromSecToPrimary(VolumeInfo volume, VirtualMachine v // Find a suitable storage to create volume on StoragePool destPool = findStoragePool(dskCh, dc, pod, clusterId, null, vm, avoidPools); +if (destPool == null) { +throw new CloudRuntimeException("Failed to find a storage pool with enough capacity to copy the volume to."); Review comment: I think this one that you suggested is better. This is an automated message from the Apache Git Service. To respond to the message, please log on 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 With regards, Apache Git Services
[GitHub] lujiefsi commented on a change in pull request #2573: Cloudstack 10356
lujiefsi commented on a change in pull request #2573: Cloudstack 10356 URL: https://github.com/apache/cloudstack/pull/2573#discussion_r181775057 ## File path: engine/schema/src/main/java/com/cloud/configuration/dao/ResourceCountDaoImpl.java ## @@ -126,8 +126,10 @@ public void updateDomainCount(long domainId, ResourceType type, boolean incremen delta = increment ? delta : delta * -1; ResourceCountVO resourceCountVO = findByOwnerAndType(domainId, ResourceOwnerType.Domain, type); -resourceCountVO.setCount(resourceCountVO.getCount() + delta); -update(resourceCountVO.getId(), resourceCountVO); +if (resourceCountVO != null) { Review comment: updateDomainCount is an @Deprecated method, can we ignore it? This is an automated message from the Apache Git Service. To respond to the message, please log on 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 With regards, Apache Git Services
[GitHub] lujiefsi commented on a change in pull request #2573: Cloudstack 10356
lujiefsi commented on a change in pull request #2573: Cloudstack 10356 URL: https://github.com/apache/cloudstack/pull/2573#discussion_r181772009 ## File path: engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java ## @@ -499,6 +499,9 @@ public VolumeInfo copyVolumeFromSecToPrimary(VolumeInfo volume, VirtualMachine v // Find a suitable storage to create volume on StoragePool destPool = findStoragePool(dskCh, dc, pod, clusterId, null, vm, avoidPools); +if (destPool == null) { +throw new CloudRuntimeException("Failed to find a storage pool with enough capacity to copy the volume to."); Review comment: how about: throw new CloudRuntimeException("Failed to find a suitable storage pool to create Volume in the pod/cluster of the provided VM "+ vm.getUuid()); This is an automated message from the Apache Git Service. To respond to the message, please log on 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 With regards, Apache Git Services
[GitHub] rafaelweingartner commented on a change in pull request #2573: Cloudstack 10356
rafaelweingartner commented on a change in pull request #2573: Cloudstack 10356 URL: https://github.com/apache/cloudstack/pull/2573#discussion_r181747454 ## File path: engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java ## @@ -499,6 +499,9 @@ public VolumeInfo copyVolumeFromSecToPrimary(VolumeInfo volume, VirtualMachine v // Find a suitable storage to create volume on StoragePool destPool = findStoragePool(dskCh, dc, pod, clusterId, null, vm, avoidPools); +if (destPool == null) { +throw new CloudRuntimeException("Failed to find a storage pool with enough capacity to copy the volume to."); Review comment: This message looks misleading. Will tags be considered at this point as well? This is an automated message from the Apache Git Service. To respond to the message, please log on 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 With regards, Apache Git Services
[GitHub] rafaelweingartner commented on a change in pull request #2573: Cloudstack 10356
rafaelweingartner commented on a change in pull request #2573: Cloudstack 10356 URL: https://github.com/apache/cloudstack/pull/2573#discussion_r181748734 ## File path: server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java ## @@ -2139,14 +2139,14 @@ public boolean startRemoteAccessVpn(final Network network, final RemoteAccessVpn } Answer answer = cmds.getAnswer("users"); -if (!answer.getResult()) { +if (answer != null && !answer.getResult()) { Review comment: You can use `org.apache.commons.lang3.BooleanUtils.toBooleanObject(String, String, String, String)` here This is an automated message from the Apache Git Service. To respond to the message, please log on 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 With regards, Apache Git Services
[GitHub] rafaelweingartner commented on a change in pull request #2573: Cloudstack 10356
rafaelweingartner commented on a change in pull request #2573: Cloudstack 10356 URL: https://github.com/apache/cloudstack/pull/2573#discussion_r181748253 ## File path: plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java ## @@ -2337,8 +2337,9 @@ public int compare(final DiskTO arg0, final DiskTO arg1) { disk.setCacheMode(DiskDef.DiskCacheMode.valueOf(volumeObjectTO.getCacheMode().toString().toUpperCase())); } } - -vm.getDevices().addDevice(disk); +if (vm.getDevices() != null) { Review comment: Should not an exception be thrown in this case? This is an automated message from the Apache Git Service. To respond to the message, please log on 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 With regards, Apache Git Services
[GitHub] rafaelweingartner commented on a change in pull request #2573: Cloudstack 10356
rafaelweingartner commented on a change in pull request #2573: Cloudstack 10356 URL: https://github.com/apache/cloudstack/pull/2573#discussion_r181748304 ## File path: plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java ## @@ -2391,8 +2392,10 @@ private void createVif(final LibvirtVMDef vm, final NicTO nic, final String nicA + ") is " + nic.getType() + " traffic type. So, vsp-vr-ip " + vrIp + " is set in the metadata"); } } - -vm.getDevices().addDevice(getVifDriver(nic.getType(), nic.getName()).plug(nic, vm.getPlatformEmulator(), nicAdapter)); + +if (vm.getDevices() != null) { Review comment: The same here? This is an automated message from the Apache Git Service. To respond to the message, please log on 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 With regards, Apache Git Services
[GitHub] rafaelweingartner commented on a change in pull request #2573: Cloudstack 10356
rafaelweingartner commented on a change in pull request #2573: Cloudstack 10356 URL: https://github.com/apache/cloudstack/pull/2573#discussion_r181748782 ## File path: server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java ## @@ -2139,14 +2139,14 @@ public boolean startRemoteAccessVpn(final Network network, final RemoteAccessVpn } Answer answer = cmds.getAnswer("users"); -if (!answer.getResult()) { +if (answer != null && !answer.getResult()) { s_logger.error("Unable to start vpn: unable add users to vpn in zone " + router.getDataCenterId() + " for account " + vpn.getAccountId() + " on domR: " + router.getInstanceName() + " due to " + answer.getDetails()); throw new ResourceUnavailableException("Unable to start vpn: Unable to add users to vpn in zone " + router.getDataCenterId() + " for account " + vpn.getAccountId() + " on domR: " + router.getInstanceName() + " due to " + answer.getDetails(), DataCenter.class, router.getDataCenterId()); } answer = cmds.getAnswer("startVpn"); -if (!answer.getResult()) { +if (answer != null && !answer.getResult()) { Review comment: Same here This is an automated message from the Apache Git Service. To respond to the message, please log on 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 With regards, Apache Git Services
[GitHub] rafaelweingartner commented on a change in pull request #2573: Cloudstack 10356
rafaelweingartner commented on a change in pull request #2573: Cloudstack 10356 URL: https://github.com/apache/cloudstack/pull/2573#discussion_r181748841 ## File path: server/src/main/java/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java ## @@ -740,14 +740,14 @@ public boolean startRemoteAccessVpn(final RemoteAccessVpn vpn, final VirtualRout throw new AgentUnavailableException("Unable to send commands to virtual router ", router.getHostId(), e); } Answer answer = cmds.getAnswer("users"); -if (!answer.getResult()) { +if (answer != null && !answer.getResult()) { Review comment: Here as well This is an automated message from the Apache Git Service. To respond to the message, please log on 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 With regards, Apache Git Services
[GitHub] rafaelweingartner commented on a change in pull request #2573: Cloudstack 10356
rafaelweingartner commented on a change in pull request #2573: Cloudstack 10356 URL: https://github.com/apache/cloudstack/pull/2573#discussion_r181748053 ## File path: plugins/deployment-planners/implicit-dedication/src/main/java/com/cloud/deploy/ImplicitDedicationPlanner.java ## @@ -256,14 +256,15 @@ public PlannerResourceUsage getResourceUsage(VirtualMachineProfile vmProfile, De // Get the list of all the hosts in the given clusters List allHosts = new ArrayList(); -for (Long cluster : clusterList) { -List hostsInCluster = resourceMgr.listAllHostsInCluster(cluster); -for (HostVO hostVO : hostsInCluster) { +if (clusterList != null && !clusterList.isEmpty()) { Review comment: You can use `CollectionUtils.isNotEmpty` here. This is an automated message from the Apache Git Service. To respond to the message, please log on 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 With regards, Apache Git Services
[GitHub] rafaelweingartner commented on a change in pull request #2573: Cloudstack 10356
rafaelweingartner commented on a change in pull request #2573: Cloudstack 10356 URL: https://github.com/apache/cloudstack/pull/2573#discussion_r181747775 ## File path: engine/schema/src/main/java/com/cloud/configuration/dao/ResourceCountDaoImpl.java ## @@ -126,8 +126,10 @@ public void updateDomainCount(long domainId, ResourceType type, boolean incremen delta = increment ? delta : delta * -1; ResourceCountVO resourceCountVO = findByOwnerAndType(domainId, ResourceOwnerType.Domain, type); -resourceCountVO.setCount(resourceCountVO.getCount() + delta); -update(resourceCountVO.getId(), resourceCountVO); +if (resourceCountVO != null) { Review comment: If you do not find a resource to update, should not you break the execution flow? It seems that if the `resourceCountVO` is null, then we must have something wrong in the database. This is an automated message from the Apache Git Service. To respond to the message, please log on 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 With regards, Apache Git Services
[GitHub] rafaelweingartner commented on issue #2486: [CLOUDSTACK-10323] Allow changing disk offering during volume migration
rafaelweingartner commented on issue #2486: [CLOUDSTACK-10323] Allow changing disk offering during volume migration URL: https://github.com/apache/cloudstack/pull/2486#issuecomment-381610781 @nitin-maharana are you LGTM here? This is an automated message from the Apache Git Service. To respond to the message, please log on 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 With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2574: [CLOUDSTACK-5235] ask users old password when they are executing a password update
blueorangutan commented on issue #2574: [CLOUDSTACK-5235] ask users old password when they are executing a password update URL: https://github.com/apache/cloudstack/pull/2574#issuecomment-381610546 Packaging result: ✔centos6 ✔centos7 ✖debian. JID-1933 This is an automated message from the Apache Git Service. To respond to the message, please log on 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 With regards, Apache Git Services
[GitHub] rafaelweingartner commented on issue #2571: Improve Spanish translation
rafaelweingartner commented on issue #2571: Improve Spanish translation URL: https://github.com/apache/cloudstack/pull/2571#issuecomment-381608772 @milamberspace thanks! The page in our wiki is outdated, but the README file is updated :) I will send the new keys to transifex, and then I will also update the translations suggested here as well. This is an automated message from the Apache Git Service. To respond to the message, please log on 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 With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2574: [CLOUDSTACK-5235] ask users old password when they are executing a password update
blueorangutan commented on issue #2574: [CLOUDSTACK-5235] ask users old password when they are executing a password update URL: https://github.com/apache/cloudstack/pull/2574#issuecomment-381605025 @rafaelweingartner 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 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 With regards, Apache Git Services
[GitHub] jorgesumle opened a new issue #2575: HTML shown to end-user in UI
jorgesumle opened a new issue #2575: HTML shown to end-user in UI URL: https://github.com/apache/cloudstack/issues/2575 # ISSUE TYPE * Bug Report # COMPONENT NAME ~~~ UI ~~~ # CLOUDSTACK VERSION ~~~ 4.11.0.0 ~~~ # CONFIGURATION N/A # OS / ENVIRONMENT N/A # SUMMARY HTML code (``) in the UI ![captura](https://user-images.githubusercontent.com/14212780/38812472-a0f266ee-418c-11e8-8c5d-d7c1541b2dfa.png) # STEPS TO REPRODUCE ~~~ Create a zone ~~~ # EXPECTED RESULTS ~~~ non-HTML text ~~~ # ACTUAL RESULTS ~~~ ~~~ This is an automated message from the Apache Git Service. To respond to the message, please log on 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 With regards, Apache Git Services
[GitHub] rafaelweingartner opened a new pull request #2574: [CLOUDSTACK-5235] ask users olf password when they are executing a password update
rafaelweingartner opened a new pull request #2574: [CLOUDSTACK-5235] ask users olf password when they are executing a password update URL: https://github.com/apache/cloudstack/pull/2574 ## Description This is a long standing issue in Jira. It was asked for us to re-authenticate users with their old password when users execute a password update. One thing to note though. Root/domain admins are able to update users password (users they have access to) without needing to provide the old password. ## 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) ## Screenshots (if appropriate): ![untitled](https://user-images.githubusercontent.com/4129005/38812549-f6c3e2b6-4162-11e8-881d-b6813d6716e5.png) ## How Has This Been Tested? Locally and via unit tests for the newly introduced code. ## Checklist: - [X] I have read the [CONTRIBUTING](https://github.com/apache/cloudstack/blob/master/CONTRIBUTING.md) document. - [X] My code follows the code style of this project. - [ ] My change requires a change to the documentation. - [ ] I have updated the documentation accordingly. Testing - [X] I have added tests to cover my changes. - [X] All relevant new and existing integration tests have passed. - [ ] A full integration testsuite with all test that can run on my environment has passed. @blueorangutan package This is an automated message from the Apache Git Service. To respond to the message, please log on 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 With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2376: [4.11] Smoketest Health Check
blueorangutan commented on issue #2376: [4.11] Smoketest Health Check URL: https://github.com/apache/cloudstack/pull/2376#issuecomment-381598808 @rhtyd a Trillian-Jenkins matrix job (centos6 mgmt + xs71, centos7 mgmt + vmware65, centos7 mgmt + kvmcentos7) 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 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 With regards, Apache Git Services
[GitHub] rhtyd commented on issue #2376: [4.11] Smoketest Health Check
rhtyd commented on issue #2376: [4.11] Smoketest Health Check URL: https://github.com/apache/cloudstack/pull/2376#issuecomment-381598048 @blueorangutan test matrix This is an automated message from the Apache Git Service. To respond to the message, please log on 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 With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2562: consoleproxy: use consoleproxy.domain for non-ssl enable env
blueorangutan commented on issue #2562: consoleproxy: use consoleproxy.domain for non-ssl enable env URL: https://github.com/apache/cloudstack/pull/2562#issuecomment-381597682 Packaging result: ✔centos6 ✖centos7 ✔debian. JID-1932 This is an automated message from the Apache Git Service. To respond to the message, please log on 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 With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2376: [4.11] Smoketest Health Check
blueorangutan commented on issue #2376: [4.11] Smoketest Health Check URL: https://github.com/apache/cloudstack/pull/2376#issuecomment-381597684 Packaging result: ✔centos6 ✔centos7 ✔debian. JID-1931 This is an automated message from the Apache Git Service. To respond to the message, please log on 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 With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2376: [4.11] Smoketest Health Check
blueorangutan commented on issue #2376: [4.11] Smoketest Health Check URL: https://github.com/apache/cloudstack/pull/2376#issuecomment-375854430 Trillian test result (tid-2408) Environment: xenserver-71 (x2), Advanced Networking with Mgmt server 7 Total time taken: 85925 seconds Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2376-t2408-xenserver-71.zip Intermitten failure detected: /marvin/tests/smoke/test_routers.py Intermitten failure detected: /marvin/tests/smoke/test_scale_vm.py Intermitten failure detected: /marvin/tests/smoke/test_service_offerings.py Intermitten failure detected: /marvin/tests/smoke/test_vpc_redundant.py Smoke tests completed. 63 look OK, 4 have error(s) Only failed tests results shown below: Test | Result | Time (s) | Test File --- | --- | --- | --- test_04_restart_network_wo_cleanup | `Failure` | 4.76 | test_routers.py test_01_scale_vm | `Error` | 10.32 | test_scale_vm.py ContextSuite context=TestCpuCapServiceOfferings>:teardown | `Error` | 0.00 | test_service_offerings.py test_04_rvpc_network_garbage_collector_nics | `Failure` | 579.67 | test_vpc_redundant.py This is an automated message from the Apache Git Service. To respond to the message, please log on 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 With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2376: [4.11] Smoketest Health Check
blueorangutan commented on issue #2376: [4.11] Smoketest Health Check URL: https://github.com/apache/cloudstack/pull/2376#issuecomment-375558867 @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 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 With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2376: [4.11] Smoketest Health Check
blueorangutan commented on issue #2376: [4.11] Smoketest Health Check URL: https://github.com/apache/cloudstack/pull/2376#issuecomment-375891641 Trillian test result (tid-2407) Environment: vmware-65 (x2), Advanced Networking with Mgmt server 7 Total time taken: 108119 seconds Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2376-t2407-vmware-65.zip Intermitten failure detected: /marvin/tests/smoke/test_deploy_vgpu_enabled_vm.py Intermitten failure detected: /marvin/tests/smoke/test_routers_network_ops.py Intermitten failure detected: /marvin/tests/smoke/test_routers.py Intermitten failure detected: /marvin/tests/smoke/test_service_offerings.py Intermitten failure detected: /marvin/tests/smoke/test_vpc_redundant.py Smoke tests completed. 63 look OK, 4 have error(s) Only failed tests results shown below: Test | Result | Time (s) | Test File --- | --- | --- | --- test_01_RVR_Network_FW_PF_SSH_default_routes_egress_true | `Failure` | 1960.59 | test_routers_network_ops.py test_04_restart_network_wo_cleanup | `Failure` | 2.73 | test_routers.py ContextSuite context=TestCpuCapServiceOfferings>:teardown | `Error` | 0.00 | test_service_offerings.py test_04_rvpc_network_garbage_collector_nics | `Failure` | 605.52 | test_vpc_redundant.py This is an automated message from the Apache Git Service. To respond to the message, please log on 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 With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2376: [4.11] Smoketest Health Check
blueorangutan commented on issue #2376: [4.11] Smoketest Health Check URL: https://github.com/apache/cloudstack/pull/2376#issuecomment-381586261 @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 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 With regards, Apache Git Services
[GitHub] rhtyd commented on issue #2376: [4.11] Smoketest Health Check
rhtyd commented on issue #2376: [4.11] Smoketest Health Check URL: https://github.com/apache/cloudstack/pull/2376#issuecomment-381586049 @blueorangutan package This is an automated message from the Apache Git Service. To respond to the message, please log on 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 With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2562: consoleproxy: use consoleproxy.domain for non-ssl enable env
blueorangutan commented on issue #2562: consoleproxy: use consoleproxy.domain for non-ssl enable env URL: https://github.com/apache/cloudstack/pull/2562#issuecomment-381586346 @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 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 With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2376: [4.11] Smoketest Health Check
blueorangutan commented on issue #2376: [4.11] Smoketest Health Check URL: https://github.com/apache/cloudstack/pull/2376#issuecomment-375856690 Trillian test result (tid-2406) Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7 Total time taken: 88614 seconds Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2376-t2406-kvm-centos7.zip Intermitten failure detected: /marvin/tests/smoke/test_deploy_virtio_scsi_vm.py Intermitten failure detected: /marvin/tests/smoke/test_routers.py Intermitten failure detected: /marvin/tests/smoke/test_vpc_redundant.py Intermitten failure detected: /marvin/tests/smoke/test_host_maintenance.py Smoke tests completed. 65 look OK, 2 have error(s) Only failed tests results shown below: Test | Result | Time (s) | Test File --- | --- | --- | --- test_04_restart_network_wo_cleanup | `Failure` | 4.19 | test_routers.py test_04_rvpc_network_garbage_collector_nics | `Failure` | 521.37 | test_vpc_redundant.py This is an automated message from the Apache Git Service. To respond to the message, please log on 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 With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2376: [4.11] Smoketest Health Check
blueorangutan commented on issue #2376: [4.11] Smoketest Health Check URL: https://github.com/apache/cloudstack/pull/2376#issuecomment-375221897 Packaging result: ✔centos6 ✔centos7 ✔debian. JID-1806 This is an automated message from the Apache Git Service. To respond to the message, please log on 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 With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2376: [4.11] Smoketest Health Check
blueorangutan commented on issue #2376: [4.11] Smoketest Health Check URL: https://github.com/apache/cloudstack/pull/2376#issuecomment-380923008 Trillian test result (tid-2491) Environment: xenserver-71 (x2), Advanced Networking with Mgmt server 6 Total time taken: 122166 seconds Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2376-t2491-xenserver-71.zip Intermitten failure detected: /marvin/tests/smoke/test_network.py Intermitten failure detected: /marvin/tests/smoke/test_projects.py Intermitten failure detected: /marvin/tests/smoke/test_public_ip_range.py Intermitten failure detected: /marvin/tests/smoke/test_routers.py Intermitten failure detected: /marvin/tests/smoke/test_scale_vm.py Intermitten failure detected: /marvin/tests/smoke/test_service_offerings.py Intermitten failure detected: /marvin/tests/smoke/test_ssvm.py Intermitten failure detected: /marvin/tests/smoke/test_templates.py Intermitten failure detected: /marvin/tests/smoke/test_usage.py Intermitten failure detected: /marvin/tests/smoke/test_volumes.py Smoke tests completed. 58 look OK, 9 have error(s) Only failed tests results shown below: Test | Result | Time (s) | Test File --- | --- | --- | --- test_reboot_router | `Error` | 2420.57 | test_network.py test_10_project_activation | `Error` | 2706.41 | test_projects.py test_04_restart_network_wo_cleanup | `Failure` | 3.61 | test_routers.py test_08_start_router | `Error` | 1336.65 | test_routers.py test_09_reboot_router | `Error` | 1.10 | test_routers.py test_01_scale_vm | `Error` | 12.36 | test_scale_vm.py ContextSuite context=TestCpuCapServiceOfferings>:teardown | `Error` | 0.00 | test_service_offerings.py test_05_stop_ssvm | `Failure` | 912.33 | test_ssvm.py test_06_stop_cpvm | `Failure` | 912.50 | test_ssvm.py test_08_reboot_cpvm | `Failure` | 0.03 | test_ssvm.py test_04_extract_template | `Failure` | 128.28 | test_templates.py ContextSuite context=TestISOUsage>:setup | `Error` | 0.00 | test_usage.py test_06_download_detached_volume | `Failure` | 139.68 | test_volumes.py This is an automated message from the Apache Git Service. To respond to the message, please log on 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 With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2376: [4.11] Smoketest Health Check
blueorangutan commented on issue #2376: [4.11] Smoketest Health Check URL: https://github.com/apache/cloudstack/pull/2376#issuecomment-375567485 Packaging result: ✔centos6 ✔centos7 ✔debian. JID-1817 This is an automated message from the Apache Git Service. To respond to the message, please log on 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 With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2376: [4.11] Smoketest Health Check
blueorangutan commented on issue #2376: [4.11] Smoketest Health Check URL: https://github.com/apache/cloudstack/pull/2376#issuecomment-381586261 @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 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 With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2376: [4.11] Smoketest Health Check
blueorangutan commented on issue #2376: [4.11] Smoketest Health Check URL: https://github.com/apache/cloudstack/pull/2376#issuecomment-380375072 @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 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 With regards, Apache Git Services
[GitHub] rhtyd commented on issue #2376: [4.11] Smoketest Health Check
rhtyd commented on issue #2376: [4.11] Smoketest Health Check URL: https://github.com/apache/cloudstack/pull/2376#issuecomment-375214029 @blueorangutan package This is an automated message from the Apache Git Service. To respond to the message, please log on 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 With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2376: [4.11] Smoketest Health Check
blueorangutan commented on issue #2376: [4.11] Smoketest Health Check URL: https://github.com/apache/cloudstack/pull/2376#issuecomment-380386417 @rhtyd a Trillian-Jenkins matrix job (centos6 mgmt + xs71, centos7 mgmt + vmware65, centos7 mgmt + kvmcentos7) 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 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 With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2376: [4.11] Smoketest Health Check
blueorangutan commented on issue #2376: [4.11] Smoketest Health Check URL: https://github.com/apache/cloudstack/pull/2376#issuecomment-375214148 @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 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 With regards, Apache Git Services
[GitHub] rhtyd commented on issue #2376: [4.11] Smoketest Health Check
rhtyd commented on issue #2376: [4.11] Smoketest Health Check URL: https://github.com/apache/cloudstack/pull/2376#issuecomment-375558723 @blueorangutan package This is an automated message from the Apache Git Service. To respond to the message, please log on 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 With regards, Apache Git Services
[GitHub] rhtyd commented on issue #2376: [4.11] Smoketest Health Check
rhtyd commented on issue #2376: [4.11] Smoketest Health Check URL: https://github.com/apache/cloudstack/pull/2376#issuecomment-380374950 @blueorangutan package This is an automated message from the Apache Git Service. To respond to the message, please log on 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 With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2376: [4.11] Smoketest Health Check
blueorangutan commented on issue #2376: [4.11] Smoketest Health Check URL: https://github.com/apache/cloudstack/pull/2376#issuecomment-380903625 Trillian test result (tid-2492) Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7 Total time taken: 117781 seconds Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2376-t2492-kvm-centos7.zip Intermitten failure detected: /marvin/tests/smoke/test_privategw_acl.py Intermitten failure detected: /marvin/tests/smoke/test_public_ip_range.py Intermitten failure detected: /marvin/tests/smoke/test_routers.py Intermitten failure detected: /marvin/tests/smoke/test_templates.py Intermitten failure detected: /marvin/tests/smoke/test_usage.py Intermitten failure detected: /marvin/tests/smoke/test_volumes.py Intermitten failure detected: /marvin/tests/smoke/test_vpc_redundant.py Intermitten failure detected: /marvin/tests/smoke/test_hostha_kvm.py Smoke tests completed. 61 look OK, 6 have error(s) Only failed tests results shown below: Test | Result | Time (s) | Test File --- | --- | --- | --- test_02_vpc_privategw_static_routes | `Failure` | 173.48 | test_privategw_acl.py test_03_vpc_privategw_restart_vpc_cleanup | `Failure` | 169.43 | test_privategw_acl.py test_04_restart_network_wo_cleanup | `Failure` | 3.05 | test_routers.py test_04_extract_template | `Failure` | 128.31 | test_templates.py ContextSuite context=TestISOUsage>:setup | `Error` | 0.00 | test_usage.py test_06_download_detached_volume | `Failure` | 138.67 | test_volumes.py test_hostha_enable_ha_when_host_in_maintenance | `Error` | 4.59 | test_hostha_kvm.py This is an automated message from the Apache Git Service. To respond to the message, please log on 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 With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2376: [4.11] Smoketest Health Check
blueorangutan commented on issue #2376: [4.11] Smoketest Health Check URL: https://github.com/apache/cloudstack/pull/2376#issuecomment-380806396 Trillian test result (tid-2493) Environment: vmware-65 (x2), Advanced Networking with Mgmt server 7 Total time taken: 99811 seconds Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2376-t2493-vmware-65.zip Intermitten failure detected: /marvin/tests/smoke/test_deploy_vgpu_enabled_vm.py Intermitten failure detected: /marvin/tests/smoke/test_routers_network_ops.py Intermitten failure detected: /marvin/tests/smoke/test_routers.py Intermitten failure detected: /marvin/tests/smoke/test_service_offerings.py Smoke tests completed. 64 look OK, 3 have error(s) Only failed tests results shown below: Test | Result | Time (s) | Test File --- | --- | --- | --- test_01_RVR_Network_FW_PF_SSH_default_routes_egress_true | `Failure` | 1940.16 | test_routers_network_ops.py test_04_restart_network_wo_cleanup | `Failure` | 2.89 | test_routers.py ContextSuite context=TestCpuCapServiceOfferings>:teardown | `Error` | 0.00 | test_service_offerings.py This is an automated message from the Apache Git Service. To respond to the message, please log on 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 With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2376: [4.11] Smoketest Health Check
blueorangutan commented on issue #2376: [4.11] Smoketest Health Check URL: https://github.com/apache/cloudstack/pull/2376#issuecomment-380386107 Packaging result: ✔centos6 ✔centos7 ✔debian. JID-1901 This is an automated message from the Apache Git Service. To respond to the message, please log on 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 With regards, Apache Git Services
[GitHub] rhtyd commented on issue #2376: [4.11] Smoketest Health Check
rhtyd commented on issue #2376: [4.11] Smoketest Health Check URL: https://github.com/apache/cloudstack/pull/2376#issuecomment-381586049 @blueorangutan package This is an automated message from the Apache Git Service. To respond to the message, please log on 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 With regards, Apache Git Services
[GitHub] rhtyd commented on issue #2376: [4.11] Smoketest Health Check
rhtyd commented on issue #2376: [4.11] Smoketest Health Check URL: https://github.com/apache/cloudstack/pull/2376#issuecomment-380386351 @blueorangutan test matrix This is an automated message from the Apache Git Service. To respond to the message, please log on 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 With regards, Apache Git Services
[cloudstack] branch 4.11 updated: consoleproxy: use consoleproxy.domain for non-ssl enable env (#2562)
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch 4.11 in repository https://gitbox.apache.org/repos/asf/cloudstack.git The following commit(s) were added to refs/heads/4.11 by this push: new 392f62d consoleproxy: use consoleproxy.domain for non-ssl enable env (#2562) 392f62d is described below commit 392f62dae0f59b3b00437d61ab8cee0ebfb9e60a Author: Rohit Yadav AuthorDate: Mon Apr 16 18:12:41 2018 +0530 consoleproxy: use consoleproxy.domain for non-ssl enable env (#2562) This allows CloudStack to use a console proxy domain instead of public IP address even when ssl is not enabled but console proxy url/domain is defined in global settings. Signed-off-by: Rohit Yadav --- core/src/com/cloud/info/ConsoleProxyInfo.java | 5 + server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java | 5 ++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/core/src/com/cloud/info/ConsoleProxyInfo.java b/core/src/com/cloud/info/ConsoleProxyInfo.java index b15abcb..16993d7 100644 --- a/core/src/com/cloud/info/ConsoleProxyInfo.java +++ b/core/src/com/cloud/info/ConsoleProxyInfo.java @@ -19,6 +19,8 @@ package com.cloud.info; +import org.apache.commons.lang3.StringUtils; + public class ConsoleProxyInfo { private boolean sslEnabled; @@ -55,6 +57,9 @@ public class ConsoleProxyInfo { proxyImageUrl += ":" + this.proxyUrlPort; } else { proxyAddress = proxyIpAddress; +if (StringUtils.isNotBlank(consoleProxyUrlDomain)) { +proxyAddress = consoleProxyUrlDomain; +} proxyPort = port; this.proxyUrlPort = proxyUrlPort; diff --git a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java index f131714..e6c0a8d 100644 --- a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java +++ b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java @@ -231,7 +231,7 @@ public class ConsoleProxyManagerImpl extends ManagerBase implements ConsoleProxy private String _instance; private int _proxySessionTimeoutValue = DEFAULT_PROXY_SESSION_TIMEOUT; -private boolean _sslEnabled = true; +private boolean _sslEnabled = false; private String _consoleProxyUrlDomain; // global load picture at zone basis @@ -1246,8 +1246,7 @@ public class ConsoleProxyManagerImpl extends ManagerBase implements ConsoleProxy Map configs = _configDao.getConfiguration("management-server", params); -String value = configs.get(Config.ConsoleProxyCmdPort.key()); -value = configs.get("consoleproxy.sslEnabled"); +String value = configs.get("consoleproxy.sslEnabled"); if (value != null && value.equalsIgnoreCase("true")) { _sslEnabled = true; } -- To stop receiving notification emails like this one, please contact ro...@apache.org.
[GitHub] rhtyd closed pull request #2562: consoleproxy: use consoleproxy.domain for non-ssl enable env
rhtyd closed pull request #2562: consoleproxy: use consoleproxy.domain for non-ssl enable env URL: https://github.com/apache/cloudstack/pull/2562 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/core/src/com/cloud/info/ConsoleProxyInfo.java b/core/src/com/cloud/info/ConsoleProxyInfo.java index b15abcb54ff..16993d71bdc 100644 --- a/core/src/com/cloud/info/ConsoleProxyInfo.java +++ b/core/src/com/cloud/info/ConsoleProxyInfo.java @@ -19,6 +19,8 @@ package com.cloud.info; +import org.apache.commons.lang3.StringUtils; + public class ConsoleProxyInfo { private boolean sslEnabled; @@ -55,6 +57,9 @@ public ConsoleProxyInfo(boolean sslEnabled, String proxyIpAddress, int port, int proxyImageUrl += ":" + this.proxyUrlPort; } else { proxyAddress = proxyIpAddress; +if (StringUtils.isNotBlank(consoleProxyUrlDomain)) { +proxyAddress = consoleProxyUrlDomain; +} proxyPort = port; this.proxyUrlPort = proxyUrlPort; diff --git a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java index f131714ecaf..e6c0a8da6ec 100644 --- a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java +++ b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java @@ -231,7 +231,7 @@ private String _instance; private int _proxySessionTimeoutValue = DEFAULT_PROXY_SESSION_TIMEOUT; -private boolean _sslEnabled = true; +private boolean _sslEnabled = false; private String _consoleProxyUrlDomain; // global load picture at zone basis @@ -1246,8 +1246,7 @@ public boolean configure(String name, Map params) throws Configu Map configs = _configDao.getConfiguration("management-server", params); -String value = configs.get(Config.ConsoleProxyCmdPort.key()); -value = configs.get("consoleproxy.sslEnabled"); +String value = configs.get("consoleproxy.sslEnabled"); if (value != null && value.equalsIgnoreCase("true")) { _sslEnabled = true; } This is an automated message from the Apache Git Service. To respond to the message, please log on 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 With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2554: agent: Add logging to libvirt qemu hook and cleanup
blueorangutan commented on issue #2554: agent: Add logging to libvirt qemu hook and cleanup URL: https://github.com/apache/cloudstack/pull/2554#issuecomment-381581298 Packaging result: ✔centos6 ✔centos7 ✔debian. JID-1930 This is an automated message from the Apache Git Service. To respond to the message, please log on 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 With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2572: Remove 'todb' in favor of 'encodeURIComponent'.
blueorangutan commented on issue #2572: Remove 'todb' in favor of 'encodeURIComponent'. URL: https://github.com/apache/cloudstack/pull/2572#issuecomment-381580800 Packaging result: ✔centos6 ✔centos7 ✔debian. JID-1929 This is an automated message from the Apache Git Service. To respond to the message, please log on 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 With regards, Apache Git Services
[cloudstack] 01/01: Merge release branch 4.11 to master
This is an automated email from the ASF dual-hosted git repository. dahn pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack.git commit c43c69af438518ef0b620b3a39f5ab9a65b2e304 Merge: 685cc72 156dbf4 Author: Daan Hoogland AuthorDate: Mon Apr 16 13:54:20 2018 +0200 Merge release branch 4.11 to master * 4.11: agent: Add logging to libvirt qemu hook (#2554) agent/bindir/libvirtqemuhook.in | 37 - 1 file changed, 28 insertions(+), 9 deletions(-) -- To stop receiving notification emails like this one, please contact d...@apache.org.
[cloudstack] branch master updated (685cc72 -> c43c69a)
This is an automated email from the ASF dual-hosted git repository. dahn pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack.git. from 685cc72 [CLOUDSTACK-10344] bug when moving ACL rules (change order with drag and drop) (#2511) add 156dbf4 agent: Add logging to libvirt qemu hook (#2554) new c43c69a Merge release branch 4.11 to master The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: agent/bindir/libvirtqemuhook.in | 37 - 1 file changed, 28 insertions(+), 9 deletions(-) -- To stop receiving notification emails like this one, please contact d...@apache.org.
[GitHub] blueorangutan commented on issue #2554: agent: Add logging to libvirt qemu hook and cleanup
blueorangutan commented on issue #2554: agent: Add logging to libvirt qemu hook and cleanup URL: https://github.com/apache/cloudstack/pull/2554#issuecomment-381573124 @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 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 With regards, Apache Git Services
[GitHub] DaanHoogland closed pull request #2554: agent: Add logging to libvirt qemu hook and cleanup
DaanHoogland closed pull request #2554: agent: Add logging to libvirt qemu hook and cleanup URL: https://github.com/apache/cloudstack/pull/2554 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/agent/bindir/libvirtqemuhook.in b/agent/bindir/libvirtqemuhook.in index 9fbe037d1c1..55ab3e67309 100755 --- a/agent/bindir/libvirtqemuhook.in +++ b/agent/bindir/libvirtqemuhook.in @@ -6,25 +6,36 @@ # to you under the Apache License, Version 2.0 (the # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -import sys + +import logging import re +import sys from xml.dom.minidom import parse from cloudutils.configFileOps import configFileOps from cloudutils.networkConfig import networkConfig + +logging.basicConfig(filename='/var/log/libvirt/qemu-hook.log', +filemode='a', +format='%(asctime)s,%(msecs)d %(name)s %(levelname)s %(message)s', +datefmt='%H:%M:%S', +level=logging.INFO) +logger = logging.getLogger('qemu-hook') + def isOldStyleBridge(brName): if brName.find("cloudVirBr") == 0: return True else: return False + def isNewStyleBridge(brName): if brName.startswith('brvx-'): return False @@ -32,12 +43,14 @@ def isNewStyleBridge(brName): return False else: return True + def getGuestNetworkDevice(): -netlib = networkConfig() +netlib = networkConfig() cfo = configFileOps("/etc/cloudstack/agent/agent.properties") guestDev = cfo.getEntry("guest.network.device") enslavedDev = netlib.getEnslavedDev(guestDev, 1) return enslavedDev.split(".")[0] + def handleMigrateBegin(): try: domain = parse(sys.stdin) @@ -45,20 +58,26 @@ def handleMigrateBegin(): source = interface.getElementsByTagName("source")[0] bridge = source.getAttribute("bridge") if isOldStyleBridge(bridge): -vlanId = bridge.replace("cloudVirBr","") +vlanId = bridge.replace("cloudVirBr", "") elif isNewStyleBridge(bridge): -vlanId = re.sub(r"br(\w+)-","",bridge) +vlanId = re.sub(r"br(\w+)-", "", bridge) else: continue phyDev = getGuestNetworkDevice() -newBrName="br" + phyDev + "-" + vlanId +newBrName = "br" + phyDev + "-" + vlanId source.setAttribute("bridge", newBrName) print(domain.toxml()) except: pass + + if __name__ == '__main__': if len(sys.argv) != 5: sys.exit(0) -if sys.argv[2] == "migrate" and sys.argv[3] == "begin": -handleMigrateBegin() +# For docs refer https://libvirt.org/hooks.html#qemu +logger.debug("Executing qemu hook with args: %s" % sys.argv) +action, status = sys.argv[2:4] + +if action == "migrate" and status == "begin": +handleMigrateBegin() This is an automated message from the Apache Git Service. To respond to the message, please log on 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 With regards, Apache Git Services
[cloudstack] branch 4.11 updated: agent: Add logging to libvirt qemu hook (#2554)
This is an automated email from the ASF dual-hosted git repository. dahn pushed a commit to branch 4.11 in repository https://gitbox.apache.org/repos/asf/cloudstack.git The following commit(s) were added to refs/heads/4.11 by this push: new 156dbf4 agent: Add logging to libvirt qemu hook (#2554) 156dbf4 is described below commit 156dbf466c1307b66706e1133dad33d97096cc5b Author: Rohit Yadav AuthorDate: Mon Apr 16 17:20:48 2018 +0530 agent: Add logging to libvirt qemu hook (#2554) This allows logging to the default libvirt qemu hook Signed-off-by: Rohit Yadav --- agent/bindir/libvirtqemuhook.in | 37 - 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/agent/bindir/libvirtqemuhook.in b/agent/bindir/libvirtqemuhook.in index 9fbe037..55ab3e6 100755 --- a/agent/bindir/libvirtqemuhook.in +++ b/agent/bindir/libvirtqemuhook.in @@ -6,25 +6,36 @@ # to you under the Apache License, Version 2.0 (the # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -import sys + +import logging import re +import sys from xml.dom.minidom import parse from cloudutils.configFileOps import configFileOps from cloudutils.networkConfig import networkConfig + +logging.basicConfig(filename='/var/log/libvirt/qemu-hook.log', +filemode='a', +format='%(asctime)s,%(msecs)d %(name)s %(levelname)s %(message)s', +datefmt='%H:%M:%S', +level=logging.INFO) +logger = logging.getLogger('qemu-hook') + def isOldStyleBridge(brName): if brName.find("cloudVirBr") == 0: return True else: return False + def isNewStyleBridge(brName): if brName.startswith('brvx-'): return False @@ -32,12 +43,14 @@ def isNewStyleBridge(brName): return False else: return True + def getGuestNetworkDevice(): -netlib = networkConfig() +netlib = networkConfig() cfo = configFileOps("/etc/cloudstack/agent/agent.properties") guestDev = cfo.getEntry("guest.network.device") enslavedDev = netlib.getEnslavedDev(guestDev, 1) return enslavedDev.split(".")[0] + def handleMigrateBegin(): try: domain = parse(sys.stdin) @@ -45,20 +58,26 @@ def handleMigrateBegin(): source = interface.getElementsByTagName("source")[0] bridge = source.getAttribute("bridge") if isOldStyleBridge(bridge): -vlanId = bridge.replace("cloudVirBr","") +vlanId = bridge.replace("cloudVirBr", "") elif isNewStyleBridge(bridge): -vlanId = re.sub(r"br(\w+)-","",bridge) +vlanId = re.sub(r"br(\w+)-", "", bridge) else: continue phyDev = getGuestNetworkDevice() -newBrName="br" + phyDev + "-" + vlanId +newBrName = "br" + phyDev + "-" + vlanId source.setAttribute("bridge", newBrName) print(domain.toxml()) except: pass + + if __name__ == '__main__': if len(sys.argv) != 5: sys.exit(0) -if sys.argv[2] == "migrate" and sys.argv[3] == "begin": -handleMigrateBegin() +# For docs refer https://libvirt.org/hooks.html#qemu +logger.debug("Executing qemu hook with args: %s" % sys.argv) +action, status = sys.argv[2:4] + +if action == "migrate" and status == "begin": +handleMigrateBegin() -- To stop receiving notification emails like this one, please contact d...@apache.org.
[GitHub] DaanHoogland closed pull request #2511: [CLOUDSTACK-10344] bug when moving ACL rules (change order with drag and drop)
DaanHoogland closed pull request #2511: [CLOUDSTACK-10344] bug when moving ACL rules (change order with drag and drop) URL: https://github.com/apache/cloudstack/pull/2511 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/api/src/main/java/com/cloud/network/vpc/NetworkACLService.java b/api/src/main/java/com/cloud/network/vpc/NetworkACLService.java index 378b15ce940..7c4e8b45333 100644 --- a/api/src/main/java/com/cloud/network/vpc/NetworkACLService.java +++ b/api/src/main/java/com/cloud/network/vpc/NetworkACLService.java @@ -21,6 +21,7 @@ import org.apache.cloudstack.api.command.user.network.CreateNetworkACLCmd; import org.apache.cloudstack.api.command.user.network.ListNetworkACLListsCmd; import org.apache.cloudstack.api.command.user.network.ListNetworkACLsCmd; +import org.apache.cloudstack.api.command.user.network.MoveNetworkAclItemCmd; import org.apache.cloudstack.api.command.user.network.UpdateNetworkACLItemCmd; import org.apache.cloudstack.api.command.user.network.UpdateNetworkACLListCmd; @@ -28,6 +29,7 @@ import com.cloud.utils.Pair; public interface NetworkACLService { + /** * Creates Network ACL for the specified VPC */ @@ -90,4 +92,8 @@ NetworkACL updateNetworkACL(UpdateNetworkACLListCmd updateNetworkACLListCmd); -} +/** + * Updates a network item ACL to a new position. This method allows users to inform between which ACLs the given ACL will be placed. Therefore, the 'number' field will be filled out by the system in the best way possible to place the ACL accordingly. + */ +NetworkACLItem moveNetworkAclRuleToNewPosition(MoveNetworkAclItemCmd moveNetworkAclItemCmd); +} \ No newline at end of file diff --git a/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java b/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java index 7825bb4fc93..56d5957f022 100644 --- a/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java +++ b/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java @@ -152,6 +152,8 @@ public static final String ICMP_TYPE = "icmptype"; public static final String ID = "id"; public static final String IDS = "ids"; +public static final String PREVIOUS_ACL_RULE_ID = "previousaclruleid"; +public static final String NEXT_ACL_RULE_ID = "nextaclruleid"; public static final String INTERNAL_DNS1 = "internaldns1"; public static final String INTERNAL_DNS2 = "internaldns2"; public static final String INTERVAL_TYPE = "intervaltype"; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/network/MoveNetworkAclItemCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/network/MoveNetworkAclItemCmd.java new file mode 100644 index 000..aaa9c185526 --- /dev/null +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/network/MoveNetworkAclItemCmd.java @@ -0,0 +1,96 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package org.apache.cloudstack.api.command.user.network; + +import org.apache.cloudstack.api.APICommand; +import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.BaseAsyncCustomIdCmd; +import org.apache.cloudstack.api.Parameter; +import org.apache.cloudstack.api.response.NetworkACLItemResponse; +import org.apache.cloudstack.context.CallContext; +import org.apache.log4j.Logger; + +import com.cloud.event.EventTypes; +import com.cloud.network.vpc.NetworkACLItem; +import com.cloud.user.Account; + +@APICommand(name = "moveNetworkAclItem", description = "Move an ACL rule to a position bettwen two other ACL rules of the same ACL network list", responseObject = NetworkACLItemResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) +public class MoveNetworkAclItemCmd extends BaseAsyncCustomIdCmd { + +public static final Logger s_logger = Logger.getLogger(MoveNetworkAclItemCmd.class.getName()); +private static final String s_name = "moveNetworkAclItemResponse"; + +@Parameter(name = A
[GitHub] blueorangutan commented on issue #2572: Remove 'todb' in favor of 'encodeURIComponent'.
blueorangutan commented on issue #2572: Remove 'todb' in favor of 'encodeURIComponent'. URL: https://github.com/apache/cloudstack/pull/2572#issuecomment-381571549 @rafaelweingartner 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 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 With regards, Apache Git Services
[cloudstack] branch master updated: [CLOUDSTACK-10344] bug when moving ACL rules (change order with drag and drop) (#2511)
This is an automated email from the ASF dual-hosted git repository. dahn pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack.git The following commit(s) were added to refs/heads/master by this push: new 685cc72 [CLOUDSTACK-10344] bug when moving ACL rules (change order with drag and drop) (#2511) 685cc72 is described below commit 685cc7210c2f6396beb649cd1fb789957a6cdb66 Author: Rafael Weingärtner AuthorDate: Mon Apr 16 08:45:29 2018 -0300 [CLOUDSTACK-10344] bug when moving ACL rules (change order with drag and drop) (#2511) * Add permission to 'moveNetworkAclItem' API method in default roles --- .../com/cloud/network/vpc/NetworkACLService.java | 8 +- .../org/apache/cloudstack/api/ApiConstants.java| 2 + .../user/network/MoveNetworkAclItemCmd.java| 96 + .../com/cloud/network/vpc/NetworkACLItemDao.java | 10 +- .../vpc/dao/NetworkACLItemCidrsDaoImpl.java| 1 - .../network/vpc/dao/NetworkACLItemDaoImpl.java | 34 +- .../resources/META-INF/db/schema-41110to41200.sql | 8 +- .../cloud/network/vpc/NetworkACLServiceImpl.java | 169 .../com/cloud/server/ManagementServerImpl.java | 3 +- .../network/vpc/NetworkACLServiceImplTest.java | 443 - ui/scripts/vpc.js | 25 +- 11 files changed, 749 insertions(+), 50 deletions(-) diff --git a/api/src/main/java/com/cloud/network/vpc/NetworkACLService.java b/api/src/main/java/com/cloud/network/vpc/NetworkACLService.java index 378b15c..7c4e8b4 100644 --- a/api/src/main/java/com/cloud/network/vpc/NetworkACLService.java +++ b/api/src/main/java/com/cloud/network/vpc/NetworkACLService.java @@ -21,6 +21,7 @@ import java.util.List; import org.apache.cloudstack.api.command.user.network.CreateNetworkACLCmd; import org.apache.cloudstack.api.command.user.network.ListNetworkACLListsCmd; import org.apache.cloudstack.api.command.user.network.ListNetworkACLsCmd; +import org.apache.cloudstack.api.command.user.network.MoveNetworkAclItemCmd; import org.apache.cloudstack.api.command.user.network.UpdateNetworkACLItemCmd; import org.apache.cloudstack.api.command.user.network.UpdateNetworkACLListCmd; @@ -28,6 +29,7 @@ import com.cloud.exception.ResourceUnavailableException; import com.cloud.utils.Pair; public interface NetworkACLService { + /** * Creates Network ACL for the specified VPC */ @@ -90,4 +92,8 @@ public interface NetworkACLService { NetworkACL updateNetworkACL(UpdateNetworkACLListCmd updateNetworkACLListCmd); -} +/** + * Updates a network item ACL to a new position. This method allows users to inform between which ACLs the given ACL will be placed. Therefore, the 'number' field will be filled out by the system in the best way possible to place the ACL accordingly. + */ +NetworkACLItem moveNetworkAclRuleToNewPosition(MoveNetworkAclItemCmd moveNetworkAclItemCmd); +} \ No newline at end of file diff --git a/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java b/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java index 7825bb4..56d5957 100644 --- a/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java +++ b/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java @@ -152,6 +152,8 @@ public class ApiConstants { public static final String ICMP_TYPE = "icmptype"; public static final String ID = "id"; public static final String IDS = "ids"; +public static final String PREVIOUS_ACL_RULE_ID = "previousaclruleid"; +public static final String NEXT_ACL_RULE_ID = "nextaclruleid"; public static final String INTERNAL_DNS1 = "internaldns1"; public static final String INTERNAL_DNS2 = "internaldns2"; public static final String INTERVAL_TYPE = "intervaltype"; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/network/MoveNetworkAclItemCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/network/MoveNetworkAclItemCmd.java new file mode 100644 index 000..aaa9c18 --- /dev/null +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/network/MoveNetworkAclItemCmd.java @@ -0,0 +1,96 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permission
[cloudstack] branch master updated: Remove 'todb' in favor of 'encodeURIComponent'. (#2572)
This is an automated email from the ASF dual-hosted git repository. dahn pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack.git The following commit(s) were added to refs/heads/master by this push: new 5d9ae35 Remove 'todb' in favor of 'encodeURIComponent'. (#2572) 5d9ae35 is described below commit 5d9ae35506f4765f9facbc1f7c865407652e9933 Author: Rafael Weingärtner AuthorDate: Mon Apr 16 08:44:27 2018 -0300 Remove 'todb' in favor of 'encodeURIComponent'. (#2572) While executing the find/replace, I found some blocks of duplicated code. Therefore, I extracted the duplicated part to an utils file, and then removed the duplicated blocks. --- ui/scripts/accountsWizard.js | 4 +- ui/scripts/cloudStack.js | 4 +- ui/scripts/globalSettings.js | 4 +- ui/scripts/instanceWizard.js | 2 +- ui/scripts/instances.js | 9 +- ui/scripts/sharedFunctions.js | 84 + ui/scripts/storage.js | 56 +-- ui/scripts/system.js | 214 +- ui/scripts/vpc.js | 8 +- ui/scripts/zoneWizard.js | 72 +++--- 10 files changed, 218 insertions(+), 239 deletions(-) diff --git a/ui/scripts/accountsWizard.js b/ui/scripts/accountsWizard.js index 78d4dd5..5b8e9a6 100644 --- a/ui/scripts/accountsWizard.js +++ b/ui/scripts/accountsWizard.js @@ -209,9 +209,7 @@ array1.push("&firstname=" + args.data.firstname); array1.push("&lastname=" + args.data.lastname); -var password = args.data.password; -password = todb(password); -array1.push("&password=" + password); +cloudStack.addPasswordToCommandUrlParameterArray(array1, args.data.password); } array1.push("&domainid=" + args.data.domainid); diff --git a/ui/scripts/cloudStack.js b/ui/scripts/cloudStack.js index f2173e1..ccc0267 100644 --- a/ui/scripts/cloudStack.js +++ b/ui/scripts/cloudStack.js @@ -223,9 +223,7 @@ var array1 = []; array1.push("&username=" + encodeURIComponent(args.data.username)); -var password = todb(args.data.password); -array1.push("&password=" + password); - +cloudStack.addPasswordToCommandUrlParameterArray(array1, args.data.password); var domain; if (args.data.domain != null && args.data.domain.length > 0) { if (args.data.domain.charAt(0) != "/") diff --git a/ui/scripts/globalSettings.js b/ui/scripts/globalSettings.js index eba8e68..ab03978 100644 --- a/ui/scripts/globalSettings.js +++ b/ui/scripts/globalSettings.js @@ -214,8 +214,8 @@ }, action: function(args) { var array = []; -array.push("&hostname=" + todb(args.data.hostname)); -array.push("&port=" + todb(args.data.port));; +array.push("&hostname=" + encodeURIComponent(args.data.hostname)); +array.push("&port=" + encodeURIComponent(args.data.port)); $.ajax({ url: createURL("addLdapConfiguration" + array.join("")), dataType: "json", diff --git a/ui/scripts/instanceWizard.js b/ui/scripts/instanceWizard.js index 680c6ae..116b994 100644 --- a/ui/scripts/instanceWizard.js +++ b/ui/scripts/instanceWizard.js @@ -1091,7 +1091,7 @@ var userdata = args.data.userdata; if (userdata != null && userdata.length > 0) { $.extend(deployVmData, { -userdata : todb(btoa(userdata)) +userdata : encodeURIComponent(btoa(userdata)) }); } diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js index 84d6003..0948db4 100644 --- a/ui/scripts/instances.js +++ b/ui/scripts/instances.js @@ -228,14 +228,7 @@ var array1 = []; array1.push("&snapshotmemory=" + (args.data.snapshotMemory == "on")); array1.push("&quiescevm=" + (args.data.quiescevm == "on")); -var displayname = args.data.name; -if (displayname != null && displayname.length > 0) { -array1.push("&name=" + todb(displayname)); -} -var description = args.data.description; -if (description != null && description.length > 0) { -array1.push("&description=" + todb(description)); -} + cloudStack.addNameAndDescriptionToCommandUrlParameterArray(array1, args.data); $.ajax({ url: createURL("createVMSnapshot&virtualma
[GitHub] DaanHoogland closed pull request #2572: Remove 'todb' in favor of 'encodeURIComponent'.
DaanHoogland closed pull request #2572: Remove 'todb' in favor of 'encodeURIComponent'. URL: https://github.com/apache/cloudstack/pull/2572 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/ui/scripts/accountsWizard.js b/ui/scripts/accountsWizard.js index 78d4dd50e62..5b8e9a62d54 100644 --- a/ui/scripts/accountsWizard.js +++ b/ui/scripts/accountsWizard.js @@ -209,9 +209,7 @@ array1.push("&firstname=" + args.data.firstname); array1.push("&lastname=" + args.data.lastname); -var password = args.data.password; -password = todb(password); -array1.push("&password=" + password); +cloudStack.addPasswordToCommandUrlParameterArray(array1, args.data.password); } array1.push("&domainid=" + args.data.domainid); diff --git a/ui/scripts/cloudStack.js b/ui/scripts/cloudStack.js index f2173e1a965..ccc0267a7ef 100644 --- a/ui/scripts/cloudStack.js +++ b/ui/scripts/cloudStack.js @@ -223,9 +223,7 @@ var array1 = []; array1.push("&username=" + encodeURIComponent(args.data.username)); -var password = todb(args.data.password); -array1.push("&password=" + password); - +cloudStack.addPasswordToCommandUrlParameterArray(array1, args.data.password); var domain; if (args.data.domain != null && args.data.domain.length > 0) { if (args.data.domain.charAt(0) != "/") diff --git a/ui/scripts/globalSettings.js b/ui/scripts/globalSettings.js index eba8e687b5b..ab03978c22a 100644 --- a/ui/scripts/globalSettings.js +++ b/ui/scripts/globalSettings.js @@ -214,8 +214,8 @@ }, action: function(args) { var array = []; -array.push("&hostname=" + todb(args.data.hostname)); -array.push("&port=" + todb(args.data.port));; +array.push("&hostname=" + encodeURIComponent(args.data.hostname)); +array.push("&port=" + encodeURIComponent(args.data.port)); $.ajax({ url: createURL("addLdapConfiguration" + array.join("")), dataType: "json", diff --git a/ui/scripts/instanceWizard.js b/ui/scripts/instanceWizard.js index 680c6ae44a7..116b994a11c 100644 --- a/ui/scripts/instanceWizard.js +++ b/ui/scripts/instanceWizard.js @@ -1091,7 +1091,7 @@ var userdata = args.data.userdata; if (userdata != null && userdata.length > 0) { $.extend(deployVmData, { -userdata : todb(btoa(userdata)) +userdata : encodeURIComponent(btoa(userdata)) }); } diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js index 84d60033045..0948db48d07 100644 --- a/ui/scripts/instances.js +++ b/ui/scripts/instances.js @@ -228,14 +228,7 @@ var array1 = []; array1.push("&snapshotmemory=" + (args.data.snapshotMemory == "on")); array1.push("&quiescevm=" + (args.data.quiescevm == "on")); -var displayname = args.data.name; -if (displayname != null && displayname.length > 0) { -array1.push("&name=" + todb(displayname)); -} -var description = args.data.description; -if (description != null && description.length > 0) { -array1.push("&description=" + todb(description)); -} + cloudStack.addNameAndDescriptionToCommandUrlParameterArray(array1, args.data); $.ajax({ url: createURL("createVMSnapshot&virtualmachineid=" + instance.id + array1.join("")), dataType: "json", diff --git a/ui/scripts/sharedFunctions.js b/ui/scripts/sharedFunctions.js index a2dc4eb21e6..6fd2c1ed766 100644 --- a/ui/scripts/sharedFunctions.js +++ b/ui/scripts/sharedFunctions.js @@ -180,11 +180,8 @@ var pollAsyncJobResult = function(args) { return urlString; } -function todb(val) { -return encodeURIComponent(val); -} -//LB provider map +//LB provider map var lbProviderMap = { "publicLb": { "non-vpc": ["VirtualRouter", "Netscaler", "F5"], @@ -735,16 +732,16 @@ var addGuestNetworkDialog = { if (selectedNetworkOfferingObj.guestiptype == "Shared") array1.push("&physicalnetworkid=" + args.data.physicalNetwo
[GitHub] rafaelweingartner commented on issue #2572: Remove 'todb' in favor of 'encodeURIComponent'.
rafaelweingartner commented on issue #2572: Remove 'todb' in favor of 'encodeURIComponent'. URL: https://github.com/apache/cloudstack/pull/2572#issuecomment-381552499 @borisstoyanov yes I did. I created RPM packages with this PR, then I installed them, and used ACS to see if there was something broken. This is an automated message from the Apache Git Service. To respond to the message, please log on 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 With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2553: Update inconsistent debugging info in catch block
blueorangutan commented on issue #2553: Update inconsistent debugging info in catch block URL: https://github.com/apache/cloudstack/pull/2553#issuecomment-381507072 Packaging result: ✔centos6 ✔centos7 ✔debian. JID-1928 This is an automated message from the Apache Git Service. To respond to the message, please log on 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 With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2505: WIP CLOUDSTACK-10333: Secure Live VM Migration for KVM
blueorangutan commented on issue #2505: WIP CLOUDSTACK-10333: Secure Live VM Migration for KVM URL: https://github.com/apache/cloudstack/pull/2505#issuecomment-381504553 @borisstoyanov 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 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 With regards, Apache Git Services
[GitHub] borisstoyanov commented on issue #2505: WIP CLOUDSTACK-10333: Secure Live VM Migration for KVM
borisstoyanov commented on issue #2505: WIP CLOUDSTACK-10333: Secure Live VM Migration for KVM URL: https://github.com/apache/cloudstack/pull/2505#issuecomment-381504294 @blueorangutan test This is an automated message from the Apache Git Service. To respond to the message, please log on 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 With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2553: Update inconsistent debugging info in catch block
blueorangutan commented on issue #2553: Update inconsistent debugging info in catch block URL: https://github.com/apache/cloudstack/pull/2553#issuecomment-381500527 @lzh3636 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 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 With regards, Apache Git Services
[GitHub] DaanHoogland closed pull request #2553: Update inconsistent debugging info in catch block
DaanHoogland closed pull request #2553: Update inconsistent debugging info in catch block URL: https://github.com/apache/cloudstack/pull/2553 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.java index fab7d9eef29..02c425553d8 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.java @@ -254,9 +254,8 @@ public void create() { setEntityUuid(result.getUuid()); } } catch (NetworkRuleConflictException ex) { -s_logger.info("Network rule conflict: " + ex.getMessage()); s_logger.trace("Network Rule Conflict: ", ex); -throw new ServerApiException(ApiErrorCode.NETWORK_RULE_CONFLICT_ERROR, ex.getMessage()); +throw new ServerApiException(ApiErrorCode.NETWORK_RULE_CONFLICT_ERROR, ex.getMessage(), ex); } } diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java index ea0cb00301a..ff11395ee37 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java @@ -358,9 +358,8 @@ public void create() { setEntityId(result.getId()); setEntityUuid(result.getUuid()); } catch (NetworkRuleConflictException ex) { -s_logger.info("Network rule conflict: ", ex); s_logger.trace("Network Rule Conflict: ", ex); -throw new ServerApiException(ApiErrorCode.NETWORK_RULE_CONFLICT_ERROR, ex.getMessage()); +throw new ServerApiException(ApiErrorCode.NETWORK_RULE_CONFLICT_ERROR, ex.getMessage(), ex); } } diff --git a/engine/schema/src/main/java/com/cloud/usage/dao/UsageDaoImpl.java b/engine/schema/src/main/java/com/cloud/usage/dao/UsageDaoImpl.java index 626b8ccf2be..f54db8dcd29 100644 --- a/engine/schema/src/main/java/com/cloud/usage/dao/UsageDaoImpl.java +++ b/engine/schema/src/main/java/com/cloud/usage/dao/UsageDaoImpl.java @@ -91,7 +91,7 @@ public void deleteRecordsForAccount(Long accountId) { txn.commit(); } catch (Exception ex) { txn.rollback(); -s_logger.error("error retrieving usage vm instances for account id: " + accountId); +s_logger.error("error retrieving usage vm instances for account id: " + accountId, ex); } finally { txn.close(); } diff --git a/plugins/event-bus/rabbitmq/src/main/java/org/apache/cloudstack/mom/rabbitmq/RabbitMQEventBus.java b/plugins/event-bus/rabbitmq/src/main/java/org/apache/cloudstack/mom/rabbitmq/RabbitMQEventBus.java index 0b0b0839e70..b2f173e27c9 100644 --- a/plugins/event-bus/rabbitmq/src/main/java/org/apache/cloudstack/mom/rabbitmq/RabbitMQEventBus.java +++ b/plugins/event-bus/rabbitmq/src/main/java/org/apache/cloudstack/mom/rabbitmq/RabbitMQEventBus.java @@ -237,9 +237,9 @@ public void handleDelivery(String queueName, Envelope envelope, AMQP.BasicProper s_subscribers.put(queueName, queueDetails); } catch (AlreadyClosedException closedException) { -s_logger.warn("Connection to AMQP service is lost. Subscription:" + queueName + " will be active after reconnection"); +s_logger.warn("Connection to AMQP service is lost. Subscription:" + queueName + " will be active after reconnection", closedException); } catch (ConnectException connectException) { -s_logger.warn("Connection to AMQP service is lost. Subscription:" + queueName + " will be active after reconnection"); +s_logger.warn("Connection to AMQP service is lost. Subscription:" + queueName + " will be active after reconnection", connectException); } catch (Exception e) { throw new EventBusException("Failed to subscribe to event due to " + e.getMessage()); } diff --git a/plugins/hypervisors/hyperv/src/main/java/com/cloud/ha/HypervInvestigator.java b/plugins/hypervisors/hyperv/src/main/java/com/cloud/ha/HypervInvestigator.java index 86f9165..774efc84b3a 100644 --- a/plugins/hypervisors/hyperv/src/main/java/com/cloud/ha/HypervInvestigator.java +++ b/plugins/hypervisors/hyperv/src/main/java/com/cloud/ha/HypervInvestigator.java @@ -68,7 +68,7 @@ public Status
[cloudstack] branch master updated: Update inconsistent debugging info in catch block (#2553)
This is an automated email from the ASF dual-hosted git repository. dahn pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack.git The following commit(s) were added to refs/heads/master by this push: new 106a9a3 Update inconsistent debugging info in catch block (#2553) 106a9a3 is described below commit 106a9a34e12843a76cd67d9ab13837f56d79785a Author: lzh3636 AuthorDate: Mon Apr 16 03:07:16 2018 -0400 Update inconsistent debugging info in catch block (#2553) * Add stack traces information * update stack trace info * update stack trace to make them consistent * update stack traces * update stacktraces * update stacktraces for other similar situations * fix some other situations * enhance other situations --- .../cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.java | 3 +-- .../api/command/user/firewall/CreatePortForwardingRuleCmd.java| 3 +-- engine/schema/src/main/java/com/cloud/usage/dao/UsageDaoImpl.java | 2 +- .../java/org/apache/cloudstack/mom/rabbitmq/RabbitMQEventBus.java | 4 ++-- .../hyperv/src/main/java/com/cloud/ha/HypervInvestigator.java | 2 +- .../ovm/src/main/java/com/cloud/ovm/hypervisor/OvmFencer.java | 4 ++-- .../simulator/src/main/java/com/cloud/ha/SimulatorFencer.java | 4 ++-- .../xenserver/src/main/java/com/cloud/ha/XenServerFencer.java | 4 ++-- .../com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java | 4 ++-- server/src/main/java/com/cloud/ha/KVMFencer.java | 4 ++-- server/src/main/java/com/cloud/server/ConfigurationServerImpl.java| 4 ++-- 11 files changed, 18 insertions(+), 20 deletions(-) diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.java index fab7d9e..02c4255 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.java @@ -254,9 +254,8 @@ public class CreateFirewallRuleCmd extends BaseAsyncCreateCmd implements Firewal setEntityUuid(result.getUuid()); } } catch (NetworkRuleConflictException ex) { -s_logger.info("Network rule conflict: " + ex.getMessage()); s_logger.trace("Network Rule Conflict: ", ex); -throw new ServerApiException(ApiErrorCode.NETWORK_RULE_CONFLICT_ERROR, ex.getMessage()); +throw new ServerApiException(ApiErrorCode.NETWORK_RULE_CONFLICT_ERROR, ex.getMessage(), ex); } } diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java index ea0cb00..ff11395 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java @@ -358,9 +358,8 @@ public class CreatePortForwardingRuleCmd extends BaseAsyncCreateCmd implements P setEntityId(result.getId()); setEntityUuid(result.getUuid()); } catch (NetworkRuleConflictException ex) { -s_logger.info("Network rule conflict: ", ex); s_logger.trace("Network Rule Conflict: ", ex); -throw new ServerApiException(ApiErrorCode.NETWORK_RULE_CONFLICT_ERROR, ex.getMessage()); +throw new ServerApiException(ApiErrorCode.NETWORK_RULE_CONFLICT_ERROR, ex.getMessage(), ex); } } diff --git a/engine/schema/src/main/java/com/cloud/usage/dao/UsageDaoImpl.java b/engine/schema/src/main/java/com/cloud/usage/dao/UsageDaoImpl.java index 626b8cc..f54db8d 100644 --- a/engine/schema/src/main/java/com/cloud/usage/dao/UsageDaoImpl.java +++ b/engine/schema/src/main/java/com/cloud/usage/dao/UsageDaoImpl.java @@ -91,7 +91,7 @@ public class UsageDaoImpl extends GenericDaoBase implements Usage txn.commit(); } catch (Exception ex) { txn.rollback(); -s_logger.error("error retrieving usage vm instances for account id: " + accountId); +s_logger.error("error retrieving usage vm instances for account id: " + accountId, ex); } finally { txn.close(); } diff --git a/plugins/event-bus/rabbitmq/src/main/java/org/apache/cloudstack/mom/rabbitmq/RabbitMQEventBus.java b/plugins/event-bus/rabbitmq/src/main/java/org/apache/cloudstack/mom/rabbitmq/RabbitMQEventBus.java index 0b0b083..b2f173e 100644 --- a/plugins/event-bus/rabbitmq/src/main/java/org/apache/cloudstack/mom/rabbitmq/RabbitMQEventBus.java +++ b/plugins/event-bus/rabbitmq/src/main/java/org/ap
[GitHub] DaanHoogland commented on issue #2573: Cloudstack 10356
DaanHoogland commented on issue #2573: Cloudstack 10356 URL: https://github.com/apache/cloudstack/pull/2573#issuecomment-381499966 removed a few tab chars @brettKK , sorry to not PR them but github failed at that This is an automated message from the Apache Git Service. To respond to the message, please log on 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 With regards, Apache Git Services