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 2021/09/07 03:33:01 UTC

[GitHub] [cloudstack] nvazquez opened a new pull request #5103: Extend the Annotations framework

nvazquez opened a new pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103


   ### Description
   
   This PR extends the current annotations framework, to:
   - User VMs (existing)
   - Domains (existing)
   - Hosts (existing)
   - Instance groups
   - SSH keypairs
   - Kubernetes Clusters
   - Volumes
   - Snapshots
   - VM Snapshots
   - Networks
   - VPCs
   - Public IP addresses
   - VPN customer gateways
   - Templates
   - ISOs
   - Service offerings
   - Disks offerings
   - Network offerings
   - Zones
   - Pods
   - Clusters
   - Primary Storages
   - Secondary Storages
   - System VMs
   - Virtual Routers
   
   ### 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)
   
   ### Feature/Enhancement Scale or Bug Severity
   
   #### Feature/Enhancement Scale
   
   - [x] Major
   - [ ] Minor
   
   #### Bug Severity
   
   - [ ] BLOCKER
   - [ ] Critical
   - [x] Major
   - [ ] Minor
   - [ ] Trivial
   
   
   ### Screenshots (if appropriate):
   
   #### New comments section
   ![image](https://user-images.githubusercontent.com/5295080/126670833-1a01b405-1bd8-40de-92b3-790e7c04e4a0.png)
   - The Comments section is added as a new section on the sidebar
   - Users will see all their comments on different entities and can navigate to the entity by clicking on the entity ID
   - Admin will see all his comments and all the comments system-wide
      - Admin has the ability to create private comments and switch its visibility
   
   #### Quick visibility of comments on entities
   ![image](https://user-images.githubusercontent.com/5295080/126671467-49523eb4-78e9-4076-8048-138fe6cc7a7d.png)
   - The listing tables are extended, showing an icon next to the entity name indicating it has comments
   
   ### How Has This Been Tested?
   Tested on KVM environment (HW nor relevant) - created at least one entity/resource of each item in the list in the description. Created at least one comment per item by admin and user


-- 
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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-871969156


   Packaging result: :heavy_check_mark: centos7 :heavy_check_mark: centos8 :heavy_check_mark: debian. SL-JID 448


-- 
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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan removed a comment on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan removed a comment on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-859668578






-- 
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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-890055985


   <b>Trillian test result (tid-1426)</b>
   Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 56526 seconds
   Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr5103-t1426-kvm-centos7.zip
   Intermittent failure detected: /marvin/tests/smoke/test_annotations.py
   Intermittent failure detected: /marvin/tests/smoke/test_kubernetes_clusters.py
   Smoke tests completed. 87 look OK, 2 have error(s)
   Only failed tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   ContextSuite context=TestAnnotations>:teardown | `Error` | 0.09 | test_annotations.py
   test_01_invalid_upgrade_kubernetes_cluster | `Failure` | 3615.64 | test_kubernetes_clusters.py
   test_07_deploy_kubernetes_ha_cluster | `Failure` | 3609.35 | test_kubernetes_clusters.py
   test_08_deploy_and_upgrade_kubernetes_ha_cluster | `Failure` | 0.04 | test_kubernetes_clusters.py
   test_09_delete_kubernetes_ha_cluster | `Failure` | 0.04 | test_kubernetes_clusters.py
   ContextSuite context=TestKubernetesCluster>:teardown | `Error` | 93.08 | test_kubernetes_clusters.py
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez removed a comment on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
nvazquez removed a comment on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-884179630


   @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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-889363926


   Packaging result: :heavy_check_mark: el7 :heavy_check_mark: el8 :heavy_check_mark: debian. SL-JID 699


-- 
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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-895482978


   @nvazquez 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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-883494473


   Packaging result: :heavy_check_mark: el7 :heavy_check_mark: el8 :heavy_check_mark: debian. SL-JID 604


-- 
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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-911817043


   @nvazquez 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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] rhtyd merged pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
rhtyd merged pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103


   


-- 
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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] borisstoyanov commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
borisstoyanov commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-893191202


   @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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-897089687


   @nvazquez 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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
nvazquez commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-886786867


   @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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-885047063


   Packaging result: :heavy_check_mark: el7 :heavy_check_mark: el8 :heavy_check_mark: debian. SL-JID 631


-- 
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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-892294023


   <b>Trillian test result (tid-1460)</b>
   Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 47038 seconds
   Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr5103-t1460-kvm-centos7.zip
   Intermittent failure detected: /marvin/tests/smoke/test_annotations.py
   Intermittent failure detected: /marvin/tests/smoke/test_kubernetes_clusters.py
   Intermittent failure detected: /marvin/tests/smoke/test_password_server.py
   Intermittent failure detected: /marvin/tests/smoke/test_routers_network_ops.py
   Intermittent failure detected: /marvin/tests/smoke/test_vpc_redundant.py
   Intermittent failure detected: /marvin/tests/smoke/test_vpc_vpn.py
   Smoke tests completed. 85 look OK, 4 have error(s)
   Only failed tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   ContextSuite context=TestAnnotations>:teardown | `Error` | 11.56 | test_annotations.py
   test_08_deploy_and_upgrade_kubernetes_ha_cluster | `Failure` | 143.30 | test_kubernetes_clusters.py
   test_01_isolate_network_FW_PF_default_routes_egress_true | `Failure` | 92.38 | test_routers_network_ops.py
   test_02_RVR_Network_FW_PF_SSH_default_routes_egress_false | `Failure` | 351.94 | test_routers_network_ops.py
   test_01_create_redundant_VPC_2tiers_4VMs_4IPs_4PF_ACL | `Failure` | 538.93 | test_vpc_redundant.py
   test_03_create_redundant_VPC_1tier_2VMs_2IPs_2PF_ACL_reboot_routers | `Failure` | 540.27 | test_vpc_redundant.py
   test_05_rvpc_multi_tiers | `Failure` | 471.43 | test_vpc_redundant.py
   test_05_rvpc_multi_tiers | `Error` | 471.45 | test_vpc_redundant.py
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-893742909


   Packaging result: :heavy_check_mark: el7 :heavy_check_mark: el8 :heavy_check_mark: debian. SL-JID 767


-- 
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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez removed a comment on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
nvazquez removed a comment on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-884133880


   @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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-888754772


   @nvazquez 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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-894666437


   <b>Trillian test result (tid-1521)</b>
   Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 47767 seconds
   Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr5103-t1521-kvm-centos7.zip
   Intermittent failure detected: /marvin/tests/smoke/test_internal_lb.py
   Intermittent failure detected: /marvin/tests/smoke/test_routers_network_ops.py
   Intermittent failure detected: /marvin/tests/smoke/test_vpc_redundant.py
   Intermittent failure detected: /marvin/tests/smoke/test_vpc_vpn.py
   Smoke tests completed. 86 look OK, 3 have error(s)
   Only failed tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   test_02_internallb_roundrobin_1RVPC_3VM_HTTP_port80 | `Error` | 771.17 | test_internal_lb.py
   test_01_create_redundant_VPC_2tiers_4VMs_4IPs_4PF_ACL | `Failure` | 550.44 | test_vpc_redundant.py
   test_03_create_redundant_VPC_1tier_2VMs_2IPs_2PF_ACL_reboot_routers | `Failure` | 556.63 | test_vpc_redundant.py
   test_05_rvpc_multi_tiers | `Failure` | 523.37 | test_vpc_redundant.py
   test_01_vpc_site2site_vpn_multiple_options | `Failure` | 502.47 | test_vpc_vpn.py
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez removed a comment on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
nvazquez removed a comment on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-880042732


   @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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
nvazquez commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-888744710


   @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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
nvazquez commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-891797399


   @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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez removed a comment on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
nvazquez removed a comment on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-885018007


   @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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
nvazquez commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-894583819


   @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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez closed pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
nvazquez closed pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103


   


-- 
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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
nvazquez commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-900462696


   @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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-905205074


   Packaging result: :heavy_check_mark: el7 :heavy_check_mark: el8 :heavy_check_mark: debian :heavy_check_mark: suse15. SL-JID 1005


-- 
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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-906902153


   @nvazquez 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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-888261455


   Packaging result: :heavy_check_mark: el7 :heavy_check_mark: el8 :heavy_check_mark: debian. SL-JID 670


-- 
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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez removed a comment on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
nvazquez removed a comment on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-859668391


   @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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-888754337


   Packaging result: :heavy_check_mark: el7 :heavy_check_mark: el8 :heavy_check_mark: debian. SL-JID 676


-- 
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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-901537947


   @nvazquez 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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-897417146


   <b>Trillian test result (tid-1612)</b>
   Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 40331 seconds
   Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr5103-t1612-kvm-centos7.zip
   Intermittent failure detected: /marvin/tests/smoke/test_kubernetes_clusters.py
   Intermittent failure detected: /marvin/tests/smoke/test_persistent_network.py
   Smoke tests completed. 89 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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
nvazquez commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-885048433


   @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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
nvazquez commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-883393783


   @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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
nvazquez commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-884133880


   @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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-901546249


   Packaging result: :heavy_check_mark: el7 :heavy_check_mark: el8 :heavy_check_mark: debian. SL-JID 915


-- 
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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
nvazquez commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-906901840


   @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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] borisstoyanov commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
borisstoyanov commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-905236141


   @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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-888745457


   @nvazquez 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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
nvazquez commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-888012132


   @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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-871943710


   @nvazquez 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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
nvazquez commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-885018007


   @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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
nvazquez commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-885028443


   @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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-889230918


   <b>Trillian test result (tid-1399)</b>
   Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 43391 seconds
   Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr5103-t1399-kvm-centos7.zip
   Intermittent failure detected: /marvin/tests/smoke/test_annotations.py
   Intermittent failure detected: /marvin/tests/smoke/test_nic.py
   Intermittent failure detected: /marvin/tests/smoke/test_primary_storage.py
   Intermittent failure detected: /marvin/tests/smoke/test_privategw_acl.py
   Intermittent failure detected: /marvin/tests/smoke/test_routers_network_ops.py
   Intermittent failure detected: /marvin/tests/smoke/test_snapshots.py
   Intermittent failure detected: /marvin/tests/smoke/test_vm_life_cycle.py
   Intermittent failure detected: /marvin/tests/smoke/test_vpc_vpn.py
   Intermittent failure detected: /marvin/tests/smoke/test_hostha_kvm.py
   Smoke tests completed. 81 look OK, 8 have error(s)
   Only failed tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   ContextSuite context=TestAnnotations>:teardown | `Error` | 0.10 | test_annotations.py
   test_01_nic | `Error` | 157.78 | test_nic.py
   test_01_add_primary_storage_disabled_host | `Error` | 0.55 | test_primary_storage.py
   test_01_primary_storage_nfs | `Error` | 0.12 | test_primary_storage.py
   ContextSuite context=TestStorageTags>:setup | `Error` | 0.20 | test_primary_storage.py
   test_02_vpc_privategw_static_routes | `Failure` | 1009.87 | test_privategw_acl.py
   test_01_RVR_Network_FW_PF_SSH_default_routes_egress_true | `Failure` | 353.87 | test_routers_network_ops.py
   test_02_list_snapshots_with_removed_data_store | `Error` | 1.16 | test_snapshots.py
   test_01_secure_vm_migration | `Error` | 168.51 | test_vm_life_cycle.py
   test_02_unsecure_vm_migration | `Error` | 272.87 | test_vm_life_cycle.py
   test_03_secured_to_nonsecured_vm_migration | `Error` | 145.85 | test_vm_life_cycle.py
   test_08_migrate_vm | `Error` | 47.90 | test_vm_life_cycle.py
   test_hostha_kvm_host_degraded | `Error` | 734.91 | test_hostha_kvm.py
   test_hostha_kvm_host_fencing | `Error` | 681.14 | test_hostha_kvm.py
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] borisstoyanov commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
borisstoyanov commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-893191202


   @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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-883475887


   @nvazquez 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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-902010772


   Packaging result: :heavy_check_mark: el7 :heavy_check_mark: el8 :heavy_check_mark: debian :heavy_check_mark: suse15. SL-JID 939


-- 
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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-905192752


   Packaging result: :heavy_check_mark: el7 :heavy_check_mark: el8 :heavy_multiplication_x: debian :heavy_check_mark: suse15. SL-JID 1004


-- 
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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
nvazquez commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-871943280


   @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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-903465600


   @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 to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-901984993


   @nvazquez 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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] GutoVeronezi commented on a change in pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
GutoVeronezi commented on a change in pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#discussion_r675643119



##########
File path: api/src/main/java/org/apache/cloudstack/api/command/admin/annotation/UpdateAnnotationVisibilityCmd.java
##########
@@ -0,0 +1,74 @@
+// 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.admin.annotation;
+
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.exception.InsufficientCapacityException;
+import com.cloud.exception.NetworkRuleConflictException;
+import com.cloud.exception.ResourceAllocationException;
+import com.cloud.exception.ResourceUnavailableException;
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.AnnotationResponse;
+import org.apache.cloudstack.context.CallContext;
+
+@APICommand(name = UpdateAnnotationVisibilityCmd.APINAME, description = "update an annotation visibility.",
+        responseObject = AnnotationResponse.class,
+        requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
+        since = "4.16", authorized = {RoleType.Admin})
+public class UpdateAnnotationVisibilityCmd extends BaseCmd {
+
+    public static final String APINAME = "updateAnnotationVisibility";
+
+    @Parameter(name = ApiConstants.ID, type = CommandType.STRING, required = true,
+            description = "the id of the annotation")
+    private String uuid;
+
+    @Parameter(name = ApiConstants.ADMINS_ONLY, type = CommandType.BOOLEAN, required = true,
+            description = "the annotation is visible for admins only")
+    private Boolean adminsOnly;
+
+    public String getUuid() {
+        return uuid;
+    }
+
+    public Boolean getAdminsOnly() {
+        return adminsOnly;
+    }
+
+    @Override
+    public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException,
+            ConcurrentOperationException, ResourceAllocationException, NetworkRuleConflictException {
+        AnnotationResponse annotationResponse = annotationService.updateAnnotationVisibility(this);
+        annotationResponse.setResponseName(getCommandName());
+        this.setResponseObject(annotationResponse);
+    }
+
+    @Override
+    public String getCommandName() {
+        return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;

Review comment:
       We can use String.format to concatenate these strings.
   ```suggestion
           return String.format("%s%s", APINAME.toLowerCase(), BaseCmd.RESPONSE_SUFFIX);
   ```

##########
File path: engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41510to41600.java
##########
@@ -64,6 +64,32 @@ public boolean supportsRollingUpgrade() {
 
     @Override
     public void performDataMigration(Connection conn) {
+        generateUuidForExistingSshKeyPairs(conn);
+    }
+
+    private void generateUuidForExistingSshKeyPairs(Connection conn) {
+        LOG.debug("Generating uuid for existing ssh key-pairs");
+        try {
+            PreparedStatement pstmt = conn.prepareStatement("SELECT id FROM `cloud`.`ssh_keypairs` WHERE uuid is null");
+            ResultSet rs = pstmt.executeQuery();
+            if (rs.next()) {
+                long sshKeyId = rs.getLong(1);
+                pstmt = conn.prepareStatement("UPDATE `cloud`.`ssh_keypairs` SET `uuid` = UUID() WHERE id = ?");
+                pstmt.setLong(1, sshKeyId);
+                pstmt.executeUpdate();
+            }
+            if (!rs.isClosed())  {
+                rs.close();
+            }
+            if (!pstmt.isClosed())  {
+                pstmt.close();
+            }
+            LOG.debug("Successfully generated uuid for existing ssh key-pairs");
+        } catch (SQLException e) {
+            String errMsg = "Exception while generating uuid for existing ssh key-pairs: " + e.getMessage();
+            LOG.error(errMsg);

Review comment:
       We could pass the exception as parameter here.

##########
File path: api/src/main/java/org/apache/cloudstack/api/command/admin/host/UpdateHostCmd.java
##########
@@ -124,7 +124,7 @@ public void execute() {
         try {
             result = _resourceService.updateHost(this);
             if(getAnnotation() != null) {
-                annotationService.addAnnotation(getAnnotation(), AnnotationService.EntityType.HOST, result.getUuid());
+                annotationService.addAnnotation(getAnnotation(), AnnotationService.EntityType.HOST, result.getUuid(),true);

Review comment:
       ```suggestion
                   annotationService.addAnnotation(getAnnotation(), AnnotationService.EntityType.HOST, result.getUuid(), true);
   ```

##########
File path: server/src/main/java/org/apache/cloudstack/annotation/AnnotationManagerImpl.java
##########
@@ -53,64 +113,198 @@
     @Override
     @ActionEvent(eventType = EventTypes.EVENT_ANNOTATION_CREATE, eventDescription = "creating an annotation on an entity")
     public AnnotationResponse addAnnotation(AddAnnotationCmd addAnnotationCmd) {
-        return addAnnotation(addAnnotationCmd.getAnnotation(), addAnnotationCmd.getEntityType(), addAnnotationCmd.getEntityUuid());
+        return addAnnotation(addAnnotationCmd.getAnnotation(), addAnnotationCmd.getEntityType(),
+                addAnnotationCmd.getEntityUuid(), addAnnotationCmd.isAdminsOnly());
     }
 
-    public AnnotationResponse addAnnotation(String text, EntityType type, String uuid) {
-        CallContext ctx = CallContext.current();
-        String userUuid = ctx.getCallingUserUuid();
+    public AnnotationResponse addAnnotation(String text, EntityType type, String uuid, boolean adminsOnly) {
+        UserVO userVO = getCallingUserFromContext();
+        String userUuid = userVO.getUuid();
+        checkAnnotationPermissions(userUuid, type, userVO);
 
-        AnnotationVO annotation = new AnnotationVO(text, type, uuid);
+        AnnotationVO annotation = new AnnotationVO(text, type, uuid, adminsOnly);
         annotation.setUserUuid(userUuid);
         annotation = annotationDao.persist(annotation);
         return createAnnotationResponse(annotation);
     }
 
+    private void checkAnnotationPermissions(String entityUuid, EntityType type, UserVO user) {
+        if (!isCallingUserAdmin()) {

Review comment:
       We could invert this first if and add a return (and maybe a log), to reduce code indentation.

##########
File path: server/src/main/java/org/apache/cloudstack/annotation/AnnotationManagerImpl.java
##########
@@ -53,64 +113,198 @@
     @Override
     @ActionEvent(eventType = EventTypes.EVENT_ANNOTATION_CREATE, eventDescription = "creating an annotation on an entity")
     public AnnotationResponse addAnnotation(AddAnnotationCmd addAnnotationCmd) {
-        return addAnnotation(addAnnotationCmd.getAnnotation(), addAnnotationCmd.getEntityType(), addAnnotationCmd.getEntityUuid());
+        return addAnnotation(addAnnotationCmd.getAnnotation(), addAnnotationCmd.getEntityType(),
+                addAnnotationCmd.getEntityUuid(), addAnnotationCmd.isAdminsOnly());
     }
 
-    public AnnotationResponse addAnnotation(String text, EntityType type, String uuid) {
-        CallContext ctx = CallContext.current();
-        String userUuid = ctx.getCallingUserUuid();
+    public AnnotationResponse addAnnotation(String text, EntityType type, String uuid, boolean adminsOnly) {
+        UserVO userVO = getCallingUserFromContext();
+        String userUuid = userVO.getUuid();
+        checkAnnotationPermissions(userUuid, type, userVO);
 
-        AnnotationVO annotation = new AnnotationVO(text, type, uuid);
+        AnnotationVO annotation = new AnnotationVO(text, type, uuid, adminsOnly);
         annotation.setUserUuid(userUuid);
         annotation = annotationDao.persist(annotation);
         return createAnnotationResponse(annotation);
     }
 
+    private void checkAnnotationPermissions(String entityUuid, EntityType type, UserVO user) {
+        if (!isCallingUserAdmin()) {
+            if (!type.isUserAllowed()) {
+                throw new CloudRuntimeException("User " + user.getUsername() + " is not allowed to add annotations on type " + type.name());

Review comment:
       We could use `String.format` here.

##########
File path: server/src/main/java/org/apache/cloudstack/annotation/AnnotationManagerImpl.java
##########
@@ -53,64 +113,198 @@
     @Override
     @ActionEvent(eventType = EventTypes.EVENT_ANNOTATION_CREATE, eventDescription = "creating an annotation on an entity")
     public AnnotationResponse addAnnotation(AddAnnotationCmd addAnnotationCmd) {
-        return addAnnotation(addAnnotationCmd.getAnnotation(), addAnnotationCmd.getEntityType(), addAnnotationCmd.getEntityUuid());
+        return addAnnotation(addAnnotationCmd.getAnnotation(), addAnnotationCmd.getEntityType(),
+                addAnnotationCmd.getEntityUuid(), addAnnotationCmd.isAdminsOnly());
     }
 
-    public AnnotationResponse addAnnotation(String text, EntityType type, String uuid) {
-        CallContext ctx = CallContext.current();
-        String userUuid = ctx.getCallingUserUuid();
+    public AnnotationResponse addAnnotation(String text, EntityType type, String uuid, boolean adminsOnly) {
+        UserVO userVO = getCallingUserFromContext();
+        String userUuid = userVO.getUuid();
+        checkAnnotationPermissions(userUuid, type, userVO);
 
-        AnnotationVO annotation = new AnnotationVO(text, type, uuid);
+        AnnotationVO annotation = new AnnotationVO(text, type, uuid, adminsOnly);
         annotation.setUserUuid(userUuid);
         annotation = annotationDao.persist(annotation);
         return createAnnotationResponse(annotation);
     }
 
+    private void checkAnnotationPermissions(String entityUuid, EntityType type, UserVO user) {
+        if (!isCallingUserAdmin()) {
+            if (!type.isUserAllowed()) {
+                throw new CloudRuntimeException("User " + user.getUsername() + " is not allowed to add annotations on type " + type.name());
+            }
+            ensureEntityIsOwnedByTheUser(type.name(), entityUuid, user);
+        }
+    }
+
     @Override
     @ActionEvent(eventType = EventTypes.EVENT_ANNOTATION_REMOVE, eventDescription = "removing an annotation on an entity")
     public AnnotationResponse removeAnnotation(RemoveAnnotationCmd removeAnnotationCmd) {
         String uuid = removeAnnotationCmd.getUuid();
-        if(LOGGER.isDebugEnabled()) {
-            LOGGER.debug("marking annotation removed: " + uuid);
+        AnnotationVO annotation = annotationDao.findByUuid(uuid);
+        if (isCallingUserAllowedToRemoveAnnotation(annotation)) {
+            if(LOGGER.isDebugEnabled()) {
+                LOGGER.debug("marking annotation removed: " + uuid);
+            }
+            annotationDao.remove(annotation.getId());
+        } else {
+            throw new CloudRuntimeException("Only administrators or entity owner users can delete annotations, cannot remove annotation: " + uuid);
         }
+
+        return createAnnotationResponse(annotation);
+    }
+
+    @Override
+    public AnnotationResponse updateAnnotationVisibility(UpdateAnnotationVisibilityCmd cmd) {
+        String uuid = cmd.getUuid();
+        Boolean adminsOnly = cmd.getAdminsOnly();
         AnnotationVO annotation = annotationDao.findByUuid(uuid);
-        annotationDao.remove(annotation.getId());
+        if (annotation != null && isCallingUserAdmin()) {

Review comment:
       We could invert this if to reduce code indentation.

##########
File path: server/src/main/java/org/apache/cloudstack/annotation/AnnotationManagerImpl.java
##########
@@ -53,64 +113,198 @@
     @Override
     @ActionEvent(eventType = EventTypes.EVENT_ANNOTATION_CREATE, eventDescription = "creating an annotation on an entity")
     public AnnotationResponse addAnnotation(AddAnnotationCmd addAnnotationCmd) {
-        return addAnnotation(addAnnotationCmd.getAnnotation(), addAnnotationCmd.getEntityType(), addAnnotationCmd.getEntityUuid());
+        return addAnnotation(addAnnotationCmd.getAnnotation(), addAnnotationCmd.getEntityType(),
+                addAnnotationCmd.getEntityUuid(), addAnnotationCmd.isAdminsOnly());
     }
 
-    public AnnotationResponse addAnnotation(String text, EntityType type, String uuid) {
-        CallContext ctx = CallContext.current();
-        String userUuid = ctx.getCallingUserUuid();
+    public AnnotationResponse addAnnotation(String text, EntityType type, String uuid, boolean adminsOnly) {
+        UserVO userVO = getCallingUserFromContext();
+        String userUuid = userVO.getUuid();
+        checkAnnotationPermissions(userUuid, type, userVO);
 
-        AnnotationVO annotation = new AnnotationVO(text, type, uuid);
+        AnnotationVO annotation = new AnnotationVO(text, type, uuid, adminsOnly);
         annotation.setUserUuid(userUuid);
         annotation = annotationDao.persist(annotation);
         return createAnnotationResponse(annotation);
     }
 
+    private void checkAnnotationPermissions(String entityUuid, EntityType type, UserVO user) {
+        if (!isCallingUserAdmin()) {
+            if (!type.isUserAllowed()) {
+                throw new CloudRuntimeException("User " + user.getUsername() + " is not allowed to add annotations on type " + type.name());
+            }
+            ensureEntityIsOwnedByTheUser(type.name(), entityUuid, user);
+        }
+    }
+
     @Override
     @ActionEvent(eventType = EventTypes.EVENT_ANNOTATION_REMOVE, eventDescription = "removing an annotation on an entity")
     public AnnotationResponse removeAnnotation(RemoveAnnotationCmd removeAnnotationCmd) {
         String uuid = removeAnnotationCmd.getUuid();
-        if(LOGGER.isDebugEnabled()) {
-            LOGGER.debug("marking annotation removed: " + uuid);
+        AnnotationVO annotation = annotationDao.findByUuid(uuid);
+        if (isCallingUserAllowedToRemoveAnnotation(annotation)) {

Review comment:
       We could invert this if to reduce code indentation.

##########
File path: server/src/main/java/org/apache/cloudstack/annotation/AnnotationManagerImpl.java
##########
@@ -53,64 +113,198 @@
     @Override
     @ActionEvent(eventType = EventTypes.EVENT_ANNOTATION_CREATE, eventDescription = "creating an annotation on an entity")
     public AnnotationResponse addAnnotation(AddAnnotationCmd addAnnotationCmd) {
-        return addAnnotation(addAnnotationCmd.getAnnotation(), addAnnotationCmd.getEntityType(), addAnnotationCmd.getEntityUuid());
+        return addAnnotation(addAnnotationCmd.getAnnotation(), addAnnotationCmd.getEntityType(),
+                addAnnotationCmd.getEntityUuid(), addAnnotationCmd.isAdminsOnly());
     }
 
-    public AnnotationResponse addAnnotation(String text, EntityType type, String uuid) {
-        CallContext ctx = CallContext.current();
-        String userUuid = ctx.getCallingUserUuid();
+    public AnnotationResponse addAnnotation(String text, EntityType type, String uuid, boolean adminsOnly) {
+        UserVO userVO = getCallingUserFromContext();
+        String userUuid = userVO.getUuid();
+        checkAnnotationPermissions(userUuid, type, userVO);
 
-        AnnotationVO annotation = new AnnotationVO(text, type, uuid);
+        AnnotationVO annotation = new AnnotationVO(text, type, uuid, adminsOnly);
         annotation.setUserUuid(userUuid);
         annotation = annotationDao.persist(annotation);
         return createAnnotationResponse(annotation);
     }
 
+    private void checkAnnotationPermissions(String entityUuid, EntityType type, UserVO user) {
+        if (!isCallingUserAdmin()) {
+            if (!type.isUserAllowed()) {
+                throw new CloudRuntimeException("User " + user.getUsername() + " is not allowed to add annotations on type " + type.name());
+            }
+            ensureEntityIsOwnedByTheUser(type.name(), entityUuid, user);
+        }
+    }
+
     @Override
     @ActionEvent(eventType = EventTypes.EVENT_ANNOTATION_REMOVE, eventDescription = "removing an annotation on an entity")
     public AnnotationResponse removeAnnotation(RemoveAnnotationCmd removeAnnotationCmd) {
         String uuid = removeAnnotationCmd.getUuid();
-        if(LOGGER.isDebugEnabled()) {
-            LOGGER.debug("marking annotation removed: " + uuid);
+        AnnotationVO annotation = annotationDao.findByUuid(uuid);
+        if (isCallingUserAllowedToRemoveAnnotation(annotation)) {
+            if(LOGGER.isDebugEnabled()) {
+                LOGGER.debug("marking annotation removed: " + uuid);
+            }
+            annotationDao.remove(annotation.getId());
+        } else {
+            throw new CloudRuntimeException("Only administrators or entity owner users can delete annotations, cannot remove annotation: " + uuid);
         }
+
+        return createAnnotationResponse(annotation);
+    }
+
+    @Override
+    public AnnotationResponse updateAnnotationVisibility(UpdateAnnotationVisibilityCmd cmd) {
+        String uuid = cmd.getUuid();
+        Boolean adminsOnly = cmd.getAdminsOnly();
         AnnotationVO annotation = annotationDao.findByUuid(uuid);
-        annotationDao.remove(annotation.getId());
+        if (annotation != null && isCallingUserAdmin()) {
+            if(LOGGER.isDebugEnabled()) {
+                LOGGER.debug("updating annotation visibility: " + uuid);
+            }
+            annotation.setAdminsOnly(adminsOnly);
+            annotationDao.update(annotation.getId(), annotation);
+        } else {
+            throw new CloudRuntimeException("Cannot update visibility for annotation: " + uuid);

Review comment:
       We could improve this exception by adding more context info.

##########
File path: server/src/main/java/org/apache/cloudstack/annotation/AnnotationManagerImpl.java
##########
@@ -53,64 +113,198 @@
     @Override
     @ActionEvent(eventType = EventTypes.EVENT_ANNOTATION_CREATE, eventDescription = "creating an annotation on an entity")
     public AnnotationResponse addAnnotation(AddAnnotationCmd addAnnotationCmd) {
-        return addAnnotation(addAnnotationCmd.getAnnotation(), addAnnotationCmd.getEntityType(), addAnnotationCmd.getEntityUuid());
+        return addAnnotation(addAnnotationCmd.getAnnotation(), addAnnotationCmd.getEntityType(),
+                addAnnotationCmd.getEntityUuid(), addAnnotationCmd.isAdminsOnly());
     }
 
-    public AnnotationResponse addAnnotation(String text, EntityType type, String uuid) {
-        CallContext ctx = CallContext.current();
-        String userUuid = ctx.getCallingUserUuid();
+    public AnnotationResponse addAnnotation(String text, EntityType type, String uuid, boolean adminsOnly) {
+        UserVO userVO = getCallingUserFromContext();
+        String userUuid = userVO.getUuid();
+        checkAnnotationPermissions(userUuid, type, userVO);
 
-        AnnotationVO annotation = new AnnotationVO(text, type, uuid);
+        AnnotationVO annotation = new AnnotationVO(text, type, uuid, adminsOnly);
         annotation.setUserUuid(userUuid);
         annotation = annotationDao.persist(annotation);
         return createAnnotationResponse(annotation);
     }
 
+    private void checkAnnotationPermissions(String entityUuid, EntityType type, UserVO user) {
+        if (!isCallingUserAdmin()) {
+            if (!type.isUserAllowed()) {
+                throw new CloudRuntimeException("User " + user.getUsername() + " is not allowed to add annotations on type " + type.name());
+            }
+            ensureEntityIsOwnedByTheUser(type.name(), entityUuid, user);
+        }
+    }
+
     @Override
     @ActionEvent(eventType = EventTypes.EVENT_ANNOTATION_REMOVE, eventDescription = "removing an annotation on an entity")
     public AnnotationResponse removeAnnotation(RemoveAnnotationCmd removeAnnotationCmd) {
         String uuid = removeAnnotationCmd.getUuid();
-        if(LOGGER.isDebugEnabled()) {
-            LOGGER.debug("marking annotation removed: " + uuid);
+        AnnotationVO annotation = annotationDao.findByUuid(uuid);
+        if (isCallingUserAllowedToRemoveAnnotation(annotation)) {
+            if(LOGGER.isDebugEnabled()) {
+                LOGGER.debug("marking annotation removed: " + uuid);
+            }
+            annotationDao.remove(annotation.getId());
+        } else {
+            throw new CloudRuntimeException("Only administrators or entity owner users can delete annotations, cannot remove annotation: " + uuid);
         }
+
+        return createAnnotationResponse(annotation);
+    }
+
+    @Override
+    public AnnotationResponse updateAnnotationVisibility(UpdateAnnotationVisibilityCmd cmd) {
+        String uuid = cmd.getUuid();
+        Boolean adminsOnly = cmd.getAdminsOnly();
         AnnotationVO annotation = annotationDao.findByUuid(uuid);
-        annotationDao.remove(annotation.getId());
+        if (annotation != null && isCallingUserAdmin()) {
+            if(LOGGER.isDebugEnabled()) {
+                LOGGER.debug("updating annotation visibility: " + uuid);

Review comment:
       We could improve this log by adding more context info.

##########
File path: server/src/main/java/org/apache/cloudstack/annotation/AnnotationManagerImpl.java
##########
@@ -53,64 +113,198 @@
     @Override
     @ActionEvent(eventType = EventTypes.EVENT_ANNOTATION_CREATE, eventDescription = "creating an annotation on an entity")
     public AnnotationResponse addAnnotation(AddAnnotationCmd addAnnotationCmd) {
-        return addAnnotation(addAnnotationCmd.getAnnotation(), addAnnotationCmd.getEntityType(), addAnnotationCmd.getEntityUuid());
+        return addAnnotation(addAnnotationCmd.getAnnotation(), addAnnotationCmd.getEntityType(),
+                addAnnotationCmd.getEntityUuid(), addAnnotationCmd.isAdminsOnly());
     }
 
-    public AnnotationResponse addAnnotation(String text, EntityType type, String uuid) {
-        CallContext ctx = CallContext.current();
-        String userUuid = ctx.getCallingUserUuid();
+    public AnnotationResponse addAnnotation(String text, EntityType type, String uuid, boolean adminsOnly) {
+        UserVO userVO = getCallingUserFromContext();
+        String userUuid = userVO.getUuid();
+        checkAnnotationPermissions(userUuid, type, userVO);
 
-        AnnotationVO annotation = new AnnotationVO(text, type, uuid);
+        AnnotationVO annotation = new AnnotationVO(text, type, uuid, adminsOnly);
         annotation.setUserUuid(userUuid);
         annotation = annotationDao.persist(annotation);
         return createAnnotationResponse(annotation);
     }
 
+    private void checkAnnotationPermissions(String entityUuid, EntityType type, UserVO user) {
+        if (!isCallingUserAdmin()) {
+            if (!type.isUserAllowed()) {
+                throw new CloudRuntimeException("User " + user.getUsername() + " is not allowed to add annotations on type " + type.name());
+            }
+            ensureEntityIsOwnedByTheUser(type.name(), entityUuid, user);
+        }
+    }
+
     @Override
     @ActionEvent(eventType = EventTypes.EVENT_ANNOTATION_REMOVE, eventDescription = "removing an annotation on an entity")
     public AnnotationResponse removeAnnotation(RemoveAnnotationCmd removeAnnotationCmd) {
         String uuid = removeAnnotationCmd.getUuid();
-        if(LOGGER.isDebugEnabled()) {
-            LOGGER.debug("marking annotation removed: " + uuid);
+        AnnotationVO annotation = annotationDao.findByUuid(uuid);
+        if (isCallingUserAllowedToRemoveAnnotation(annotation)) {
+            if(LOGGER.isDebugEnabled()) {
+                LOGGER.debug("marking annotation removed: " + uuid);
+            }
+            annotationDao.remove(annotation.getId());
+        } else {
+            throw new CloudRuntimeException("Only administrators or entity owner users can delete annotations, cannot remove annotation: " + uuid);

Review comment:
       We could improve this exception by adding more context info.

##########
File path: server/src/main/java/org/apache/cloudstack/annotation/AnnotationManagerImpl.java
##########
@@ -53,64 +113,198 @@
     @Override
     @ActionEvent(eventType = EventTypes.EVENT_ANNOTATION_CREATE, eventDescription = "creating an annotation on an entity")
     public AnnotationResponse addAnnotation(AddAnnotationCmd addAnnotationCmd) {
-        return addAnnotation(addAnnotationCmd.getAnnotation(), addAnnotationCmd.getEntityType(), addAnnotationCmd.getEntityUuid());
+        return addAnnotation(addAnnotationCmd.getAnnotation(), addAnnotationCmd.getEntityType(),
+                addAnnotationCmd.getEntityUuid(), addAnnotationCmd.isAdminsOnly());
     }
 
-    public AnnotationResponse addAnnotation(String text, EntityType type, String uuid) {
-        CallContext ctx = CallContext.current();
-        String userUuid = ctx.getCallingUserUuid();
+    public AnnotationResponse addAnnotation(String text, EntityType type, String uuid, boolean adminsOnly) {
+        UserVO userVO = getCallingUserFromContext();
+        String userUuid = userVO.getUuid();
+        checkAnnotationPermissions(userUuid, type, userVO);
 
-        AnnotationVO annotation = new AnnotationVO(text, type, uuid);
+        AnnotationVO annotation = new AnnotationVO(text, type, uuid, adminsOnly);
         annotation.setUserUuid(userUuid);
         annotation = annotationDao.persist(annotation);
         return createAnnotationResponse(annotation);
     }
 
+    private void checkAnnotationPermissions(String entityUuid, EntityType type, UserVO user) {
+        if (!isCallingUserAdmin()) {
+            if (!type.isUserAllowed()) {
+                throw new CloudRuntimeException("User " + user.getUsername() + " is not allowed to add annotations on type " + type.name());
+            }
+            ensureEntityIsOwnedByTheUser(type.name(), entityUuid, user);
+        }
+    }
+
     @Override
     @ActionEvent(eventType = EventTypes.EVENT_ANNOTATION_REMOVE, eventDescription = "removing an annotation on an entity")
     public AnnotationResponse removeAnnotation(RemoveAnnotationCmd removeAnnotationCmd) {
         String uuid = removeAnnotationCmd.getUuid();
-        if(LOGGER.isDebugEnabled()) {
-            LOGGER.debug("marking annotation removed: " + uuid);
+        AnnotationVO annotation = annotationDao.findByUuid(uuid);
+        if (isCallingUserAllowedToRemoveAnnotation(annotation)) {
+            if(LOGGER.isDebugEnabled()) {
+                LOGGER.debug("marking annotation removed: " + uuid);

Review comment:
       We could improve this log by adding more context info.

##########
File path: server/src/main/java/org/apache/cloudstack/annotation/AnnotationManagerImpl.java
##########
@@ -53,64 +113,198 @@
     @Override
     @ActionEvent(eventType = EventTypes.EVENT_ANNOTATION_CREATE, eventDescription = "creating an annotation on an entity")
     public AnnotationResponse addAnnotation(AddAnnotationCmd addAnnotationCmd) {
-        return addAnnotation(addAnnotationCmd.getAnnotation(), addAnnotationCmd.getEntityType(), addAnnotationCmd.getEntityUuid());
+        return addAnnotation(addAnnotationCmd.getAnnotation(), addAnnotationCmd.getEntityType(),
+                addAnnotationCmd.getEntityUuid(), addAnnotationCmd.isAdminsOnly());
     }
 
-    public AnnotationResponse addAnnotation(String text, EntityType type, String uuid) {
-        CallContext ctx = CallContext.current();
-        String userUuid = ctx.getCallingUserUuid();
+    public AnnotationResponse addAnnotation(String text, EntityType type, String uuid, boolean adminsOnly) {
+        UserVO userVO = getCallingUserFromContext();
+        String userUuid = userVO.getUuid();
+        checkAnnotationPermissions(userUuid, type, userVO);
 
-        AnnotationVO annotation = new AnnotationVO(text, type, uuid);
+        AnnotationVO annotation = new AnnotationVO(text, type, uuid, adminsOnly);
         annotation.setUserUuid(userUuid);
         annotation = annotationDao.persist(annotation);
         return createAnnotationResponse(annotation);
     }
 
+    private void checkAnnotationPermissions(String entityUuid, EntityType type, UserVO user) {
+        if (!isCallingUserAdmin()) {
+            if (!type.isUserAllowed()) {
+                throw new CloudRuntimeException("User " + user.getUsername() + " is not allowed to add annotations on type " + type.name());
+            }
+            ensureEntityIsOwnedByTheUser(type.name(), entityUuid, user);
+        }
+    }
+
     @Override
     @ActionEvent(eventType = EventTypes.EVENT_ANNOTATION_REMOVE, eventDescription = "removing an annotation on an entity")
     public AnnotationResponse removeAnnotation(RemoveAnnotationCmd removeAnnotationCmd) {
         String uuid = removeAnnotationCmd.getUuid();
-        if(LOGGER.isDebugEnabled()) {
-            LOGGER.debug("marking annotation removed: " + uuid);
+        AnnotationVO annotation = annotationDao.findByUuid(uuid);
+        if (isCallingUserAllowedToRemoveAnnotation(annotation)) {
+            if(LOGGER.isDebugEnabled()) {
+                LOGGER.debug("marking annotation removed: " + uuid);
+            }
+            annotationDao.remove(annotation.getId());
+        } else {
+            throw new CloudRuntimeException("Only administrators or entity owner users can delete annotations, cannot remove annotation: " + uuid);
         }
+
+        return createAnnotationResponse(annotation);
+    }
+
+    @Override
+    public AnnotationResponse updateAnnotationVisibility(UpdateAnnotationVisibilityCmd cmd) {
+        String uuid = cmd.getUuid();
+        Boolean adminsOnly = cmd.getAdminsOnly();
         AnnotationVO annotation = annotationDao.findByUuid(uuid);
-        annotationDao.remove(annotation.getId());
+        if (annotation != null && isCallingUserAdmin()) {
+            if(LOGGER.isDebugEnabled()) {
+                LOGGER.debug("updating annotation visibility: " + uuid);
+            }
+            annotation.setAdminsOnly(adminsOnly);
+            annotationDao.update(annotation.getId(), annotation);
+        } else {
+            throw new CloudRuntimeException("Cannot update visibility for annotation: " + uuid);
+        }
         return createAnnotationResponse(annotation);
     }
 
+    private boolean isCallingUserAllowedToRemoveAnnotation(AnnotationVO annotation) {
+        if (annotation == null) {
+            return false;
+        }
+        if (isCallingUserAdmin()) {
+            return true;
+        }
+        UserVO callingUser = getCallingUserFromContext();
+        String annotationOwnerUuid = annotation.getUserUuid();
+        return annotationOwnerUuid != null && annotationOwnerUuid.equals(callingUser.getUuid());
+    }
+
+    private UserVO getCallingUserFromContext() {
+        CallContext ctx = CallContext.current();
+        long userId = ctx.getCallingUserId();
+        UserVO userVO = userDao.findById(userId);
+        if (userVO == null) {
+            throw new CloudRuntimeException("Cannot find a user with ID " + userId);
+        }
+        return userVO;
+    }
+
+    private boolean isCallingUserAdmin() {
+        UserVO userVO = getCallingUserFromContext();
+        long accountId = userVO.getAccountId();
+        AccountVO accountVO = accountDao.findById(accountId);
+        if (accountVO == null) {
+            throw new CloudRuntimeException("Cannot find account with ID + " + accountId);
+        }
+        Long roleId = accountVO.getRoleId();
+        Role role = roleService.findRole(roleId);
+        if (role == null) {
+            throw new CloudRuntimeException("Cannot find role with ID " + roleId);
+        }
+        return adminRoles.contains(role.getRoleType());
+    }
+
     private List<AnnotationVO> getAnnotationsForApiCmd(ListAnnotationsCmd cmd) {
         List<AnnotationVO> annotations;
-        if(cmd.getUuid() != null) {
+        String userUuid = cmd.getUserUuid();
+        String entityUuid = cmd.getEntityUuid();
+        String entityType = cmd.getEntityType();
+        String annotationFilter = isNotBlank(cmd.getAnnotationFilter()) ? cmd.getAnnotationFilter() : "all";
+        boolean isCallerAdmin = isCallingUserAdmin();
+        if ((isBlank(entityUuid) || isBlank(entityType)) && !isCallerAdmin && annotationFilter.equalsIgnoreCase("all")) {

Review comment:
       `StringUtils` has the method `isAnyEmpty`, where we can validate several strings at the same time.




-- 
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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
nvazquez commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-905177977


   @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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
nvazquez commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-888754586


   @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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan removed a comment on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan removed a comment on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-884180026






-- 
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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
nvazquez commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-901984548


   @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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
nvazquez commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-911859988


   @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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
nvazquez commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-883475178


   @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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
nvazquez commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-884187873


   @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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
nvazquez commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-880042732


   @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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
nvazquez commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-905192919


   @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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] borisstoyanov commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
borisstoyanov commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-903465437


   @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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-893715725


   @nvazquez 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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-885028972


   @nvazquez 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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-888507307


   <b>Trillian test result (tid-1389)</b>
   Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 43329 seconds
   Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr5103-t1389-kvm-centos7.zip
   Intermittent failure detected: /marvin/tests/smoke/test_annotations.py
   Intermittent failure detected: /marvin/tests/smoke/test_internal_lb.py
   Intermittent failure detected: /marvin/tests/smoke/test_iso.py
   Intermittent failure detected: /marvin/tests/smoke/test_routers_network_ops.py
   Intermittent failure detected: /marvin/tests/smoke/test_vpc_redundant.py
   Smoke tests completed. 85 look OK, 4 have error(s)
   Only failed tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   test_04_rvpc_internallb_haproxy_stats_on_all_interfaces | `Error` | 269.90 | test_internal_lb.py
   ContextSuite context=TestAnnotations>:teardown | `Error` | 0.08 | test_annotations.py
   test_01_RVR_Network_FW_PF_SSH_default_routes_egress_true | `Failure` | 338.67 | test_routers_network_ops.py
   test_01_create_redundant_VPC_2tiers_4VMs_4IPs_4PF_ACL | `Failure` | 545.04 | test_vpc_redundant.py
   test_03_create_redundant_VPC_1tier_2VMs_2IPs_2PF_ACL_reboot_routers | `Failure` | 518.57 | test_vpc_redundant.py
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-890253228


   Packaging result: :heavy_check_mark: el7 :heavy_check_mark: el8 :heavy_check_mark: debian. SL-JID 714


-- 
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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-897108358


   @nvazquez 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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-900229747


   @borisstoyanov 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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] borisstoyanov commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
borisstoyanov commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-906950301


   @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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-893191430


   @borisstoyanov 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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-888020744


   Packaging result: :heavy_check_mark: el7 :heavy_check_mark: el8 :heavy_check_mark: debian. SL-JID 666


-- 
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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-911231584


   <b>Trillian test result (tid-1915)</b>
   Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 32941 seconds
   Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr5103-t1915-kvm-centos7.zip
   Smoke tests completed. 49 look OK, 40 have errors
   Only failed tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   ContextSuite context=TestAddVmToSubDomain>:setup | `Error` | 47.96 | test_accounts.py
   test_DeleteDomain | `Error` | 52.37 | test_accounts.py
   test_forceDeleteDomain | `Failure` | 48.23 | test_accounts.py
   test_01_user_remove_VM_running | `Error` | 53.44 | test_accounts.py
   test_01_internallb_roundrobin_1VPC_3VM_HTTP_port80 | `Error` | 43.05 | test_internal_lb.py
   test_01_internallb_roundrobin_1VPC_3VM_HTTP_port80 | `Error` | 43.06 | test_internal_lb.py
   test_02_internallb_roundrobin_1RVPC_3VM_HTTP_port80 | `Error` | 94.28 | test_internal_lb.py
   test_02_internallb_roundrobin_1RVPC_3VM_HTTP_port80 | `Error` | 94.28 | test_internal_lb.py
   test_03_vpc_internallb_haproxy_stats_on_all_interfaces | `Error` | 40.74 | test_internal_lb.py
   test_03_vpc_internallb_haproxy_stats_on_all_interfaces | `Error` | 40.74 | test_internal_lb.py
   test_04_rvpc_internallb_haproxy_stats_on_all_interfaces | `Error` | 88.78 | test_internal_lb.py
   test_04_rvpc_internallb_haproxy_stats_on_all_interfaces | `Error` | 88.78 | test_internal_lb.py
   test_DeployVmAntiAffinityGroup_in_project | `Error` | 43.09 | test_affinity_groups_projects.py
   test_09_project_suspend | `Error` | 37.16 | test_projects.py
   test_10_project_activation | `Error` | 10.35 | test_projects.py
   test_01_1_create_iso_with_checksum_sha1_negative | `Failure` | 6.68 | test_iso.py
   test_02_1_create_iso_with_checksum_sha256_negative | `Failure` | 6.64 | test_iso.py
   test_03_1_create_iso_with_checksum_md5_negative | `Failure` | 6.18 | test_iso.py
   test_04_extract_Iso | `Failure` | 1.22 | test_iso.py
   ContextSuite context=TestAnnotations>:setup | `Error` | 0.00 | test_annotations.py
   test_query_async_job_result | `Error` | 51.89 | test_async_job.py
   ContextSuite context=TestLoadBalance>:setup | `Error` | 0.00 | test_loadbalance.py
   test_list_vms_metrics | `Error` | 61.96 | test_metrics_api.py
   ContextSuite context=TestDeployVirtioSCSIVM>:setup | `Error` | 0.00 | test_deploy_virtio_scsi_vm.py
   test_deploy_vm_from_iso | `Error` | 65.01 | test_deploy_vm_iso.py
   test_network_acl | `Error` | 54.14 | test_network_acl.py
   test_deployvm_firstfit | `Error` | 35.96 | test_deploy_vms_with_varied_deploymentplanners.py
   test_deployvm_userconcentrated | `Error` | 10.35 | test_deploy_vms_with_varied_deploymentplanners.py
   test_deployvm_userdispersing | `Error` | 9.35 | test_deploy_vms_with_varied_deploymentplanners.py
   test_deployvm_userdata | `Error` | 44.46 | test_deploy_vm_with_userdata.py
   test_deployvm_userdata_post | `Error` | 9.42 | test_deploy_vm_with_userdata.py
   test_delete_account | `Error` | 41.63 | test_network.py
   test_delete_network_while_vm_on_it | `Error` | 6.36 | test_network.py
   test_delete_network_while_vm_on_it | `Error` | 6.36 | test_network.py
   test_deploy_vm_l2network | `Error` | 6.44 | test_network.py
   test_deploy_vm_l2network | `Error` | 6.45 | test_network.py
   test_l2network_restart | `Error` | 8.46 | test_network.py
   test_l2network_restart | `Error` | 8.46 | test_network.py
   ContextSuite context=TestL2Networks>:teardown | `Error` | 9.55 | test_network.py
   ContextSuite context=TestPortForwarding>:setup | `Error` | 72.51 | test_network.py
   ContextSuite context=TestPublicIP>:setup | `Error` | 45.44 | test_network.py
   test_reboot_router | `Error` | 39.74 | test_network.py
   test_releaseIP | `Error` | 38.57 | test_network.py
   ContextSuite context=TestRouterRules>:setup | `Error` | 82.22 | test_network.py
   ContextSuite context=TestRemoteDiagnostics>:setup | `Error` | 0.00 | test_diagnostics.py
   ContextSuite context=TestIsolatedNetworksPasswdServer>:setup | `Error` | 0.00 | test_password_server.py
   test_03_deploy_vm_domain_service_offering | `Error` | 53.42 | test_domain_service_offerings.py
   test_01_invalid_upgrade_kubernetes_cluster | `Failure` | 43.65 | test_kubernetes_clusters.py
   test_02_deploy_and_upgrade_kubernetes_cluster | `Failure` | 36.35 | test_kubernetes_clusters.py
   test_03_deploy_and_scale_kubernetes_cluster | `Failure` | 43.26 | test_kubernetes_clusters.py
   test_04_basic_lifecycle_kubernetes_cluster | `Failure` | 38.19 | test_kubernetes_clusters.py
   test_05_delete_kubernetes_cluster | `Failure` | 36.02 | test_kubernetes_clusters.py
   test_07_deploy_kubernetes_ha_cluster | `Failure` | 42.49 | test_kubernetes_clusters.py
   test_08_deploy_and_upgrade_kubernetes_ha_cluster | `Failure` | 38.09 | test_kubernetes_clusters.py
   test_09_delete_kubernetes_ha_cluster | `Failure` | 37.12 | test_kubernetes_clusters.py
   ContextSuite context=TestKubernetesCluster>:teardown | `Error` | 185.88 | test_kubernetes_clusters.py
   ContextSuite context=TestListIdsParams>:setup | `Error` | 0.00 | test_list_ids_parameter.py
   test_nic_secondaryip_add_remove | `Error` | 43.70 | test_multipleips_per_nic.py
   test_01_create_delete_portforwarding_fornonvpc | `Error` | 37.65 | test_portforwardingrules.py
   test_02_vpc_privategw_static_routes | `Failure` | 67.70 | test_privategw_acl.py
   test_02_vpc_privategw_static_routes | `Error` | 67.70 | test_privategw_acl.py
   test_03_vpc_privategw_restart_vpc_cleanup | `Failure` | 67.78 | test_privategw_acl.py
   test_03_vpc_privategw_restart_vpc_cleanup | `Error` | 67.79 | test_privategw_acl.py
   test_04_rvpc_privategw_static_routes | `Failure` | 146.57 | test_privategw_acl.py
   test_04_rvpc_privategw_static_routes | `Error` | 146.58 | test_privategw_acl.py
   ContextSuite context=TestResetVmOnReboot>:setup | `Error` | 0.00 | test_reset_vm_on_reboot.py
   test_01_so_removal_resource_update | `Error` | 35.00 | test_resource_accounting.py
   ContextSuite context=TestRouterDHCPHosts>:setup | `Error` | 0.00 | test_router_dhcphosts.py
   ContextSuite context=TestRouterDHCPOpts>:setup | `Error` | 0.00 | test_router_dhcphosts.py
   ContextSuite context=TestRouterDns>:setup | `Error` | 0.00 | test_router_dns.py
   ContextSuite context=TestRouterDnsService>:setup | `Error` | 0.00 | test_router_dnsservice.py
   test_02_routervm_iptables_policies | `Error` | 38.67 | test_routers_iptables_default_policy.py
   test_01_single_VPC_iptables_policies | `Error` | 62.65 | test_routers_iptables_default_policy.py
   test_01_single_VPC_iptables_policies | `Error` | 62.65 | test_routers_iptables_default_policy.py
   test_01_isolate_network_FW_PF_default_routes_egress_true | `Error` | 48.54 | test_routers_network_ops.py
   test_02_isolate_network_FW_PF_default_routes_egress_false | `Error` | 36.25 | test_routers_network_ops.py
   test_01_RVR_Network_FW_PF_SSH_default_routes_egress_true | `Error` | 78.55 | test_routers_network_ops.py
   test_02_RVR_Network_FW_PF_SSH_default_routes_egress_false | `Error` | 94.14 | test_routers_network_ops.py
   test_03_RVR_Network_check_router_state | `Error` | 91.54 | test_routers_network_ops.py
   ContextSuite context=TestRouterServices>:setup | `Error` | 0.00 | test_routers.py
   ContextSuite context=TestCpuCapServiceOfferings>:setup | `Error` | 0.00 | test_service_offerings.py
   ContextSuite context=TestServiceOfferings>:setup | `Error` | 51.01 | test_service_offerings.py
   ContextSuite context=TestSnapshotRootDisk>:setup | `Error` | 0.00 | test_snapshots.py
   test_02_1_create_template_with_checksum_sha1_negative | `Failure` | 5.20 | test_templates.py
   test_03_1_create_template_with_checksum_sha256_negative | `Failure` | 5.13 | test_templates.py
   test_04_1_create_template_with_checksum_md5_negative | `Failure` | 5.14 | test_templates.py
   test_04_extract_template | `Failure` | 1.07 | test_templates.py
   test_01_volume_usage | `Error` | 193.52 | test_usage.py
   test_10_attachAndDetach_iso | `Error` | 6.20 | test_vm_life_cycle.py
   test_06_download_detached_volume | `Failure` | 298.66 | test_volumes.py
   test_01_create_redundant_VPC_2tiers_4VMs_4IPs_4PF_ACL | `Failure` | 100.20 | test_vpc_redundant.py
   test_01_create_redundant_VPC_2tiers_4VMs_4IPs_4PF_ACL | `Error` | 100.21 | test_vpc_redundant.py
   test_02_redundant_VPC_default_routes | `Failure` | 90.40 | test_vpc_redundant.py
   test_02_redundant_VPC_default_routes | `Error` | 90.40 | test_vpc_redundant.py
   test_03_create_redundant_VPC_1tier_2VMs_2IPs_2PF_ACL_reboot_routers | `Failure` | 96.18 | test_vpc_redundant.py
   test_03_create_redundant_VPC_1tier_2VMs_2IPs_2PF_ACL_reboot_routers | `Error` | 96.19 | test_vpc_redundant.py
   test_04_rvpc_network_garbage_collector_nics | `Failure` | 91.30 | test_vpc_redundant.py
   test_04_rvpc_network_garbage_collector_nics | `Error` | 91.30 | test_vpc_redundant.py
   test_05_rvpc_multi_tiers | `Failure` | 87.24 | test_vpc_redundant.py
   test_05_rvpc_multi_tiers | `Error` | 87.25 | test_vpc_redundant.py
   test_01_VPC_nics_after_destroy | `Failure` | 50.15 | test_vpc_router_nics.py
   test_02_VPC_default_routes | `Failure` | 46.06 | test_vpc_router_nics.py
   test_01_redundant_vpc_site2site_vpn | `Failure` | 151.12 | test_vpc_vpn.py
   test_01_redundant_vpc_site2site_vpn | `Error` | 151.13 | test_vpc_vpn.py
   test_01_vpc_site2site_vpn_multiple_options | `Failure` | 67.18 | test_vpc_vpn.py
   test_01_vpc_site2site_vpn_multiple_options | `Error` | 67.19 | test_vpc_vpn.py
   test_01_vpc_remote_access_vpn | `Failure` | 50.47 | test_vpc_vpn.py
   test_01_vpc_remote_access_vpn | `Error` | 50.48 | test_vpc_vpn.py
   test_01_vpc_site2site_vpn | `Failure` | 68.59 | test_vpc_vpn.py
   test_01_vpc_site2site_vpn | `Error` | 68.60 | test_vpc_vpn.py
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-888288813


   UI build: :heavy_check_mark:
   Live QA URL: http://qa.cloudstack.cloud:8080/client/pr/5103 (SL-JID-440)


-- 
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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
nvazquez commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-910332279


   @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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
nvazquez commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-889347225


   @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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez removed a comment on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
nvazquez removed a comment on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-883438549


   @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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
nvazquez commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-871918704


   Thanks @GutoVeronezi I have addressed your comments, this is still in progress so will probably ask to re-review when it's ready


-- 
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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-903902480


   @nvazquez 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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-895499271


   Packaging result: :heavy_check_mark: el7 :heavy_check_mark: el8 :heavy_check_mark: debian. SL-JID 817


-- 
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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
nvazquez commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-903902311


   @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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-885716106


   Packaging result: :heavy_check_mark: el7 :heavy_check_mark: el8 :heavy_check_mark: debian. SL-JID 639


-- 
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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-883439458


   @nvazquez 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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-884253736


   Packaging result: :heavy_check_mark: el7 :heavy_check_mark: el8 :heavy_check_mark: debian. SL-JID 622


-- 
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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] borisstoyanov commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
borisstoyanov commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-904057418


   @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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-906914050


   Packaging result: :heavy_check_mark: el7 :heavy_check_mark: el8 :heavy_check_mark: debian :heavy_check_mark: suse15. SL-JID 1027


-- 
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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-907149967


   <b>Trillian test result (tid-1785)</b>
   Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 67182 seconds
   Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr5103-t1785-kvm-centos7.zip
   Intermittent failure detected: /marvin/tests/smoke/test_reset_vm_on_reboot.py
   Intermittent failure detected: /marvin/tests/smoke/test_resource_accounting.py
   Intermittent failure detected: /marvin/tests/smoke/test_router_dhcphosts.py
   Intermittent failure detected: /marvin/tests/smoke/test_router_dns.py
   Intermittent failure detected: /marvin/tests/smoke/test_router_dnsservice.py
   Intermittent failure detected: /marvin/tests/smoke/test_routers_iptables_default_policy.py
   Intermittent failure detected: /marvin/tests/smoke/test_routers_network_ops.py
   Intermittent failure detected: /marvin/tests/smoke/test_routers.py
   Intermittent failure detected: /marvin/tests/smoke/test_service_offerings.py
   Intermittent failure detected: /marvin/tests/smoke/test_snapshots.py
   Intermittent failure detected: /marvin/tests/smoke/test_ssvm.py
   Intermittent failure detected: /marvin/tests/smoke/test_vpc_redundant.py
   Smoke tests completed. 79 look OK, 10 have error(s)
   Only failed tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   ContextSuite context=TestResetVmOnReboot>:setup | `Error` | 0.00 | test_reset_vm_on_reboot.py
   ContextSuite context=TestRAMCPUResourceAccounting>:setup | `Error` | 0.00 | test_resource_accounting.py
   ContextSuite context=TestRouterDHCPHosts>:setup | `Error` | 0.00 | test_router_dhcphosts.py
   ContextSuite context=TestRouterDHCPOpts>:setup | `Error` | 0.00 | test_router_dhcphosts.py
   ContextSuite context=TestRouterDns>:setup | `Error` | 0.00 | test_router_dns.py
   ContextSuite context=TestRouterDnsService>:setup | `Error` | 0.00 | test_router_dnsservice.py
   ContextSuite context=TestRouterIpTablesPolicies>:setup | `Error` | 0.00 | test_routers_iptables_default_policy.py
   ContextSuite context=TestVPCIpTablesPolicies>:setup | `Error` | 0.00 | test_routers_iptables_default_policy.py
   ContextSuite context=TestIsolatedNetworks>:setup | `Error` | 0.00 | test_routers_network_ops.py
   ContextSuite context=TestRedundantIsolateNetworks>:setup | `Error` | 0.00 | test_routers_network_ops.py
   ContextSuite context=TestRouterServices>:setup | `Error` | 0.00 | test_routers.py
   ContextSuite context=TestCpuCapServiceOfferings>:setup | `Error` | 0.00 | test_service_offerings.py
   ContextSuite context=TestServiceOfferings>:setup | `Error` | 0.12 | test_service_offerings.py
   ContextSuite context=TestSnapshotRootDisk>:setup | `Error` | 0.00 | test_snapshots.py
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
nvazquez commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-910375377


   @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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] RodrigoDLopez commented on a change in pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
RodrigoDLopez commented on a change in pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#discussion_r680171003



##########
File path: api/src/main/java/org/apache/cloudstack/api/command/admin/annotation/ListAnnotationsCmd.java
##########
@@ -41,11 +41,24 @@
 
     @Parameter(name = ApiConstants.ID, type = CommandType.STRING, description = "the id of the annotation")
     private String uuid;
+
     @Parameter(name = ApiConstants.ENTITY_TYPE, type = CommandType.STRING, description = "the entity type")
     private String entityType;
+
     @Parameter(name = ApiConstants.ENTITY_ID, type = CommandType.STRING, description = "the id of the entity for which to show annotations")
     private String entityUuid;
 
+    @Parameter(name = ApiConstants.USER_ID, type = CommandType.STRING,

Review comment:
       maybe here too

##########
File path: engine/schema/src/main/java/org/apache/cloudstack/annotation/dao/AnnotationDaoImpl.java
##########
@@ -29,31 +32,89 @@
  */
 @Component
 public class AnnotationDaoImpl extends GenericDaoBase<AnnotationVO, Long> implements AnnotationDao {
-    private final SearchBuilder<AnnotationVO> AnnotationSearchByType;
-    private final SearchBuilder<AnnotationVO> AnnotationSearchByTypeAndUuid;
+    private final SearchBuilder<AnnotationVO> AnnotationSearchBuilder;
+    private final GenericSearchBuilder<AnnotationVO, Long> AnnotationCountSearchBuilder;
 
     public AnnotationDaoImpl() {
         super();
-        AnnotationSearchByType = createSearchBuilder();
-        AnnotationSearchByType.and("entityType", AnnotationSearchByType.entity().getEntityType(), SearchCriteria.Op.EQ);
-        AnnotationSearchByType.done();
-        AnnotationSearchByTypeAndUuid = createSearchBuilder();
-        AnnotationSearchByTypeAndUuid.and("entityType", AnnotationSearchByTypeAndUuid.entity().getEntityType(), SearchCriteria.Op.EQ);
-        AnnotationSearchByTypeAndUuid.and("entityUuid", AnnotationSearchByTypeAndUuid.entity().getEntityUuid(), SearchCriteria.Op.EQ);
-        AnnotationSearchByTypeAndUuid.done();
+        AnnotationSearchBuilder = createSearchBuilder();
+        AnnotationSearchBuilder.and("entityType", AnnotationSearchBuilder.entity().getEntityType(), SearchCriteria.Op.EQ);
+        AnnotationSearchBuilder.and("entityUuid", AnnotationSearchBuilder.entity().getEntityUuid(), SearchCriteria.Op.EQ);
+        AnnotationSearchBuilder.and("userUuid", AnnotationSearchBuilder.entity().getUserUuid(), SearchCriteria.Op.EQ);
+        AnnotationSearchBuilder.and("adminsOnly", AnnotationSearchBuilder.entity().getUserUuid(), SearchCriteria.Op.EQ);
+        AnnotationSearchBuilder.and("annotation", AnnotationSearchBuilder.entity().getAnnotation(), SearchCriteria.Op.LIKE);
+        AnnotationSearchBuilder.done();
 
+        AnnotationCountSearchBuilder = createSearchBuilder(Long.class);
+        AnnotationCountSearchBuilder.select(null, SearchCriteria.Func.COUNT, AnnotationCountSearchBuilder.entity().getId());
+        AnnotationCountSearchBuilder.and("entityType", AnnotationCountSearchBuilder.entity().getEntityType(), SearchCriteria.Op.EQ);
+        AnnotationCountSearchBuilder.and("entityUuid", AnnotationCountSearchBuilder.entity().getEntityUuid(), SearchCriteria.Op.EQ);
+        AnnotationCountSearchBuilder.done();
     }
 
-    @Override public List<AnnotationVO> findByEntityType(String entityType) {
-        SearchCriteria<AnnotationVO> sc = createSearchCriteria();
+    private List<AnnotationVO> listAnnotationsOrderedByCreatedDate(SearchCriteria<AnnotationVO> sc) {
+        Filter filter = new Filter(AnnotationVO.class, "created", false, null, null);
+        return listBy(sc, filter);
+    }
+
+    @Override public List<AnnotationVO> listByEntityType(String entityType, String userUuid, boolean isCallerAdmin, String annotationFilter, String callingUserUuid, String keyword) {

Review comment:
       I know that this is not a big thing. But i think it's better read this in two separate lines.
   ```
   @Override
   public List [...]
   ```
   

##########
File path: api/src/main/java/org/apache/cloudstack/api/command/admin/annotation/AddAnnotationCmd.java
##########
@@ -40,11 +41,17 @@
 
     @Parameter(name = ApiConstants.ANNOTATION, type = CommandType.STRING, description = "the annotation text")
     private String annotation;
+
     @Parameter(name = ApiConstants.ENTITY_TYPE, type = CommandType.STRING, description = "the entity type (only HOST is allowed atm)")
     private String entityType;
+
     @Parameter(name = ApiConstants.ENTITY_ID, type = CommandType.STRING, description = "the id of the entity to annotate")
     private String entityUuid;
 
+    @Parameter(name = ApiConstants.ADMINS_ONLY, type = CommandType.BOOLEAN,

Review comment:
       wouldn't it be better if we add the flag since on this new parameter

##########
File path: engine/schema/src/main/java/org/apache/cloudstack/annotation/dao/AnnotationDaoImpl.java
##########
@@ -29,31 +32,89 @@
  */
 @Component
 public class AnnotationDaoImpl extends GenericDaoBase<AnnotationVO, Long> implements AnnotationDao {
-    private final SearchBuilder<AnnotationVO> AnnotationSearchByType;
-    private final SearchBuilder<AnnotationVO> AnnotationSearchByTypeAndUuid;
+    private final SearchBuilder<AnnotationVO> AnnotationSearchBuilder;
+    private final GenericSearchBuilder<AnnotationVO, Long> AnnotationCountSearchBuilder;
 
     public AnnotationDaoImpl() {
         super();
-        AnnotationSearchByType = createSearchBuilder();
-        AnnotationSearchByType.and("entityType", AnnotationSearchByType.entity().getEntityType(), SearchCriteria.Op.EQ);
-        AnnotationSearchByType.done();
-        AnnotationSearchByTypeAndUuid = createSearchBuilder();
-        AnnotationSearchByTypeAndUuid.and("entityType", AnnotationSearchByTypeAndUuid.entity().getEntityType(), SearchCriteria.Op.EQ);
-        AnnotationSearchByTypeAndUuid.and("entityUuid", AnnotationSearchByTypeAndUuid.entity().getEntityUuid(), SearchCriteria.Op.EQ);
-        AnnotationSearchByTypeAndUuid.done();
+        AnnotationSearchBuilder = createSearchBuilder();
+        AnnotationSearchBuilder.and("entityType", AnnotationSearchBuilder.entity().getEntityType(), SearchCriteria.Op.EQ);
+        AnnotationSearchBuilder.and("entityUuid", AnnotationSearchBuilder.entity().getEntityUuid(), SearchCriteria.Op.EQ);
+        AnnotationSearchBuilder.and("userUuid", AnnotationSearchBuilder.entity().getUserUuid(), SearchCriteria.Op.EQ);
+        AnnotationSearchBuilder.and("adminsOnly", AnnotationSearchBuilder.entity().getUserUuid(), SearchCriteria.Op.EQ);
+        AnnotationSearchBuilder.and("annotation", AnnotationSearchBuilder.entity().getAnnotation(), SearchCriteria.Op.LIKE);
+        AnnotationSearchBuilder.done();
 
+        AnnotationCountSearchBuilder = createSearchBuilder(Long.class);
+        AnnotationCountSearchBuilder.select(null, SearchCriteria.Func.COUNT, AnnotationCountSearchBuilder.entity().getId());
+        AnnotationCountSearchBuilder.and("entityType", AnnotationCountSearchBuilder.entity().getEntityType(), SearchCriteria.Op.EQ);
+        AnnotationCountSearchBuilder.and("entityUuid", AnnotationCountSearchBuilder.entity().getEntityUuid(), SearchCriteria.Op.EQ);
+        AnnotationCountSearchBuilder.done();
     }
 
-    @Override public List<AnnotationVO> findByEntityType(String entityType) {
-        SearchCriteria<AnnotationVO> sc = createSearchCriteria();
+    private List<AnnotationVO> listAnnotationsOrderedByCreatedDate(SearchCriteria<AnnotationVO> sc) {
+        Filter filter = new Filter(AnnotationVO.class, "created", false, null, null);
+        return listBy(sc, filter);
+    }
+
+    @Override public List<AnnotationVO> listByEntityType(String entityType, String userUuid, boolean isCallerAdmin, String annotationFilter, String callingUserUuid, String keyword) {
+        SearchCriteria<AnnotationVO> sc = AnnotationSearchBuilder.create();
         sc.addAnd("entityType", SearchCriteria.Op.EQ, entityType);
-        return listBy(sc);
+        if (StringUtils.isNotBlank(userUuid)) {
+            sc.addAnd("userUuid", SearchCriteria.Op.EQ, userUuid);
+        }
+        if (!isCallerAdmin) {
+            sc.addAnd("adminsOnly", SearchCriteria.Op.EQ, false);
+        }
+        if (StringUtils.isNotBlank(keyword)) {
+            sc.setParameters("annotation", "%" + keyword + "%");
+        }
+        return listAnnotationsOrderedByCreatedDate(sc);
     }
 
-    @Override public List<AnnotationVO> findByEntity(String entityType, String entityUuid) {
-        SearchCriteria<AnnotationVO> sc = createSearchCriteria();
+    @Override public List<AnnotationVO> listByEntity(String entityType, String entityUuid, String userUuid,

Review comment:
       if you consider change the other one. This one need to be changed too
   ```
   @Override
   public List [...]
   ```




-- 
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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez removed a comment on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
nvazquez removed a comment on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-871924286


   @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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-893208039


   Packaging result: :heavy_check_mark: el7 :heavy_check_mark: el8 :heavy_check_mark: debian. SL-JID 757


-- 
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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan removed a comment on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan removed a comment on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-883459700






-- 
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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez commented on a change in pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
nvazquez commented on a change in pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#discussion_r678226937



##########
File path: api/src/main/java/org/apache/cloudstack/api/command/admin/annotation/ListAnnotationsCmd.java
##########
@@ -41,11 +41,25 @@
 
     @Parameter(name = ApiConstants.ID, type = CommandType.STRING, description = "the id of the annotation")
     private String uuid;
+
     @Parameter(name = ApiConstants.ENTITY_TYPE, type = CommandType.STRING, description = "the entity type")
     private String entityType;
+
     @Parameter(name = ApiConstants.ENTITY_ID, type = CommandType.STRING, description = "the id of the entity for which to show annotations")
     private String entityUuid;
 
+    @Parameter(name = ApiConstants.USER_ID, type = CommandType.STRING,
+            description = "optional: the id of the user of the annotation", required = false)
+    private String userUuid;
+
+    @Parameter(name = ApiConstants.ANNOTATION_FILTER,
+            type = CommandType.STRING,
+            required = true,
+            description = "possible values are \"self\" and \"all\". "
+                    + "* self : annotations that have been created by the calling user. "
+                    + "* all : all templates (only usable by admins).")

Review comment:
       Done, thanks




-- 
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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-903925527


   Packaging result: :heavy_check_mark: el7 :heavy_check_mark: el8 :heavy_check_mark: debian :heavy_check_mark: suse15. SL-JID 980


-- 
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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-911859188


   Packaging result: :heavy_check_mark: el7 :heavy_check_mark: el8 :heavy_check_mark: debian :heavy_check_mark: suse15. SL-JID 1116


-- 
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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-871924441


   @nvazquez 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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] borisstoyanov commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
borisstoyanov commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-900834070


   @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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-900776289


   <b>Trillian test result (tid-1681)</b>
   Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 34992 seconds
   Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr5103-t1681-kvm-centos7.zip
   Intermittent failure detected: /marvin/tests/smoke/test_snapshots.py
   Smoke tests completed. 89 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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-887052308


   <b>Trillian test result (tid-1372)</b>
   Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 47289 seconds
   Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr5103-t1372-kvm-centos7.zip
   Intermittent failure detected: /marvin/tests/smoke/test_kubernetes_clusters.py
   Intermittent failure detected: /marvin/tests/smoke/test_routers_network_ops.py
   Intermittent failure detected: /marvin/tests/smoke/test_vpc_redundant.py
   Intermittent failure detected: /marvin/tests/smoke/test_hostha_kvm.py
   Smoke tests completed. 86 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` | 349.79 | test_routers_network_ops.py
   test_03_create_redundant_VPC_1tier_2VMs_2IPs_2PF_ACL_reboot_routers | `Failure` | 553.15 | test_vpc_redundant.py
   test_disable_oobm_ha_state_ineligible | `Error` | 1511.47 | test_hostha_kvm.py
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
nvazquez commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-886867004


   @blueorangutan test keepEnv


-- 
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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
nvazquez commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-885992465


   Thanks @GutoVeronezi - comments addressed
   @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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] DaanHoogland commented on a change in pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
DaanHoogland commented on a change in pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#discussion_r683166875



##########
File path: test/integration/smoke/test_annotations.py
##########
@@ -31,15 +31,69 @@
 
 _multiprocess_shared_ = True
 
-class TestHostAnnotations(cloudstackTestCase):
+
+class TestAnnotations(cloudstackTestCase):
+
+    @classmethod
+    def setUpClass(cls):
+        testClient = super(TestAnnotations, cls).getClsTestClient()
+        cls.apiclient = testClient.getApiClient()
+        cls.services = testClient.getParsedTestDataConfig()
+
+        # Get Zone, Domain and templates
+        cls.domain = get_domain(cls.apiclient)
+        cls.zone = get_zone(cls.apiclient, testClient.getZoneForTests())
+        cls.hypervisor = testClient.getHypervisorInfo()
+        cls.services['mode'] = cls.zone.networktype
+        template = get_test_template(
+            cls.apiclient,
+            cls.zone.id,
+            cls.hypervisor
+        )
+        if template == FAILED:
+            cls.fail("get_test_template() failed to return template")
+
+        cls.services["virtual_machine"]["zoneid"] = cls.zone.id
+
+        cls._cleanup = []
+
+        # Create an account, network, VM and IP addresses
+        cls.account = Account.create(
+            cls.apiclient,
+            cls.services["account"],
+            domainid=cls.domain.id
+        )
+        cls._cleanup.append(cls.account)
+        cls.userApiClient = testClient.getUserApiClient(cls.account.name, 'ROOT', 'User')
+
+        cls.service_offering = ServiceOffering.create(
+            cls.apiclient,
+            cls.services["service_offerings"]["tiny"]
+        )
+        cls._cleanup.append(cls.service_offering)
+        cls.user_vm = VirtualMachine.create(
+            cls.apiclient,
+            cls.services["virtual_machine"],
+            templateid=template.id,
+            accountid=cls.account.name,
+            domainid=cls.account.domainid,
+            serviceofferingid=cls.service_offering.id
+        )
+        cls._cleanup.append(cls.user_vm)
+        cls.host = list_hosts(cls.apiclient,
+                               zoneid=cls.zone.id,
+                               type='Routing')[0]
+
+    @classmethod
+    def tearDownClass(cls):
+        try:
+            cleanup_resources(cls.apiclient, cls._cleanup)
+        except Exception as e:
+            raise Exception("Warning: Exception during cleanup : %s" % e)

Review comment:
       ```suggestion
           super(TestAnnotations, cls).tearDownClass()
   ```
   
   the same (or similar) should be done for `tearDown(self)`




-- 
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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-884210963


   Packaging result: :heavy_check_mark: el7 :heavy_check_mark: el8 :heavy_check_mark: debian. SL-JID 621


-- 
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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
nvazquez commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-889481284


   @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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan removed a comment on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan removed a comment on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-871956383


   Packaging result: :heavy_check_mark: centos7 :heavy_check_mark: centos8 :heavy_check_mark: debian. SL-JID 443


-- 
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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-884188545


   @nvazquez 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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-900247488


   Packaging result: :heavy_check_mark: el7 :heavy_check_mark: el8 :heavy_check_mark: debian. SL-JID 892


-- 
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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-906950605


   @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 to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
nvazquez commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-888020806


   @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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-884180026


   @nvazquez 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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-886852579


   @nvazquez 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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-883436444


   Packaging result: :heavy_check_mark: el7 :heavy_check_mark: el8 :heavy_check_mark: debian. SL-JID 600


-- 
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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-884237127


   @nvazquez 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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-890322993


   <b>Trillian test result (tid-1438)</b>
   Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 34966 seconds
   Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr5103-t1438-kvm-centos7.zip
   Intermittent failure detected: /marvin/tests/smoke/test_annotations.py
   Intermittent failure detected: /marvin/tests/smoke/test_domain_vpc_offerings.py
   Intermittent failure detected: /marvin/tests/smoke/test_routers_network_ops.py
   Smoke tests completed. 88 look OK, 1 have error(s)
   Only failed tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   ContextSuite context=TestAnnotations>:teardown | `Error` | 0.08 | test_annotations.py
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
nvazquez commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-911815355


   @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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-891777324


   @nvazquez 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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-911566351


   @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 to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-905193056


   @nvazquez 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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
nvazquez commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-902374368


   @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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-905178343


   @nvazquez 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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
nvazquez commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-888285666


   @blueorangutan ui


-- 
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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-885992477


   @nvazquez 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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
nvazquez commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-890245652






-- 
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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
nvazquez commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-885037267


   @GutoVeronezi @DaanHoogland @davidjumani please review


-- 
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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-910375901


   @nvazquez 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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-871956383


   Packaging result: :heavy_check_mark: centos7 :heavy_check_mark: centos8 :heavy_check_mark: debian. SL-JID 443


-- 
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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-893191430






-- 
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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-885995343


   Packaging result: :heavy_check_mark: el7 :heavy_check_mark: el8 :heavy_check_mark: debian. SL-JID 643


-- 
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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-897105680


   Packaging result: :heavy_check_mark: el7 :heavy_check_mark: el8 :heavy_check_mark: debian. SL-JID 849


-- 
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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-910332985


   @nvazquez 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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
nvazquez commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-884269825


   @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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-884134598


   @nvazquez 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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez commented on a change in pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
nvazquez commented on a change in pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#discussion_r683718466



##########
File path: test/integration/smoke/test_annotations.py
##########
@@ -31,15 +31,69 @@
 
 _multiprocess_shared_ = True
 
-class TestHostAnnotations(cloudstackTestCase):
+
+class TestAnnotations(cloudstackTestCase):
+
+    @classmethod
+    def setUpClass(cls):
+        testClient = super(TestAnnotations, cls).getClsTestClient()
+        cls.apiclient = testClient.getApiClient()
+        cls.services = testClient.getParsedTestDataConfig()
+
+        # Get Zone, Domain and templates
+        cls.domain = get_domain(cls.apiclient)
+        cls.zone = get_zone(cls.apiclient, testClient.getZoneForTests())
+        cls.hypervisor = testClient.getHypervisorInfo()
+        cls.services['mode'] = cls.zone.networktype
+        template = get_test_template(
+            cls.apiclient,
+            cls.zone.id,
+            cls.hypervisor
+        )
+        if template == FAILED:
+            cls.fail("get_test_template() failed to return template")
+
+        cls.services["virtual_machine"]["zoneid"] = cls.zone.id
+
+        cls._cleanup = []
+
+        # Create an account, network, VM and IP addresses
+        cls.account = Account.create(
+            cls.apiclient,
+            cls.services["account"],
+            domainid=cls.domain.id
+        )
+        cls._cleanup.append(cls.account)
+        cls.userApiClient = testClient.getUserApiClient(cls.account.name, 'ROOT', 'User')
+
+        cls.service_offering = ServiceOffering.create(
+            cls.apiclient,
+            cls.services["service_offerings"]["tiny"]
+        )
+        cls._cleanup.append(cls.service_offering)
+        cls.user_vm = VirtualMachine.create(
+            cls.apiclient,
+            cls.services["virtual_machine"],
+            templateid=template.id,
+            accountid=cls.account.name,
+            domainid=cls.account.domainid,
+            serviceofferingid=cls.service_offering.id
+        )
+        cls._cleanup.append(cls.user_vm)
+        cls.host = list_hosts(cls.apiclient,
+                               zoneid=cls.zone.id,
+                               type='Routing')[0]
+
+    @classmethod
+    def tearDownClass(cls):
+        try:
+            cleanup_resources(cls.apiclient, cls._cleanup)
+        except Exception as e:
+            raise Exception("Warning: Exception during cleanup : %s" % e)

Review comment:
       Thanks, fixed




-- 
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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-902916204


   <b>Trillian test result (tid-1728)</b>
   Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 61666 seconds
   Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr5103-t1728-kvm-centos7.zip
   Intermittent failure detected: /marvin/tests/smoke/test_reset_vm_on_reboot.py
   Intermittent failure detected: /marvin/tests/smoke/test_resource_accounting.py
   Intermittent failure detected: /marvin/tests/smoke/test_router_dhcphosts.py
   Intermittent failure detected: /marvin/tests/smoke/test_router_dns.py
   Intermittent failure detected: /marvin/tests/smoke/test_router_dnsservice.py
   Intermittent failure detected: /marvin/tests/smoke/test_routers_iptables_default_policy.py
   Intermittent failure detected: /marvin/tests/smoke/test_routers_network_ops.py
   Intermittent failure detected: /marvin/tests/smoke/test_routers.py
   Intermittent failure detected: /marvin/tests/smoke/test_service_offerings.py
   Intermittent failure detected: /marvin/tests/smoke/test_snapshots.py
   Intermittent failure detected: /marvin/tests/smoke/test_ssvm.py
   Smoke tests completed. 79 look OK, 10 have error(s)
   Only failed tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   ContextSuite context=TestResetVmOnReboot>:setup | `Error` | 0.00 | test_reset_vm_on_reboot.py
   ContextSuite context=TestRAMCPUResourceAccounting>:setup | `Error` | 0.00 | test_resource_accounting.py
   ContextSuite context=TestRouterDHCPHosts>:setup | `Error` | 0.00 | test_router_dhcphosts.py
   ContextSuite context=TestRouterDHCPOpts>:setup | `Error` | 0.00 | test_router_dhcphosts.py
   ContextSuite context=TestRouterDns>:setup | `Error` | 0.00 | test_router_dns.py
   ContextSuite context=TestRouterDnsService>:setup | `Error` | 0.00 | test_router_dnsservice.py
   ContextSuite context=TestRouterIpTablesPolicies>:setup | `Error` | 0.00 | test_routers_iptables_default_policy.py
   ContextSuite context=TestVPCIpTablesPolicies>:setup | `Error` | 0.00 | test_routers_iptables_default_policy.py
   ContextSuite context=TestIsolatedNetworks>:setup | `Error` | 0.00 | test_routers_network_ops.py
   ContextSuite context=TestRedundantIsolateNetworks>:setup | `Error` | 0.00 | test_routers_network_ops.py
   ContextSuite context=TestRouterServices>:setup | `Error` | 0.00 | test_routers.py
   ContextSuite context=TestCpuCapServiceOfferings>:setup | `Error` | 0.00 | test_service_offerings.py
   ContextSuite context=TestServiceOfferings>:setup | `Error` | 0.12 | test_service_offerings.py
   ContextSuite context=TestSnapshotRootDisk>:setup | `Error` | 0.00 | test_snapshots.py
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-890256125


   @nvazquez 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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] davidjumani commented on a change in pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
davidjumani commented on a change in pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#discussion_r678205733



##########
File path: api/src/main/java/org/apache/cloudstack/api/command/admin/annotation/AddAnnotationCmd.java
##########
@@ -40,11 +41,17 @@
 
     @Parameter(name = ApiConstants.ANNOTATION, type = CommandType.STRING, description = "the annotation text")
     private String annotation;
+
     @Parameter(name = ApiConstants.ENTITY_TYPE, type = CommandType.STRING, description = "the entity type (only HOST is allowed atm)")
     private String entityType;
+
     @Parameter(name = ApiConstants.ENTITY_ID, type = CommandType.STRING, description = "the id of the entity to annotate")
     private String entityUuid;
 
+    @Parameter(name = ApiConstants.ADMINS_ONLY, type = CommandType.BOOLEAN,
+            description = "the annotation is visible for admins only")

Review comment:
       ```suggestion
               description = "the annotation is visible for admins only. Default is true")
   ```

##########
File path: ui/src/components/view/AnnotationsTab.vue
##########
@@ -0,0 +1,282 @@
+// 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.
+
+<template>
+
+  <div class="account-center-team" v-if="annotationType && 'listAnnotations' in $store.getters.apis">
+    <a-spin :spinning="loadingAnnotations">
+      <div class="title">
+        {{ $t('label.comments') }} ({{ notes.length }})
+      </div>
+      <a-divider :dashed="true" />
+      <a-list
+        v-if="notes.length"
+        :dataSource="notes"
+        itemLayout="horizontal"
+        size="small" >
+        <a-list-item slot="renderItem" slot-scope="item">
+          <a-comment
+            class="comment"
+            :content="item.annotation"
+            :datetime="$toLocaleDate(item.created)"
+            :author="item.username" >
+            <a-avatar
+              slot="avatar"
+              icon="message" />
+            <a-popconfirm
+              :title="$t('label.make') + ' ' + (item.adminsonly ? $t('label.annotation.everyone') : $t('label.annotation.admins.only')) + ' ?'"
+              v-if="['Admin'].includes($store.getters.userInfo.roletype)"
+              slot="actions"
+              key="visibility"
+              @confirm="updateVisibility(item)"
+              :okText="$t('label.yes')"
+              :cancelText="$t('label.no')" >
+              <a-icon
+                type="eye"
+                :style="[{
+                  color: item.adminsonly ? $config.theme['@primary-color'] : $config.theme['@disabled-color']
+                }]" />
+              <span>
+                {{ item.adminsonly ? $t('label.annotation.admins.only') : $t('label.annotation.everyone') }}
+              </span>
+            </a-popconfirm>
+          </a-comment>
+          <a-button
+            v-if="'removeAnnotation' in $store.getters.apis && isAdminOrAnnotationOwner(item)"
+            type="danger"
+            icon="delete"
+            shape="circle"
+            size="small"
+            @click="deleteNote(item)" >
+          </a-button>
+        </a-list-item>
+      </a-list>
+
+      <a-divider :dashed="true" />
+      <a-comment v-if="'addAnnotation' in $store.getters.apis">
+        <a-avatar
+          slot="avatar"
+          icon="edit"
+          @click="showNotesInput = true" />
+        <div slot="content" v-ctrl-enter="saveNote">
+          <a-textarea
+            rows="4"
+            @change="handleNoteChange"
+            :value="annotation"
+            :placeholder="$t('label.add.note')" />
+          <a-checkbox @change="toggleNoteVisibility" v-if="['Admin'].includes(this.$store.getters.userInfo.roletype)" style="margin-top: 10px">
+            {{ $t('label.annotation.admins.only') }}
+          </a-checkbox>
+          <a-button
+            style="margin-top: 10px; float: right"
+            @click="saveNote"
+            type="primary" >
+            {{ $t('label.save') }}
+          </a-button>
+        </div>
+      </a-comment>
+    </a-spin>
+  </div>
+</template>
+
+<script>
+
+import { api } from '@/api'
+
+export default {
+  name: 'AnnotationsTab',
+  props: {
+    resource: {
+      type: Object,
+      required: true
+    },
+    items: {
+      type: Array,
+      default: () => []
+    }
+  },
+  inject: ['parentFetchData'],
+  data () {
+    return {
+      loadingAnnotations: false,
+      notes: [],
+      annotation: '',
+      annotationType: '',
+      annotationAdminsOnly: false,
+      showNotesInput: false
+    }
+  },
+  watch: {
+    resource: function (newItem, oldItem) {
+      this.resource = newItem
+      this.resourceType = this.$route.meta.resourceType
+      this.annotationType = this.generateAnnotationType()
+      if (this.annotationType) {
+        this.getAnnotations()
+      }
+    }
+  },
+  created () {
+    this.fetchData()
+  },
+  methods: {
+    generateAnnotationType () {
+      switch (this.resourceType) {
+        case 'UserVm': return 'VM'
+        case 'Domain': return 'DOMAIN'
+        case 'Host': return 'HOST'
+        case 'Volume': return 'VOLUME'
+        case 'Snapshot': return 'SNAPSHOT'
+        case 'VMSnapshot': return 'VM_SNAPSHOT'
+        case 'VMInstanceGroup': return 'INSTANCE_GROUP'
+        case 'SSHKeyPair': return 'SSH_KEYPAIR'
+        case 'KubernetesCluster': return 'KUBERNETES_CLUSTER'
+        case 'Network': return 'NETWORK'
+        case 'Vpc': return 'VPC'
+        case 'PublicIpAddress': return 'PUBLIC_IP_ADDRESS'
+        case 'VPNCustomerGateway': return 'VPN_CUSTOMER_GATEWAY'
+        case 'Template': return 'TEMPLATE'
+        case 'ISO': return 'ISO'
+        case 'ServiceOffering': return 'SERVICE_OFFERING'
+        case 'DiskOffering': return 'DISK_OFFERING'
+        case 'NetworkOffering': return 'NETWORK_OFFERING'
+        case 'Zone': return 'ZONE'
+        case 'Pod': return 'POD'
+        case 'Cluster': return 'CLUSTER'
+        case 'PrimaryStorage': return 'PRIMARY_STORAGE'
+        case 'SecondaryStorage': return 'SECONDARY_STORAGE'
+        case 'SystemVm': return 'SYSTEM_VM'
+        case 'VirtualRouter': return 'VR'

Review comment:
       ```suggestion
           case 'VirtualRouter': return 'VR'
           case 'Kubernetes: return ''KUBERNETES_CLUSTER'
   ```

##########
File path: api/src/main/java/org/apache/cloudstack/api/command/admin/annotation/ListAnnotationsCmd.java
##########
@@ -41,11 +41,25 @@
 
     @Parameter(name = ApiConstants.ID, type = CommandType.STRING, description = "the id of the annotation")
     private String uuid;
+
     @Parameter(name = ApiConstants.ENTITY_TYPE, type = CommandType.STRING, description = "the entity type")
     private String entityType;
+
     @Parameter(name = ApiConstants.ENTITY_ID, type = CommandType.STRING, description = "the id of the entity for which to show annotations")
     private String entityUuid;
 
+    @Parameter(name = ApiConstants.USER_ID, type = CommandType.STRING,
+            description = "optional: the id of the user of the annotation", required = false)
+    private String userUuid;
+
+    @Parameter(name = ApiConstants.ANNOTATION_FILTER,
+            type = CommandType.STRING,
+            required = true,
+            description = "possible values are \"self\" and \"all\". "
+                    + "* self : annotations that have been created by the calling user. "
+                    + "* all : all templates (only usable by admins).")

Review comment:
       ```suggestion
                       + "* all : all annotations (only usable by admins).")
   ```

##########
File path: api/src/main/java/org/apache/cloudstack/api/command/admin/annotation/AddAnnotationCmd.java
##########
@@ -40,11 +41,17 @@
 
     @Parameter(name = ApiConstants.ANNOTATION, type = CommandType.STRING, description = "the annotation text")
     private String annotation;
+
     @Parameter(name = ApiConstants.ENTITY_TYPE, type = CommandType.STRING, description = "the entity type (only HOST is allowed atm)")
     private String entityType;
+
     @Parameter(name = ApiConstants.ENTITY_ID, type = CommandType.STRING, description = "the id of the entity to annotate")
     private String entityUuid;
 
+    @Parameter(name = ApiConstants.ADMINS_ONLY, type = CommandType.BOOLEAN,
+            description = "the annotation is visible for admins only")

Review comment:
       My bad




-- 
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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-906578964


   @nvazquez 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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
nvazquez commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-906482739


   @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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-887215578


   <b>Trillian test result (tid-1381)</b>
   Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 42629 seconds
   Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr5103-t1381-kvm-centos7.zip
   Intermittent failure detected: /marvin/tests/smoke/test_annotations.py
   Intermittent failure detected: /marvin/tests/smoke/test_internal_lb.py
   Intermittent failure detected: /marvin/tests/smoke/test_migration.py
   Intermittent failure detected: /marvin/tests/smoke/test_router_dhcphosts.py
   Intermittent failure detected: /marvin/tests/smoke/test_vpc_redundant.py
   Intermittent failure detected: /marvin/tests/smoke/test_vpc_vpn.py
   Smoke tests completed. 86 look OK, 3 have error(s)
   Only failed tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   test_01_internallb_roundrobin_1VPC_3VM_HTTP_port80 | `Error` | 449.53 | test_internal_lb.py
   test_02_internallb_roundrobin_1RVPC_3VM_HTTP_port80 | `Failure` | 495.90 | test_internal_lb.py
   ContextSuite context=TestAnnotations>:teardown | `Error` | 0.09 | test_annotations.py
   test_03_create_redundant_VPC_1tier_2VMs_2IPs_2PF_ACL_reboot_routers | `Failure` | 532.32 | test_vpc_redundant.py
   test_05_rvpc_multi_tiers | `Failure` | 515.09 | test_vpc_redundant.py
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-886866541


   Packaging result: :heavy_check_mark: el7 :heavy_check_mark: el8 :heavy_check_mark: debian. SL-JID 655


-- 
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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-886867632


   @nvazquez 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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-859668578






-- 
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] nvazquez commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
nvazquez commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-886852114


   @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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] GutoVeronezi commented on a change in pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
GutoVeronezi commented on a change in pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#discussion_r660912115



##########
File path: server/src/main/java/org/apache/cloudstack/annotation/AnnotationManagerImpl.java
##########
@@ -70,43 +88,103 @@ public AnnotationResponse addAnnotation(String text, EntityType type, String uui
     @ActionEvent(eventType = EventTypes.EVENT_ANNOTATION_REMOVE, eventDescription = "removing an annotation on an entity")
     public AnnotationResponse removeAnnotation(RemoveAnnotationCmd removeAnnotationCmd) {
         String uuid = removeAnnotationCmd.getUuid();
-        if(LOGGER.isDebugEnabled()) {
-            LOGGER.debug("marking annotation removed: " + uuid);
-        }
         AnnotationVO annotation = annotationDao.findByUuid(uuid);
-        annotationDao.remove(annotation.getId());
+        if (isCallingUserAllowedToRemoveAnnotation(annotation)) {
+            if(LOGGER.isDebugEnabled()) {
+                LOGGER.debug("marking annotation removed: " + uuid);
+            }
+            annotationDao.remove(annotation.getId());
+        } else {
+            throw new CloudRuntimeException("Only administrators or entity owner users can delete annotations, cannot remove annotation: " + uuid);
+        }
+
         return createAnnotationResponse(annotation);
     }
 
+    private boolean isCallingUserAllowedToRemoveAnnotation(AnnotationVO annotation) {
+        if (annotation == null) {
+            return false;
+        }
+        if (isCallingUserAdmin()) {
+            return true;
+        }
+        UserVO callingUser = getCallingUserFromContext();
+        String annotationOwnerUuid = annotation.getUserUuid();
+        return annotationOwnerUuid != null && annotationOwnerUuid.equals(callingUser.getUuid());
+    }
+
+    private UserVO getCallingUserFromContext() {
+        CallContext ctx = CallContext.current();
+        long userId = ctx.getCallingUserId();
+        UserVO userVO = userDao.findById(userId);
+        if (userVO == null) {
+            throw new CloudRuntimeException("Cannot find a user with ID " + userId);
+        }
+        return userVO;
+    }
+
+    private boolean isCallingUserAdmin() {
+        UserVO userVO = getCallingUserFromContext();
+        long accountId = userVO.getAccountId();
+        AccountVO accountVO = accountDao.findById(accountId);
+        if (accountVO == null) {
+            throw new CloudRuntimeException("Cannot find account with ID + " + accountId);
+        }
+        Long roleId = accountVO.getRoleId();
+        Role role = roleService.findRole(roleId);
+        if (role == null) {
+            throw new CloudRuntimeException("Cannot find role with ID " + roleId);
+        }
+        return RoleType.Admin.equals(role.getRoleType()) || RoleType.DomainAdmin.equals(role.getRoleType()) ||
+                RoleType.ResourceAdmin.equals(role.getRoleType());

Review comment:
       We could extract these roles to a list (constant) and verify if it contains the specified role.

##########
File path: api/src/main/java/org/apache/cloudstack/api/command/admin/annotation/AddAnnotationCmd.java
##########
@@ -63,6 +69,10 @@ public String getEntityUuid() {
         return entityUuid;
     }
 
+    public boolean isAdminsOnly() {
+        return adminsOnly != null && adminsOnly;

Review comment:
       We could use `org.apache.commons.lang3.BooleanUtils` here:
   
   ```java
   ...
   return BooleanUtils.toBoolean(adminsOnly);
   ...
   ```




-- 
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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] borisstoyanov commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
borisstoyanov commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-911565042


   @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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez edited a comment on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
nvazquez edited a comment on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-890226897


   Thanks for reviewing @RodrigoDLopez, I'll work on addressing your comments


-- 
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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
nvazquez commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-906578713


   @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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-885048810


   @nvazquez 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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-883394170


   @nvazquez 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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
nvazquez commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-884236898


   @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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-891790834


   Packaging result: :heavy_check_mark: el7 :heavy_check_mark: el8 :heavy_check_mark: debian. SL-JID 735


-- 
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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-891797541


   @nvazquez 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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-905236596


   @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 to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-901575856


   @nvazquez 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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-900463050


   @nvazquez 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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] borisstoyanov removed a comment on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
borisstoyanov removed a comment on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-900834070


   @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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-888021094


   @nvazquez 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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
nvazquez commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-895482478


   @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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-904058092


   @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 to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-884149865


   Packaging result: :heavy_check_mark: el7 :heavy_check_mark: el8 :heavy_check_mark: debian. SL-JID 619


-- 
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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-888285958


   @nvazquez a Jenkins job has been kicked to build UI QA env. 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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
nvazquez commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-884179630


   @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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
nvazquez commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-859668391


   @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 #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-889481412


   @nvazquez 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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-885354012


   <b>Trillian test result (tid-1357)</b>
   Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 33373 seconds
   Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr5103-t1357-kvm-centos7.zip
   Intermittent failure detected: /marvin/tests/smoke/test_host_annotations.py
   Smoke tests completed. 88 look OK, 1 have error(s)
   Only failed tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   test_03_user_role_dont_see_annotations | `Failure` | 1.66 | test_host_annotations.py
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-901949966


   <b>Trillian test result (tid-1705)</b>
   Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 37612 seconds
   Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr5103-t1705-kvm-centos7.zip
   Intermittent failure detected: /marvin/tests/smoke/test_kubernetes_clusters.py
   Smoke tests completed. 89 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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-902374559


   @nvazquez 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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] borisstoyanov commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
borisstoyanov commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-911568950


   let's just wait for final test run and any objections


-- 
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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-910361623


   Packaging result: :heavy_check_mark: el7 :heavy_check_mark: el8 :heavy_check_mark: debian :heavy_check_mark: suse15. SL-JID 1089


-- 
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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
nvazquez commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-897089208


   @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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-906483562


   @nvazquez 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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
nvazquez commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-901537661


   @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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
nvazquez commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-897107722


   @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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] DaanHoogland commented on a change in pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
DaanHoogland commented on a change in pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#discussion_r683166875



##########
File path: test/integration/smoke/test_annotations.py
##########
@@ -31,15 +31,69 @@
 
 _multiprocess_shared_ = True
 
-class TestHostAnnotations(cloudstackTestCase):
+
+class TestAnnotations(cloudstackTestCase):
+
+    @classmethod
+    def setUpClass(cls):
+        testClient = super(TestAnnotations, cls).getClsTestClient()
+        cls.apiclient = testClient.getApiClient()
+        cls.services = testClient.getParsedTestDataConfig()
+
+        # Get Zone, Domain and templates
+        cls.domain = get_domain(cls.apiclient)
+        cls.zone = get_zone(cls.apiclient, testClient.getZoneForTests())
+        cls.hypervisor = testClient.getHypervisorInfo()
+        cls.services['mode'] = cls.zone.networktype
+        template = get_test_template(
+            cls.apiclient,
+            cls.zone.id,
+            cls.hypervisor
+        )
+        if template == FAILED:
+            cls.fail("get_test_template() failed to return template")
+
+        cls.services["virtual_machine"]["zoneid"] = cls.zone.id
+
+        cls._cleanup = []
+
+        # Create an account, network, VM and IP addresses
+        cls.account = Account.create(
+            cls.apiclient,
+            cls.services["account"],
+            domainid=cls.domain.id
+        )
+        cls._cleanup.append(cls.account)
+        cls.userApiClient = testClient.getUserApiClient(cls.account.name, 'ROOT', 'User')
+
+        cls.service_offering = ServiceOffering.create(
+            cls.apiclient,
+            cls.services["service_offerings"]["tiny"]
+        )
+        cls._cleanup.append(cls.service_offering)
+        cls.user_vm = VirtualMachine.create(
+            cls.apiclient,
+            cls.services["virtual_machine"],
+            templateid=template.id,
+            accountid=cls.account.name,
+            domainid=cls.account.domainid,
+            serviceofferingid=cls.service_offering.id
+        )
+        cls._cleanup.append(cls.user_vm)
+        cls.host = list_hosts(cls.apiclient,
+                               zoneid=cls.zone.id,
+                               type='Routing')[0]
+
+    @classmethod
+    def tearDownClass(cls):
+        try:
+            cleanup_resources(cls.apiclient, cls._cleanup)
+        except Exception as e:
+            raise Exception("Warning: Exception during cleanup : %s" % e)

Review comment:
       ```suggestion
           super(TestAnnotations, cls).tearDownClass()
   ```
   
   the same (or similar) should be done for `tearDown(self)`




-- 
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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-894583972


   @nvazquez 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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-906509416


   Packaging result: :heavy_check_mark: el7 :heavy_check_mark: el8 :heavy_check_mark: debian :heavy_check_mark: suse15. SL-JID 1023


-- 
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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
nvazquez commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-871924286


   @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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-907373732


   <b>Trillian test result (tid-1791)</b>
   Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 40666 seconds
   Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr5103-t1791-kvm-centos7.zip
   Intermittent failure detected: /marvin/tests/smoke/test_vpc_redundant.py
   Smoke tests completed. 88 look OK, 1 have error(s)
   Only failed tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   test_05_rvpc_multi_tiers | `Failure` | 424.07 | test_vpc_redundant.py
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-884591650


   <b>Trillian test result (tid-1342)</b>
   Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 33373 seconds
   Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr5103-t1342-kvm-centos7.zip
   Intermittent failure detected: /marvin/tests/smoke/test_host_annotations.py
   Smoke tests completed. 88 look OK, 1 have error(s)
   Only failed tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   test_03_user_role_dont_see_annotations | `Failure` | 1.62 | test_host_annotations.py
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan removed a comment on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan removed a comment on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-871924441


   @nvazquez 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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] GutoVeronezi commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
GutoVeronezi commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-885198386


   @nvazquez ASAP I will review this :smiley: 


-- 
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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] borisstoyanov commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
borisstoyanov commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-900229368


   @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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
nvazquez commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-901575563


   @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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
nvazquez commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-893714995


   @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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
nvazquez commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-890256057


   @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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-889347867


   @nvazquez 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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
nvazquez commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-893782522


   @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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-905698845


   <b>Trillian test result (tid-1771)</b>
   Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 33315 seconds
   Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr5103-t1771-kvm-centos7.zip
   Smoke tests completed. 89 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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-894583243


   <b>Trillian test result (tid-1499)</b>
   Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 99716 seconds
   Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr5103-t1499-kvm-centos7.zip
   Intermittent failure detected: /marvin/tests/smoke/test_accounts.py
   Intermittent failure detected: /marvin/tests/smoke/test_affinity_groups_projects.py
   Intermittent failure detected: /marvin/tests/smoke/test_annotations.py
   Intermittent failure detected: /marvin/tests/smoke/test_async_job.py
   Intermittent failure detected: /marvin/tests/smoke/test_deploy_virtio_scsi_vm.py
   Intermittent failure detected: /marvin/tests/smoke/test_deploy_vm_iso.py
   Intermittent failure detected: /marvin/tests/smoke/test_deploy_vms_with_varied_deploymentplanners.py
   Intermittent failure detected: /marvin/tests/smoke/test_deploy_vm_with_userdata.py
   Intermittent failure detected: /marvin/tests/smoke/test_diagnostics.py
   Intermittent failure detected: /marvin/tests/smoke/test_domain_service_offerings.py
   Intermittent failure detected: /marvin/tests/smoke/test_internal_lb.py
   Intermittent failure detected: /marvin/tests/smoke/test_iso.py
   Intermittent failure detected: /marvin/tests/smoke/test_kubernetes_clusters.py
   Intermittent failure detected: /marvin/tests/smoke/test_kubernetes_supported_versions.py
   Intermittent failure detected: /marvin/tests/smoke/test_list_ids_parameter.py
   Intermittent failure detected: /marvin/tests/smoke/test_loadbalance.py
   Intermittent failure detected: /marvin/tests/smoke/test_metrics_api.py
   Intermittent failure detected: /marvin/tests/smoke/test_multipleips_per_nic.py
   Intermittent failure detected: /marvin/tests/smoke/test_nested_virtualization.py
   Intermittent failure detected: /marvin/tests/smoke/test_network_acl.py
   Intermittent failure detected: /marvin/tests/smoke/test_network.py
   Intermittent failure detected: /marvin/tests/smoke/test_privategw_acl.py
   Intermittent failure detected: /marvin/tests/smoke/test_router_dhcphosts.py
   Intermittent failure detected: /marvin/tests/smoke/test_vm_life_cycle.py
   Intermittent failure detected: /marvin/tests/smoke/test_vpc_redundant.py
   Intermittent failure detected: /marvin/tests/smoke/test_vpc_router_nics.py
   Smoke tests completed. 67 look OK, 22 have error(s)
   Only failed tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   ContextSuite context=TestAccounts>:setup | `Error` | 0.00 | test_accounts.py
   ContextSuite context=TestAddVmToSubDomain>:setup | `Error` | 0.00 | test_accounts.py
   test_DeleteDomain | `Error` | 4.16 | test_accounts.py
   test_forceDeleteDomain | `Failure` | 6.18 | test_accounts.py
   ContextSuite context=TestRemoveUserFromAccount>:setup | `Error` | 5.03 | test_accounts.py
   ContextSuite context=TestDeployVmWithAffinityGroup>:setup | `Error` | 0.00 | test_affinity_groups_projects.py
   ContextSuite context=TestInternalLb>:setup | `Error` | 0.00 | test_internal_lb.py
   ContextSuite context=TestAnnotations>:setup | `Error` | 0.00 | test_annotations.py
   ContextSuite context=TestAsyncJob>:setup | `Error` | 0.00 | test_async_job.py
   test_01_create_iso_with_checksum_sha1 | `Error` | 66.38 | test_iso.py
   test_02_1_create_iso_with_checksum_sha256_negative | `Error` | 66.38 | test_iso.py
   test_02_create_iso_with_checksum_sha256 | `Error` | 66.37 | test_iso.py
   test_02_create_iso_with_checksum_sha256 | `Error` | 66.37 | test_iso.py
   test_03_1_create_iso_with_checksum_md5_negative | `Error` | 66.40 | test_iso.py
   test_03_create_iso_with_checksum_md5 | `Error` | 67.42 | test_iso.py
   test_04_create_iso_with_no_checksum | `Error` | 67.36 | test_iso.py
   test_01_create_iso | `Failure` | 1529.62 | test_iso.py
   ContextSuite context=TestISO>:setup | `Error` | 3123.96 | test_iso.py
   ContextSuite context=TestDeployVirtioSCSIVM>:setup | `Error` | 0.00 | test_deploy_virtio_scsi_vm.py
   ContextSuite context=TestDeployVMFromISO>:setup | `Error` | 0.00 | test_deploy_vm_iso.py
   ContextSuite context=TestDeployVmWithVariedPlanners>:setup | `Error` | 0.00 | test_deploy_vms_with_varied_deploymentplanners.py
   ContextSuite context=TestDeployVmWithUserData>:setup | `Error` | 0.00 | test_deploy_vm_with_userdata.py
   ContextSuite context=TestDomainsServiceOfferings>:setup | `Error` | 1567.36 | test_domain_service_offerings.py
   ContextSuite context=TestRemoteDiagnostics>:setup | `Error` | 0.00 | test_diagnostics.py
   ContextSuite context=TestNetworkACL>:setup | `Error` | 0.00 | test_network_acl.py
   ContextSuite context=TestRouterRules>:setup | `Error` | 308.10 | test_network.py
   test_01_invalid_upgrade_kubernetes_cluster | `Failure` | 0.01 | test_kubernetes_clusters.py
   test_02_deploy_and_upgrade_kubernetes_cluster | `Failure` | 0.01 | test_kubernetes_clusters.py
   test_03_deploy_and_scale_kubernetes_cluster | `Failure` | 0.01 | test_kubernetes_clusters.py
   test_04_basic_lifecycle_kubernetes_cluster | `Failure` | 0.00 | test_kubernetes_clusters.py
   test_05_delete_kubernetes_cluster | `Failure` | 0.00 | test_kubernetes_clusters.py
   test_06_deploy_invalid_kubernetes_ha_cluster | `Failure` | 0.00 | test_kubernetes_clusters.py
   test_07_deploy_kubernetes_ha_cluster | `Failure` | 0.00 | test_kubernetes_clusters.py
   test_08_deploy_and_upgrade_kubernetes_ha_cluster | `Failure` | 0.00 | test_kubernetes_clusters.py
   test_09_delete_kubernetes_ha_cluster | `Failure` | 0.00 | test_kubernetes_clusters.py
   test_01_add_delete_kubernetes_supported_version | `Error` | 1808.07 | test_kubernetes_supported_versions.py
   ContextSuite context=TestListIdsParams>:setup | `Error` | 0.00 | test_list_ids_parameter.py
   test_nic_secondaryip_add_remove | `Failure` | 1.07 | test_multipleips_per_nic.py
   ContextSuite context=TestNestedVirtualization>:setup | `Error` | 0.00 | test_nested_virtualization.py
   test_router_dhcphosts | `Failure` | 11.56 | test_router_dhcphosts.py
   ContextSuite context=TestRouterDHCPHosts>:teardown | `Error` | 21.82 | test_router_dhcphosts.py
   test_02_redundant_VPC_default_routes | `Failure` | 1124.06 | test_vpc_redundant.py
   test_01_VPC_nics_after_destroy | `Failure` | 1059.75 | test_vpc_router_nics.py
   test_02_VPC_default_routes | `Failure` | 245.28 | test_vpc_router_nics.py
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] borisstoyanov removed a comment on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
borisstoyanov removed a comment on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-900834070


   @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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-888012442


   @nvazquez 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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
nvazquez commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-897554997


   Marked as a draft while the manual testing by @borisstoyanov is still in process


-- 
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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-904352817


   <b>Trillian test result (tid-1755)</b>
   Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 37072 seconds
   Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr5103-t1755-kvm-centos7.zip
   Intermittent failure detected: /marvin/tests/smoke/test_kubernetes_clusters.py
   Intermittent failure detected: /marvin/tests/smoke/test_hostha_kvm.py
   Smoke tests completed. 89 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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-900463050






-- 
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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
nvazquez commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-900462696


   @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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-890245759


   @nvazquez 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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
nvazquez commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-883438549


   @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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-884270221


   @nvazquez 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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] borisstoyanov commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
borisstoyanov commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-900834070


   @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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] nvazquez commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
nvazquez commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-890226897


   Thanks for reviewing @RodrigoDLopez, I'll work on addressing your changes


-- 
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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-912245331


   <b>Trillian test result (tid-1948)</b>
   Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 39826 seconds
   Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr5103-t1948-kvm-centos7.zip
   Smoke tests completed. 89 look OK, 0 have errors
   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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-883459700


   <b>Trillian Build Failed (tid-1325)<b/>


-- 
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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-911860476


   @nvazquez 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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] blueorangutan commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
blueorangutan commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-893782716


   @nvazquez 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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [cloudstack] DaanHoogland commented on pull request #5103: Extend the Annotations framework

Posted by GitBox <gi...@apache.org>.
DaanHoogland commented on pull request #5103:
URL: https://github.com/apache/cloudstack/pull/5103#issuecomment-897493707


   @GutoVeronezi @davidjumani all your remarks/concerns are met?


-- 
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.

To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org