You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by GitBox <gi...@apache.org> on 2020/11/06 11:44:53 UTC
[GitHub] [cloudstack] ravening opened a new pull request #4452: Consider other conditions while listing templates with id
ravening opened a new pull request #4452:
URL: https://github.com/apache/cloudstack/pull/4452
## Description
<!--- Describe your changes in detail -->
Many of the searching conditions are not considered when
template id is passed but they are considered only when
template id is not passed. Move other conditions out of else
part so that they will be considered when id is passed.
<!-- For new features, provide link to FS, dev ML discussion etc. -->
<!-- In case of bug fix, the expected and actual behaviours, steps to reproduce. -->
<!-- When "Fixes: #<id>" is specified, the issue/PR will automatically be closed when this PR gets merged -->
<!-- For addressing multiple issues/PRs, use multiple "Fixes: #<id>" -->
<!-- Fixes: # -->
## Types of changes
<!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: -->
- [ ] Breaking change (fix or feature that would cause existing functionality to change)
- [ ] New feature (non-breaking change which adds functionality)
- [X] Bug fix (non-breaking change which fixes an issue)
- [ ] Enhancement (improves an existing feature and functionality)
- [ ] Cleanup (Code refactoring and cleanup, that may add test cases)
## Screenshots (if appropriate):
## How Has This Been Tested?
<!-- Please describe in detail how you tested your changes. -->
<!-- Include details of your testing environment, and the tests you ran to -->
<!-- see how your change affects other areas of the code, etc. -->
Without changes
```
(local) mgt01 > list templates templatefilter=all filter=id,hypervisor, id="45be18c7-c0fd-11ea-ba74-067606003392"
{
"count": 1,
"template": [
{
"hypervisor": "KVM",
"id": "45be18c7-c0fd-11ea-ba74-067606003392"
}
]
}
(local) mgt01 >
(local) mgt01 >
(local) mgt01 > list templates templatefilter=all filter=id,hypervisor, id="45be18c7-c0fd-11ea-ba74-067606003392" hypervisor=XenServer
{
"count": 1,
"template": [
{
"hypervisor": "KVM",
"id": "45be18c7-c0fd-11ea-ba74-067606003392"
}
]
}
```
With changes
```
(local) mgt01 > list templates templatefilter=all filter=id,hypervisor id="d9411172-3832-4fc9-a771-39514e0a9faa" hypervisor=KVM
{
"count": 1,
"template": [
{
"hypervisor": "KVM",
"id": "d9411172-3832-4fc9-a771-39514e0a9faa"
}
]
}
(local) mgt01 > list templates templatefilter=all filter=id,hypervisor id="d9411172-3832-4fc9-a771-39514e0a9faa" hypervisor=XenServer
(local) mgt01 >
```
<!-- Please read the [CONTRIBUTING](https://github.com/apache/cloudstack/blob/master/CONTRIBUTING.md) document -->
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4452: Consider other conditions while listing templates with id
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #4452:
URL: https://github.com/apache/cloudstack/pull/4452#issuecomment-723373389
<b>Trillian test result (tid-3134)</b>
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 32721 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr4452-t3134-kvm-centos7.zip
Intermittent failure detected: /marvin/tests/smoke/test_kubernetes_clusters.py
Smoke tests completed. 86 look OK, 0 have error(s)
Only failed tests results shown below:
Test | Result | Time (s) | Test File
--- | --- | --- | ---
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] DaanHoogland commented on pull request #4452: Consider other conditions while listing templates with id
Posted by GitBox <gi...@apache.org>.
DaanHoogland commented on pull request #4452:
URL: https://github.com/apache/cloudstack/pull/4452#issuecomment-723169749
@blueorangutan test
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] DaanHoogland commented on pull request #4452: Consider other conditions while listing templates with id
Posted by GitBox <gi...@apache.org>.
DaanHoogland commented on pull request #4452:
URL: https://github.com/apache/cloudstack/pull/4452#issuecomment-723149812
@blueorangutan package
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4452: Consider other conditions while listing templates with id
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #4452:
URL: https://github.com/apache/cloudstack/pull/4452#issuecomment-723150168
@DaanHoogland a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4452: Consider other conditions while listing templates with id
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #4452:
URL: https://github.com/apache/cloudstack/pull/4452#issuecomment-723170193
@DaanHoogland a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] DaanHoogland merged pull request #4452: Consider other conditions while listing templates with id
Posted by GitBox <gi...@apache.org>.
DaanHoogland merged pull request #4452:
URL: https://github.com/apache/cloudstack/pull/4452
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] DaanHoogland commented on a change in pull request #4452: Consider other conditions while listing templates with id
Posted by GitBox <gi...@apache.org>.
DaanHoogland commented on a change in pull request #4452:
URL: https://github.com/apache/cloudstack/pull/4452#discussion_r518810401
##########
File path: server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
##########
@@ -3434,11 +3434,6 @@ else if (!template.isPublicTemplate() && caller.getType() != Account.ACCOUNT_TYP
domain = _domainDao.findById(Domain.ROOT_DOMAIN);
}
- // List<HypervisorType> hypers = null;
- // if (!isIso) {
- // hypers = _resourceMgr.listAvailHypervisorInZone(null, null);
- // }
-
Review comment:
👍
##########
File path: server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
##########
@@ -3486,17 +3481,6 @@ else if (!template.isPublicTemplate() && caller.getType() != Account.ACCOUNT_TYP
}
}
- if (!isIso) {
- // add hypervisor criteria for template case
- if (hypers != null && !hypers.isEmpty()) {
- String[] relatedHypers = new String[hypers.size()];
- for (int i = 0; i < hypers.size(); i++) {
- relatedHypers[i] = hypers.get(i).toString();
- }
- sc.addAnd("hypervisorType", SearchCriteria.Op.IN, relatedHypers);
- }
- }
-
Review comment:
can you make it a method and put the call ...
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] ravening commented on a change in pull request #4452: Consider other conditions while listing templates with id
Posted by GitBox <gi...@apache.org>.
ravening commented on a change in pull request #4452:
URL: https://github.com/apache/cloudstack/pull/4452#discussion_r518824622
##########
File path: server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
##########
@@ -3486,17 +3481,6 @@ else if (!template.isPublicTemplate() && caller.getType() != Account.ACCOUNT_TYP
}
}
- if (!isIso) {
- // add hypervisor criteria for template case
- if (hypers != null && !hypers.isEmpty()) {
- String[] relatedHypers = new String[hypers.size()];
- for (int i = 0; i < hypers.size(); i++) {
- relatedHypers[i] = hypers.get(i).toString();
- }
- sc.addAnd("hypervisorType", SearchCriteria.Op.IN, relatedHypers);
- }
- }
-
Review comment:
@DaanHoogland done
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] DaanHoogland commented on pull request #4452: Consider other conditions while listing templates with id
Posted by GitBox <gi...@apache.org>.
DaanHoogland commented on pull request #4452:
URL: https://github.com/apache/cloudstack/pull/4452#issuecomment-723419924
@rhtyd simple fix for API usage quirk, can you review? cc @PaulAngus
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4452: Consider other conditions while listing templates with id
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #4452:
URL: https://github.com/apache/cloudstack/pull/4452#issuecomment-723167479
Packaging result: ✔centos7 ✔centos8 ✔debian. JID-2341
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org