[GitHub] [cloudstack] blueorangutan commented on pull request #4202: server: don't export B APIs if feature is not enabled globally
blueorangutan commented on pull request #4202: URL: https://github.com/apache/cloudstack/pull/4202#issuecomment-654618015 Packaging result: ✔centos7 ✔debian. JID-1539 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4068: Adding Centos8, Ubuntu 20.04, XCPNG8.1 Support
blueorangutan commented on pull request #4068: URL: https://github.com/apache/cloudstack/pull/4068#issuecomment-654615808 Packaging result: ✔centos7 ✔debian. JID-1538 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[cloudstack] branch master updated: server: Dynamic roles improvements. Add-on functionality below. (#4071)
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/master by this push:
new 5040283 server: Dynamic roles improvements. Add-on functionality
below. (#4071)
5040283 is described below
commit 5040283db9744175402b53ba9a6c701b9d8e3436
Author: sureshanaparti <12028987+sureshanapa...@users.noreply.github.com>
AuthorDate: Tue Jul 7 10:56:43 2020 +0530
server: Dynamic roles improvements. Add-on functionality below. (#4071)
- Create a role from any of the existing role, using new parameter roleid
in createRole API
- Import a role with its rules, using a new importRole API
- New default roles for Read-Only and Support Admin & User
- No modifications allowed for Default roles
- Cleaned up old NetApp APIs from role_permissions table.
---
api/src/main/java/com/cloud/event/EventTypes.java | 2 +
.../main/java/org/apache/cloudstack/acl/Role.java | 1 +
.../org/apache/cloudstack/acl/RoleService.java | 9 +-
.../org/apache/cloudstack/api/ApiConstants.java| 1 +
.../apache/cloudstack/api/ApiServerService.java| 1 +
.../api/command/admin/acl/CreateRoleCmd.java | 50 ++--
.../api/command/admin/acl/ImportRoleCmd.java | 149 +++
.../api/command/admin/acl/ListRolesCmd.java| 1 +
.../cloudstack/api/command/admin/acl/RoleCmd.java | 30 +++
.../api/command/admin/acl/UpdateRoleCmd.java | 15 --
.../cloudstack/api/response/RoleResponse.java | 8 +
.../api/command/test/CreateRoleCmdTest.java| 102
.../api/command/test/ImportRoleCmdTest.java| 131 ++
.../com/cloud/upgrade/dao/Upgrade41400to41500.java | 286 +
.../java/org/apache/cloudstack/acl/RoleVO.java | 11 +
.../org/apache/cloudstack/acl/dao/RoleDao.java | 3 +
.../org/apache/cloudstack/acl/dao/RoleDaoImpl.java | 22 ++
.../cloudstack/acl/dao/RolePermissionsDao.java | 8 +
.../cloudstack/acl/dao/RolePermissionsDaoImpl.java | 14 +
.../META-INF/db/schema-41400to41500-cleanup.sql| 3 +
.../resources/META-INF/db/schema-41400to41500.sql | 9 +
server/src/main/java/com/cloud/api/ApiServer.java | 11 +
.../org/apache/cloudstack/acl/RoleManagerImpl.java | 137 +-
test/integration/smoke/test_dynamicroles.py| 160 ++--
tools/marvin/marvin/lib/base.py| 19 +-
25 files changed, 1119 insertions(+), 64 deletions(-)
diff --git a/api/src/main/java/com/cloud/event/EventTypes.java
b/api/src/main/java/com/cloud/event/EventTypes.java
index 679c06a..5ea31a7 100644
--- a/api/src/main/java/com/cloud/event/EventTypes.java
+++ b/api/src/main/java/com/cloud/event/EventTypes.java
@@ -185,6 +185,7 @@ public class EventTypes {
public static final String EVENT_ROLE_CREATE = "ROLE.CREATE";
public static final String EVENT_ROLE_UPDATE = "ROLE.UPDATE";
public static final String EVENT_ROLE_DELETE = "ROLE.DELETE";
+public static final String EVENT_ROLE_IMPORT = "ROLE.IMPORT";
public static final String EVENT_ROLE_PERMISSION_CREATE =
"ROLE.PERMISSION.CREATE";
public static final String EVENT_ROLE_PERMISSION_UPDATE =
"ROLE.PERMISSION.UPDATE";
public static final String EVENT_ROLE_PERMISSION_DELETE =
"ROLE.PERMISSION.DELETE";
@@ -691,6 +692,7 @@ public class EventTypes {
entityEventDetails.put(EVENT_ROLE_CREATE, Role.class);
entityEventDetails.put(EVENT_ROLE_UPDATE, Role.class);
entityEventDetails.put(EVENT_ROLE_DELETE, Role.class);
+entityEventDetails.put(EVENT_ROLE_IMPORT, Role.class);
entityEventDetails.put(EVENT_ROLE_PERMISSION_CREATE,
RolePermission.class);
entityEventDetails.put(EVENT_ROLE_PERMISSION_UPDATE,
RolePermission.class);
entityEventDetails.put(EVENT_ROLE_PERMISSION_DELETE,
RolePermission.class);
diff --git a/api/src/main/java/org/apache/cloudstack/acl/Role.java
b/api/src/main/java/org/apache/cloudstack/acl/Role.java
index b05d886..a31ec52 100644
--- a/api/src/main/java/org/apache/cloudstack/acl/Role.java
+++ b/api/src/main/java/org/apache/cloudstack/acl/Role.java
@@ -24,4 +24,5 @@ public interface Role extends InternalIdentity, Identity {
String getName();
RoleType getRoleType();
String getDescription();
+boolean isDefault();
}
diff --git a/api/src/main/java/org/apache/cloudstack/acl/RoleService.java
b/api/src/main/java/org/apache/cloudstack/acl/RoleService.java
index 6130c62..d7eef92 100644
--- a/api/src/main/java/org/apache/cloudstack/acl/RoleService.java
+++ b/api/src/main/java/org/apache/cloudstack/acl/RoleService.java
@@ -18,6 +18,7 @@
package org.apache.cloudstack.acl;
import java.util.List;
+import java.util.Map;
import org.apache.cloudstack.acl.RolePermission.Permission;
import org.apache.cloudstack.framework.config.ConfigKey;
@@ -39,13 +40,17 @@ public
[GitHub] [cloudstack] rhtyd merged pull request #4071: Dynamic roles improvements
rhtyd merged pull request #4071: URL: https://github.com/apache/cloudstack/pull/4071 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] rhtyd commented on pull request #4071: Dynamic roles improvements
rhtyd commented on pull request #4071: URL: https://github.com/apache/cloudstack/pull/4071#issuecomment-654608839 Test LGTM, failures not related to the PR This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] blueorangutan removed a comment on pull request #4071: Dynamic roles improvements
blueorangutan removed a comment on pull request #4071: URL: https://github.com/apache/cloudstack/pull/4071#issuecomment-653370522 @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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] borisstoyanov removed a comment on pull request #4071: Dynamic roles improvements
borisstoyanov removed a comment on pull request #4071: URL: https://github.com/apache/cloudstack/pull/4071#issuecomment-653370045 @blueorangutan test This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] rhtyd commented on pull request #4193: Fix usage record count
rhtyd commented on pull request #4193: URL: https://github.com/apache/cloudstack/pull/4193#issuecomment-654607460 Thanks for checking the mandatory params @Pearl1594, you're right with the argument I hadn't considered start/end date as mandatory parameters. In that case, perhaps we can spend some time in future to optimise it, for example, get all the IPs given a list of IPs (unique usage IDs) and then join against the details table to check how many IPs need to be hidden, and run a quick loop to find number of counts we've to reduce if any; the current code may significantly impact the list API response which would require many DB calls. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4202: server: don't export B APIs if feature is not enabled globally
blueorangutan commented on pull request #4202: URL: https://github.com/apache/cloudstack/pull/4202#issuecomment-654606736 @rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] rhtyd commented on pull request #4202: server: don't export B APIs if feature is not enabled globally
rhtyd commented on pull request #4202: URL: https://github.com/apache/cloudstack/pull/4202#issuecomment-654606430 @blueorangutan package This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4128: Role based users in Projects
blueorangutan commented on pull request #4128: URL: https://github.com/apache/cloudstack/pull/4128#issuecomment-654598446 Trillian test result (tid-2010) Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7 Total time taken: 42322 seconds Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr4128-t2010-kvm-centos7.zip Intermittent failure detected: /marvin/tests/smoke/test_vpc_redundant.py Smoke tests completed. 84 look OK, 0 have error(s) Only failed tests results shown below: Test | Result | Time (s) | Test File --- | --- | --- | --- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] nvazquez commented on pull request #4117: [VMware] Explicitly controlling VM hardware version
nvazquez commented on pull request #4117: URL: https://github.com/apache/cloudstack/pull/4117#issuecomment-654554026 @rhtyd first two tests failed on `'AssertionError: get_test_template() failed to return template\n'` and the third one seems an intermittent issue (not seen on previous test runs), are you ok to merge it? This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4202: server: don't export B APIs if feature is not enabled globally
blueorangutan commented on pull request #4202: URL: https://github.com/apache/cloudstack/pull/4202#issuecomment-654517165 Trillian test result (tid-2008) Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7 Total time taken: 49880 seconds Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr4202-t2008-kvm-centos7.zip Intermittent failure detected: /marvin/tests/smoke/test_backup_recovery_dummy.py Intermittent failure detected: /marvin/tests/smoke/test_vpc_redundant.py Smoke tests completed. 81 look OK, 2 have error(s) Only failed tests results shown below: Test | Result | Time (s) | Test File --- | --- | --- | --- ContextSuite context=TestDummyBackupAndRecovery>:setup | `Error` | 0.00 | test_backup_recovery_dummy.py test_03_create_redundant_VPC_1tier_2VMs_2IPs_2PF_ACL_reboot_routers | `Error` | 470.84 | test_vpc_redundant.py test_04_rvpc_network_garbage_collector_nics | `Error` | 3853.05 | test_vpc_redundant.py This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4068: Adding Centos8, Ubuntu 20.04, XCPNG8.1 Support
blueorangutan commented on pull request #4068: URL: https://github.com/apache/cloudstack/pull/4068#issuecomment-654493657 Trillian test result (tid-2007) Environment: xcpng81 (x2), Advanced Networking with Mgmt server 7 Total time taken: 47815 seconds Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr4068-t2007-xcpng81.zip 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_scale_vm.py Intermittent failure detected: /marvin/tests/smoke/test_usage.py Intermittent failure detected: /marvin/tests/smoke/test_vm_life_cycle.py Intermittent failure detected: /marvin/tests/smoke/test_vm_snapshots.py Intermittent failure detected: /marvin/tests/smoke/test_volumes.py Intermittent failure detected: /marvin/tests/smoke/test_host_maintenance.py Smoke tests completed. 76 look OK, 7 have error(s) Only failed tests results shown below: Test | Result | Time (s) | Test File --- | --- | --- | --- test_01_nic | `Error` | 117.62 | test_nic.py test_01_deploy_vms_storage_tags | `Error` | 7.48 | test_primary_storage.py test_01_scale_vm | `Failure` | 4.15 | test_scale_vm.py test_01_volume_usage | `Error` | 85.15 | test_usage.py test_11_migrate_vm | `Error` | 58.02 | test_vm_life_cycle.py test_13_attachAndDetach_iso | `Failure` | 674.00 | test_vm_life_cycle.py test_change_service_offering_for_vm_with_snapshots | `Failure` | 759.02 | test_vm_snapshots.py test_01_create_vm_snapshots | `Failure` | 664.77 | test_vm_snapshots.py test_02_revert_vm_snapshots | `Failure` | 664.77 | test_vm_snapshots.py test_03_delete_vm_snapshots | `Failure` | 0.01 | test_vm_snapshots.py test_01_create_volume | `Error` | 3.24 | test_volumes.py test_02_attach_volume | `Error` | 2.09 | test_volumes.py test_03_download_attached_volume | `Error` | 1.07 | test_volumes.py test_04_delete_attached_volume | `Error` | 2.08 | test_volumes.py test_05_detach_volume | `Error` | 2.09 | test_volumes.py test_06_download_detached_volume | `Error` | 2.08 | test_volumes.py test_07_resize_fail | `Error` | 2.16 | test_volumes.py test_08_resize_volume | `Error` | 2.09 | test_volumes.py test_09_delete_detached_volume | `Error` | 2.17 | test_volumes.py test_11_attach_volume_with_unstarted_vm | `Error` | 13.59 | test_volumes.py test_11_migrate_volume_and_change_offering | `Error` | 4.21 | test_volumes.py ContextSuite context=TestVolumes>:teardown | `Error` | 4.29 | test_volumes.py This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4176: server: Purge all cookies on logout, set /client path on login
blueorangutan commented on pull request #4176: URL: https://github.com/apache/cloudstack/pull/4176#issuecomment-654477256 Trillian test result (tid-1997) Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7 Total time taken: 59635 seconds Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr4176-t1997-kvm-centos7.zip Intermittent failure detected: /marvin/tests/smoke/test_privategw_acl.py Intermittent failure detected: /marvin/tests/smoke/test_public_ip_range.py 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_secondary_storage.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_templates.py Intermittent failure detected: /marvin/tests/smoke/test_usage.py Intermittent failure detected: /marvin/tests/smoke/test_vm_life_cycle.py Intermittent failure detected: /marvin/tests/smoke/test_vm_snapshots.py Intermittent failure detected: /marvin/tests/smoke/test_volumes.py Intermittent failure detected: /marvin/tests/smoke/test_vpc_redundant.py Intermittent failure detected: /marvin/tests/smoke/test_vpc_router_nics.py Intermittent failure detected: /marvin/tests/smoke/test_vpc_vpn.py Intermittent failure detected: /marvin/tests/smoke/test_hostha_kvm.py Smoke tests completed. 55 look OK, 22 have error(s) Only failed tests results shown below: Test | Result | Time (s) | Test File --- | --- | --- | --- test_02_vpc_privategw_static_routes | `Failure` | 176.59 | test_privategw_acl.py test_03_vpc_privategw_restart_vpc_cleanup | `Failure` | 176.45 | test_privategw_acl.py test_04_rvpc_privategw_static_routes | `Failure` | 237.39 | test_privategw_acl.py 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 test_01_sys_vm_start | `Failure` | 0.08 | test_secondary_storage.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.17 | test_service_offerings.py ContextSuite context=TestSnapshotRootDisk>:setup | `Error` | 0.00 | test_snapshots.py test_01_list_sec_storage_vm | `Failure` | 0.03 | test_ssvm.py test_02_list_cpvm_vm | `Failure` | 0.02 | test_ssvm.py test_03_ssvm_internals | `Failure` | 0.02 | test_ssvm.py test_04_cpvm_internals | `Failure` | 0.02 | test_ssvm.py test_05_stop_ssvm | `Failure` | 0.03 | test_ssvm.py test_06_stop_cpvm | `Failure` | 0.03 | test_ssvm.py test_07_reboot_ssvm | `Failure` | 0.03 | test_ssvm.py test_08_reboot_cpvm | `Failure` | 0.03 | test_ssvm.py test_09_destroy_ssvm | `Failure` | 0.03 | test_ssvm.py test_10_destroy_cpvm | `Failure` | 0.03 | test_ssvm.py test_02_create_template_with_checksum_sha1 | `Error` | 65.39 | test_templates.py test_03_create_template_with_checksum_sha256 | `Error` | 65.41 | test_templates.py test_04_create_template_with_checksum_md5 | `Error` | 65.36 | test_templates.py test_05_create_template_with_no_checksum | `Error` | 65.36 | test_templates.py
[GitHub] [cloudstack] Pearl1594 commented on pull request #4193: Fix usage record count
Pearl1594 commented on pull request #4193: URL: https://github.com/apache/cloudstack/pull/4193#issuecomment-654372196 @rhtyd since startdate and enddate are mandatory fields in the API , the usageRecords fetched from the database will be within the (date) range provided and further processing is then done on that list obtained This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[cloudstack-primate] branch master updated: iam: limit showing and router-link for accounts and domain for User
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack-primate.git
The following commit(s) were added to refs/heads/master by this push:
new 991f5f6 iam: limit showing and router-link for accounts and domain
for User
991f5f6 is described below
commit 991f5f6e26a4738fda896ee1a0c1cae78375e4c9
Author: Rohit Yadav
AuthorDate: Mon Jul 6 22:30:32 2020 +0530
iam: limit showing and router-link for accounts and domain for User
The API response leaks account and domain information which for templates
and isos may appear leakage of information. This would at least limit
that in the list views for templates, isos and few other views for
account of role type User.
Signed-off-by: Rohit Yadav
---
src/components/view/InfoCard.vue | 5 +++--
src/components/view/ListView.vue | 13 +
src/config/section/compute.js| 27 +++
src/config/section/event.js | 2 +-
src/config/section/image.js | 13 +++--
src/config/section/network.js| 4 ++--
src/config/section/storage.js| 21 +++--
src/config/section/user.js | 2 +-
8 files changed, 65 insertions(+), 22 deletions(-)
diff --git a/src/components/view/InfoCard.vue b/src/components/view/InfoCard.vue
index c0d0878..ae93566 100644
--- a/src/components/view/InfoCard.vue
+++ b/src/components/view/InfoCard.vue
@@ -455,7 +455,8 @@
{{ $t('label.account')
}}
-{{ resource.account
}}
+{{ resource.account }}
+{{ resource.account }}
@@ -470,7 +471,7 @@
{{ $t('label.domain')
}}
-{{ resource.domain || resource.domainid }}
+{{ resource.domain ||
resource.domainid }}
{{ resource.domain || resource.domainid }}
diff --git a/src/components/view/ListView.vue b/src/components/view/ListView.vue
index a396a26..179d996 100644
--- a/src/components/view/ListView.vue
+++ b/src/components/view/ListView.vue
@@ -143,21 +143,26 @@
{{ text }}
+
+ {{ text
}}
+
+
{{ text
}}
{{ text
}}
-
+
{{ text
}}
{{ text }}
- {{ text }}
-
+ {{ text }}
+ {{ text }}
+
- {{ text }}
+ {{ text
}}
{{ text }}
diff --git a/src/config/section/compute.js b/src/config/section/compute.js
index 72bcdcf..27d056b 100644
--- a/src/config/section/compute.js
+++ b/src/config/section/compute.js
@@ -414,7 +414,14 @@ export default {
icon: kubernetes,
docHelp: 'plugins/cloudstack-kubernetes-service.html',
permission: ['listKubernetesClusters'],
- columns: ['name', 'state', 'size', 'cpunumber', 'memory', 'account',
'zonename'],
+ columns: () => {
+var fields = ['name', 'state', 'size', 'cpunumber', 'memory']
+if (['Admin',
'DomainAdmin'].includes(store.getters.userInfo.roletype)) {
+ fields.push('account')
+}
+fields.push('zonename')
+return fields
+ },
details: ['name', 'description', 'zonename', 'kubernetesversionname',
'size', 'masternodes', 'cpunumber', 'memory', 'keypair',
'associatednetworkname', 'account', 'domain', 'zonename'],
tabs: [{
name: 'k8s',
@@ -482,7 +489,7 @@ export default {
icon: 'gold',
docHelp:
'adminguide/virtual_machines.html#changing-the-vm-name-os-or-group',
permission: ['listInstanceGroups'],
- columns: ['name', 'account', 'domain'],
+ columns: ['name', 'account'],
details: ['name', 'id', 'account', 'domain', 'created'],
related: [{
name: 'vm',
@@ -518,7 +525,13 @@ export default {
icon: 'key',
docHelp:
'adminguide/virtual_machines.html#using-ssh-keys-for-authentication',
permission: ['listSSHKeyPairs'],
- columns: ['name', 'fingerprint', 'account', 'domain'],
+ columns: () => {
+var fields = ['name', 'fingerprint']
+if (['Admin',
'DomainAdmin'].includes(store.getters.userInfo.roletype)) {
+ fields.push('account')
+}
+return fields
+ },
details: ['name', 'fingerprint', 'account', 'domain'],
related: [{
name: 'vm',
@@ -561,7 +574,13 @@ export default {
icon: 'swap',
docHelp: 'adminguide/virtual_machines.html#affinity-groups',
permission: ['listAffinityGroups'],
- columns: ['name', 'type', 'description', 'account', 'domain'],
+ columns: () => {
+var fields = ['name', 'type', 'description']
+if (['Admin',
'DomainAdmin'].includes(store.getters.userInfo.roletype)) {
+ fields.push('account')
+}
+return fields
+ },
details: ['name', 'id', 'description', 'type', 'account', 'domain'],
[GitHub] [cloudstack] blueorangutan commented on pull request #4128: Role based users in Projects
blueorangutan commented on pull request #4128: URL: https://github.com/apache/cloudstack/pull/4128#issuecomment-654344358 @Pearl1594 a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] Pearl1594 commented on pull request #4128: Role based users in Projects
Pearl1594 commented on pull request #4128: URL: https://github.com/apache/cloudstack/pull/4128#issuecomment-654344123 @blueorangutan test This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4128: Role based users in Projects
blueorangutan commented on pull request #4128: URL: https://github.com/apache/cloudstack/pull/4128#issuecomment-654343735 Packaging result: ✔centos7 ✔debian. JID-1537 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4128: Role based users in Projects
blueorangutan commented on pull request #4128: URL: https://github.com/apache/cloudstack/pull/4128#issuecomment-654331002 @Pearl1594 a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] Pearl1594 commented on pull request #4128: Role based users in Projects
Pearl1594 commented on pull request #4128: URL: https://github.com/apache/cloudstack/pull/4128#issuecomment-654330224 @blueorangutan package This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] Pearl1594 commented on pull request #4128: Role based users in Projects
Pearl1594 commented on pull request #4128: URL: https://github.com/apache/cloudstack/pull/4128#issuecomment-654315121 @blueorangutan package This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] radu-todirica opened a new pull request #4205: WIP - Integrate tungsten with cloudstack
radu-todirica opened a new pull request #4205: URL: https://github.com/apache/cloudstack/pull/4205 ## Description WORK IN PROGRESS Integration of TUNGSTEN SDN in Cloudstack ## 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) - [ ] Enhancement (improves an existing feature and functionality) - [ ] Cleanup (Code refactoring and cleanup, that may add test cases) ## Screenshots (if appropriate): ## How Has This Been Tested? This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] sureshanaparti commented on pull request #4172: [VMware] Support to attach more than 15 data disks in VMware VM
sureshanaparti commented on pull request #4172: URL: https://github.com/apache/cloudstack/pull/4172#issuecomment-654226332 > @sureshanaparti I guess we can merge this, the marvin failures does not seem related @borisstoyanov yes, these marvin failures are not related to the changes in this PR. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] rhtyd commented on pull request #4176: server: Purge all cookies on logout, set /client path on login
rhtyd commented on pull request #4176: URL: https://github.com/apache/cloudstack/pull/4176#issuecomment-654126260 @davidjumani can you help review/test/fix, thnx This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] kioie commented on a change in pull request #3997: New API endpoint: UpdateVlanIpRange
kioie commented on a change in pull request #3997:
URL: https://github.com/apache/cloudstack/pull/3997#discussion_r450097735
##
File path:
server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
##
@@ -4075,6 +4080,149 @@ public VlanVO doInTransaction(final TransactionStatus
status) {
}
+@Override
+public Vlan updateVlanAndPublicIpRange(UpdateVlanIpRangeCmd cmd) throws
ConcurrentOperationException,
+ResourceUnavailableException,ResourceAllocationException{
+
+return updateVlanAndPublicIpRange(cmd.getId(),
cmd.getStartIp(),cmd.getEndIp(),
+cmd.getGateway(),cmd.getNetmask());
+}
+
+@DB
+@ActionEvent(eventType = EventTypes.EVENT_VLAN_IP_RANGE_UPDATE,
eventDescription = "update vlan ip Range", async
+= false)
+public Vlan updateVlanAndPublicIpRange(final long id, String startIp,
+ String endIp,
+ String gateway,
+ String netmask) throws
ConcurrentOperationException{
+
+VlanVO vlanRange = _vlanDao.findById(id);
+if (vlanRange == null) {
+throw new InvalidParameterValueException("Please specify a valid
IP range id.");
+}
+
+if (gateway == null) {
+gateway = vlanRange.getVlanGateway();
+}
+
+if (netmask == null) {
+netmask = vlanRange.getVlanNetmask();
+}
+
+final String[] existingVlanIPRangeArray =
vlanRange.getIpRange().split("-");
+final String currentStartIP= existingVlanIPRangeArray[0];
+final String currentEndIP = existingVlanIPRangeArray [1];
+
+if(startIp == null){
+startIp= currentStartIP;
+}
+
+if(endIp == null){
+endIp= currentEndIP;
+}
+
+final List ips = _publicIpAddressDao.listByVlanId(id);
+checkAllocatedIpsAreWithinVlanRange(ips,startIp,endIp);
+
+final String cidr = NetUtils.ipAndNetMaskToCidr(gateway, netmask);
+final String cidrAddress = getCidrAddress(cidr);
+final long cidrSize = getCidrSize(cidr);
+
+checkIpRange(currentStartIP,currentEndIP,cidrAddress,cidrSize);
+
+checkIpRange(startIp, endIp, cidrAddress, cidrSize);
+
+checkGatewayOverlap(startIp,endIp,gateway);
+
+VlanVO range;
+try {
+final String newStartIP= startIp;
+final String newEndIP= endIp;
+
+range = _vlanDao.acquireInLockTable(id, 30);
+if (range == null) {
+throw new CloudRuntimeException("Unable to acquire vlan
configuration: " + id);
+}
+
+if (s_logger.isDebugEnabled()) {
+s_logger.debug("lock vlan " + id + " is acquired");
+}
+
+commitUpdateVlanAndIpRange(id, newStartIP, newEndIP,
currentStartIP, currentEndIP,true);
+
+} catch (final Exception e) {
+s_logger.error("Unable to edit VlanRange due to " +
e.getMessage(), e);
+throw new CloudRuntimeException("Failed to edit VlanRange. Please
contact Cloud Support.");
+}finally {
+_vlanDao.releaseFromLockTable(id);
+}
+
+return vlanRange;
+}
+private VlanVO commitUpdateVlanAndIpRange(final Long id, final String
newStartIP, final String newEndIP,final String currentStartIP, final String
currentEndIP, final boolean ipv4) {
+return Transaction.execute(new TransactionCallback() {
+@Override
+public VlanVO doInTransaction(final TransactionStatus status) {
+VlanVO vlanRange = _vlanDao.findById(id);
+s_logger.debug("Updating vlan range " + vlanRange.getId());
+
vlanRange.setIpRange(vlanRange.getIpRange().replace(currentStartIP+"-",
newStartIP+"-").replace(currentEndIP,
Review comment:
Because from what I gathered, sometimes the IPrange is not always stored
in this format only, sometimes, it can include multiple ranges for example
`172.xxx.xxx.2-172.xxx.xxx.20,172.xxx.xxx.200-172.xxx.xxx.201`, when you set IP
range this way, you run the risk of loosing the second range
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [cloudstack] kioie commented on a change in pull request #3997: New API endpoint: UpdateVlanIpRange
kioie commented on a change in pull request #3997:
URL: https://github.com/apache/cloudstack/pull/3997#discussion_r450099761
##
File path:
server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
##
@@ -4075,6 +4080,149 @@ public VlanVO doInTransaction(final TransactionStatus
status) {
}
+@Override
+public Vlan updateVlanAndPublicIpRange(UpdateVlanIpRangeCmd cmd) throws
ConcurrentOperationException,
+ResourceUnavailableException,ResourceAllocationException{
+
+return updateVlanAndPublicIpRange(cmd.getId(),
cmd.getStartIp(),cmd.getEndIp(),
+cmd.getGateway(),cmd.getNetmask());
+}
+
+@DB
+@ActionEvent(eventType = EventTypes.EVENT_VLAN_IP_RANGE_UPDATE,
eventDescription = "update vlan ip Range", async
+= false)
+public Vlan updateVlanAndPublicIpRange(final long id, String startIp,
+ String endIp,
+ String gateway,
+ String netmask) throws
ConcurrentOperationException{
+
+VlanVO vlanRange = _vlanDao.findById(id);
+if (vlanRange == null) {
+throw new InvalidParameterValueException("Please specify a valid
IP range id.");
+}
+
+if (gateway == null) {
+gateway = vlanRange.getVlanGateway();
+}
+
+if (netmask == null) {
+netmask = vlanRange.getVlanNetmask();
+}
+
+final String[] existingVlanIPRangeArray =
vlanRange.getIpRange().split("-");
+final String currentStartIP= existingVlanIPRangeArray[0];
+final String currentEndIP = existingVlanIPRangeArray [1];
+
+if(startIp == null){
Review comment:
This would more or less happen during the IP range checks down the line.
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [cloudstack] rhtyd commented on pull request #4202: server: don't export APIs if feature is not enabled in any zones
rhtyd commented on pull request #4202: URL: https://github.com/apache/cloudstack/pull/4202#issuecomment-654123922 @davidjumani please review this, thnx This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4182: kvm: pre-add 32 PCI controller for hot-plug issue
blueorangutan commented on pull request #4182: URL: https://github.com/apache/cloudstack/pull/4182#issuecomment-654124031 @rhtyd a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] rhtyd commented on pull request #4182: kvm: pre-add 32 PCI controller for hot-plug issue
rhtyd commented on pull request #4182: URL: https://github.com/apache/cloudstack/pull/4182#issuecomment-654123506 @blueorangutan test This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] kioie commented on a change in pull request #3997: New API endpoint: UpdateVlanIpRange
kioie commented on a change in pull request #3997:
URL: https://github.com/apache/cloudstack/pull/3997#discussion_r450097735
##
File path:
server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
##
@@ -4075,6 +4080,149 @@ public VlanVO doInTransaction(final TransactionStatus
status) {
}
+@Override
+public Vlan updateVlanAndPublicIpRange(UpdateVlanIpRangeCmd cmd) throws
ConcurrentOperationException,
+ResourceUnavailableException,ResourceAllocationException{
+
+return updateVlanAndPublicIpRange(cmd.getId(),
cmd.getStartIp(),cmd.getEndIp(),
+cmd.getGateway(),cmd.getNetmask());
+}
+
+@DB
+@ActionEvent(eventType = EventTypes.EVENT_VLAN_IP_RANGE_UPDATE,
eventDescription = "update vlan ip Range", async
+= false)
+public Vlan updateVlanAndPublicIpRange(final long id, String startIp,
+ String endIp,
+ String gateway,
+ String netmask) throws
ConcurrentOperationException{
+
+VlanVO vlanRange = _vlanDao.findById(id);
+if (vlanRange == null) {
+throw new InvalidParameterValueException("Please specify a valid
IP range id.");
+}
+
+if (gateway == null) {
+gateway = vlanRange.getVlanGateway();
+}
+
+if (netmask == null) {
+netmask = vlanRange.getVlanNetmask();
+}
+
+final String[] existingVlanIPRangeArray =
vlanRange.getIpRange().split("-");
+final String currentStartIP= existingVlanIPRangeArray[0];
+final String currentEndIP = existingVlanIPRangeArray [1];
+
+if(startIp == null){
+startIp= currentStartIP;
+}
+
+if(endIp == null){
+endIp= currentEndIP;
+}
+
+final List ips = _publicIpAddressDao.listByVlanId(id);
+checkAllocatedIpsAreWithinVlanRange(ips,startIp,endIp);
+
+final String cidr = NetUtils.ipAndNetMaskToCidr(gateway, netmask);
+final String cidrAddress = getCidrAddress(cidr);
+final long cidrSize = getCidrSize(cidr);
+
+checkIpRange(currentStartIP,currentEndIP,cidrAddress,cidrSize);
+
+checkIpRange(startIp, endIp, cidrAddress, cidrSize);
+
+checkGatewayOverlap(startIp,endIp,gateway);
+
+VlanVO range;
+try {
+final String newStartIP= startIp;
+final String newEndIP= endIp;
+
+range = _vlanDao.acquireInLockTable(id, 30);
+if (range == null) {
+throw new CloudRuntimeException("Unable to acquire vlan
configuration: " + id);
+}
+
+if (s_logger.isDebugEnabled()) {
+s_logger.debug("lock vlan " + id + " is acquired");
+}
+
+commitUpdateVlanAndIpRange(id, newStartIP, newEndIP,
currentStartIP, currentEndIP,true);
+
+} catch (final Exception e) {
+s_logger.error("Unable to edit VlanRange due to " +
e.getMessage(), e);
+throw new CloudRuntimeException("Failed to edit VlanRange. Please
contact Cloud Support.");
+}finally {
+_vlanDao.releaseFromLockTable(id);
+}
+
+return vlanRange;
+}
+private VlanVO commitUpdateVlanAndIpRange(final Long id, final String
newStartIP, final String newEndIP,final String currentStartIP, final String
currentEndIP, final boolean ipv4) {
+return Transaction.execute(new TransactionCallback() {
+@Override
+public VlanVO doInTransaction(final TransactionStatus status) {
+VlanVO vlanRange = _vlanDao.findById(id);
+s_logger.debug("Updating vlan range " + vlanRange.getId());
+
vlanRange.setIpRange(vlanRange.getIpRange().replace(currentStartIP+"-",
newStartIP+"-").replace(currentEndIP,
Review comment:
Because from what I gathered, sometimes the IPrange is not always stored
in this format only, sometimes, it can include multiple ranges for example
`172.xxx.xxx.2-172.xxx.xxx.20,172.xxx.xxx.200-172.xxx.xxx.201`, when you set IP
range this way, you loose the second range
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [cloudstack] rhtyd commented on pull request #4193: Fix usage record count
rhtyd commented on pull request #4193: URL: https://github.com/apache/cloudstack/pull/4193#issuecomment-654121948 Can you @davidjumani review this? Thanx This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[cloudstack] branch 4.14 updated: quota: Adding pagination for quotaSummary and quotaTariffList (#4186)
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch 4.14
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/4.14 by this push:
new b64d0b2 quota: Adding pagination for quotaSummary and quotaTariffList
(#4186)
b64d0b2 is described below
commit b64d0b2d92dbd81910c895510fe818c3a7a54f8c
Author: davidjumani
AuthorDate: Mon Jul 6 14:54:04 2020 +0530
quota: Adding pagination for quotaSummary and quotaTariffList (#4186)
Adds pagination and keyword search support to quotaSummary and
quotaTariffList
Fixes: #4181
---
.../main/java/com/cloud/user/dao/AccountDao.java | 2 ++
.../java/com/cloud/user/dao/AccountDaoImpl.java| 12 +--
.../cloudstack/quota/dao/QuotaAccountDao.java | 3 ++
.../cloudstack/quota/dao/QuotaAccountDaoImpl.java | 14 ++--
.../cloudstack/quota/dao/QuotaTariffDao.java | 9 +++--
.../cloudstack/quota/dao/QuotaTariffDaoImpl.java | 39 +++-
.../cloudstack/api/command/QuotaSummaryCmd.java| 9 ++---
.../cloudstack/api/command/QuotaTariffListCmd.java | 7 ++--
.../api/response/QuotaResponseBuilder.java | 10 --
.../api/response/QuotaResponseBuilderImpl.java | 42 +++---
.../api/response/QuotaSummaryResponse.java | 12 +++
.../api/command/QuotaTariffListCmdTest.java| 4 ++-
12 files changed, 118 insertions(+), 45 deletions(-)
diff --git a/engine/schema/src/main/java/com/cloud/user/dao/AccountDao.java
b/engine/schema/src/main/java/com/cloud/user/dao/AccountDao.java
index b97f318..d7754e1 100644
--- a/engine/schema/src/main/java/com/cloud/user/dao/AccountDao.java
+++ b/engine/schema/src/main/java/com/cloud/user/dao/AccountDao.java
@@ -31,6 +31,8 @@ public interface AccountDao extends GenericDao {
List findAccountsLike(String accountName);
+Pair, Integer> findAccountsLike(String accountName, Filter
filter);
+
List findActiveAccounts(Long maxAccountId, Filter filter);
List findRecentlyDeletedAccounts(Long maxAccountId, Date
earliestRemovedDate, Filter filter);
diff --git a/engine/schema/src/main/java/com/cloud/user/dao/AccountDaoImpl.java
b/engine/schema/src/main/java/com/cloud/user/dao/AccountDaoImpl.java
index 956f8a8..81bd545 100644
--- a/engine/schema/src/main/java/com/cloud/user/dao/AccountDaoImpl.java
+++ b/engine/schema/src/main/java/com/cloud/user/dao/AccountDaoImpl.java
@@ -29,6 +29,7 @@ import com.cloud.utils.db.GenericSearchBuilder;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria.Op;
+import com.google.common.base.Strings;
import com.cloud.utils.db.TransactionLegacy;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
@@ -157,9 +158,16 @@ public class AccountDaoImpl extends
GenericDaoBase implements A
@Override
public List findAccountsLike(String accountName) {
+return findAccountsLike(accountName, null).first();
+}
+
+@Override
+public Pair, Integer> findAccountsLike(String accountName,
Filter filter) {
SearchCriteria sc = createSearchCriteria();
-sc.addAnd("accountName", SearchCriteria.Op.LIKE, "%" + accountName +
"%");
-return listBy(sc);
+if (!Strings.isNullOrEmpty(accountName)) {
+sc.addAnd("accountName", SearchCriteria.Op.LIKE, "%" + accountName
+ "%");
+}
+return searchAndCount(sc, filter);
}
@Override
diff --git
a/framework/quota/src/main/java/org/apache/cloudstack/quota/dao/QuotaAccountDao.java
b/framework/quota/src/main/java/org/apache/cloudstack/quota/dao/QuotaAccountDao.java
index d1b441b..ff3fb7c 100644
---
a/framework/quota/src/main/java/org/apache/cloudstack/quota/dao/QuotaAccountDao.java
+++
b/framework/quota/src/main/java/org/apache/cloudstack/quota/dao/QuotaAccountDao.java
@@ -20,12 +20,15 @@ import java.util.List;
import org.apache.cloudstack.quota.vo.QuotaAccountVO;
+import com.cloud.utils.Pair;
import com.cloud.utils.db.GenericDao;
public interface QuotaAccountDao extends GenericDao {
List listAllQuotaAccount();
+Pair,Integer> listAllQuotaAccount(Long startIndex,
Long pageSize);
+
QuotaAccountVO findByIdQuotaAccount(Long id);
QuotaAccountVO persistQuotaAccount(QuotaAccountVO entity);
diff --git
a/framework/quota/src/main/java/org/apache/cloudstack/quota/dao/QuotaAccountDaoImpl.java
b/framework/quota/src/main/java/org/apache/cloudstack/quota/dao/QuotaAccountDaoImpl.java
index 2e28d33..23df0d4 100644
---
a/framework/quota/src/main/java/org/apache/cloudstack/quota/dao/QuotaAccountDaoImpl.java
+++
b/framework/quota/src/main/java/org/apache/cloudstack/quota/dao/QuotaAccountDaoImpl.java
@@ -22,6 +22,8 @@ import org.apache.cloudstack.quota.vo.QuotaAccountVO;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
+import
[GitHub] [cloudstack] rhtyd merged pull request #4186: Adding pagination for quotaSummary and quotaTariffList
rhtyd merged pull request #4186: URL: https://github.com/apache/cloudstack/pull/4186 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4202: server: don't export APIs if feature is not enabled in any zones
blueorangutan commented on pull request #4202: URL: https://github.com/apache/cloudstack/pull/4202#issuecomment-654120020 @rhtyd a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] rhtyd commented on pull request #4202: server: don't export APIs if feature is not enabled in any zones
rhtyd commented on pull request #4202: URL: https://github.com/apache/cloudstack/pull/4202#issuecomment-654119664 @blueorangutan test This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4202: server: don't export APIs if feature is not enabled in any zones
blueorangutan commented on pull request #4202: URL: https://github.com/apache/cloudstack/pull/4202#issuecomment-654119285 Packaging result: ✔centos7 ✔debian. JID-1536 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] rhtyd commented on pull request #4068: Adding Centos8, Ubuntu 20.04, XCPNG8.1 Support
rhtyd commented on pull request #4068: URL: https://github.com/apache/cloudstack/pull/4068#issuecomment-654106669 Manually kicked a test against XCP-ng 8.1 let's see cc @shwstppr This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4202: server: don't export APIs if feature is not enabled in any zones
blueorangutan commented on pull request #4202: URL: https://github.com/apache/cloudstack/pull/4202#issuecomment-654105234 @rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] rhtyd commented on a change in pull request #4202: server: don't export APIs if feature is not enabled in any zones
rhtyd commented on a change in pull request #4202:
URL: https://github.com/apache/cloudstack/pull/4202#discussion_r450078038
##
File path: api/src/main/java/org/apache/cloudstack/backup/BackupManager.java
##
@@ -38,7 +38,7 @@
ConfigKey BackupFrameworkEnabled = new ConfigKey<>("Advanced",
Boolean.class,
"backup.framework.enabled",
"false",
-"Is backup and recovery framework enabled.", true,
ConfigKey.Scope.Zone);
+"Is backup and recovery framework enabled. Restart management
server on global value change.", true, ConfigKey.Scope.Zone);
Review comment:
Fixed 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.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [cloudstack] rhtyd commented on pull request #4202: server: don't export APIs if feature is not enabled in any zones
rhtyd commented on pull request #4202: URL: https://github.com/apache/cloudstack/pull/4202#issuecomment-654104943 @blueorangutan package This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] kioie commented on a change in pull request #3997: New API endpoint: UpdateVlanIpRange
kioie commented on a change in pull request #3997: URL: https://github.com/apache/cloudstack/pull/3997#discussion_r450074666 ## File path: api/src/org/apache/cloudstack/api/command/admin/vlan/UpdateVlanIpRangeCmd.java ## @@ -0,0 +1,158 @@ +// 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.vlan; + +import org.apache.cloudstack.api.APICommand; +import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.ApiErrorCode; +import org.apache.cloudstack.api.BaseAsyncCmd; +import org.apache.cloudstack.api.BaseCmd; +import org.apache.cloudstack.api.Parameter; +import org.apache.cloudstack.api.ServerApiException; +import org.apache.cloudstack.api.response.VlanIpRangeResponse; +import org.apache.log4j.Logger; + +import com.cloud.dc.Vlan; +import com.cloud.event.EventTypes; +import com.cloud.exception.ConcurrentOperationException; +import com.cloud.exception.ResourceAllocationException; +import com.cloud.exception.ResourceUnavailableException; +import com.cloud.user.Account; +import com.cloud.utils.net.NetUtils; + +@APICommand(name = UpdateVlanIpRangeCmd.APINAME, description = "Updates a VLAN IP range.", responseObject = +VlanIpRangeResponse.class, since = "4.13.0", Review comment: I can move it to 4.15.0 if recommended This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] kioie commented on pull request #4010: New API endpoint to update size of Pod Management IP Range.
kioie commented on pull request #4010: URL: https://github.com/apache/cloudstack/pull/4010#issuecomment-654101067 > This is an interesting addition, thanks for the PR @kioie . > > I have a few points that I would like to be checked: > > 1. check code style, a few code pieces are not aligned with CloudStack code conventions > > 2. I think that this code can be even better if breaking the update method into smaller methods > > 3. if possible, can you please add JUnit test cases on [ConfigurationManagerTest.java](https://github.com/apache/cloudstack/blob/master/server/src/test/java/com/cloud/configuration/ConfigurationManagerTest.java)? > > > Regarding 2: small and concise methods, with self-explaining names and Javadoc, helps when reviewing, debugging, and maintaining the code base; additionally, with smaller methods, it is easy to create JUnit test case methods. Thanks. Regarding the tests cases, any suggestions on which methods I should consider? This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] rhtyd commented on a change in pull request #4202: server: don't export APIs if feature is not enabled in any zones
rhtyd commented on a change in pull request #4202:
URL: https://github.com/apache/cloudstack/pull/4202#discussion_r450072471
##
File path: api/src/main/java/org/apache/cloudstack/backup/BackupManager.java
##
@@ -38,7 +38,7 @@
ConfigKey BackupFrameworkEnabled = new ConfigKey<>("Advanced",
Boolean.class,
"backup.framework.enabled",
"false",
-"Is backup and recovery framework enabled.", true,
ConfigKey.Scope.Zone);
+"Is backup and recovery framework enabled. Restart management
server on global value change.", true, ConfigKey.Scope.Zone);
Review comment:
I'll change that.
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[cloudstack-primate] branch master updated: state: Internationalize VM state output (#493)
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack-primate.git
The following commit(s) were added to refs/heads/master by this push:
new e6e94c3 state: Internationalize VM state output (#493)
e6e94c3 is described below
commit e6e94c3ea097d3da9ea3b28148a7e8505c126c7b
Author: Nicolas Vazquez
AuthorDate: Mon Jul 6 05:22:50 2020 -0300
state: Internationalize VM state output (#493)
CloudStack API methods return resources states in English, switching
Primate to a different language should also translate these states.
---
src/components/widgets/Status.vue | 32 +++-
1 file changed, 31 insertions(+), 1 deletion(-)
diff --git a/src/components/widgets/Status.vue
b/src/components/widgets/Status.vue
index db2d63d..1597787 100644
--- a/src/components/widgets/Status.vue
+++ b/src/components/widgets/Status.vue
@@ -38,7 +38,37 @@ export default {
methods: {
getText () {
if (this.displayText && this.text) {
-return this.text.charAt(0).toUpperCase() + this.text.slice(1)
+var state = this.text
+switch (state) {
+ case 'Running':
+state = this.$t('state.running')
+break
+ case 'Stopped':
+state = this.$t('state.stopped')
+break
+ case 'Starting':
+state = this.$t('state.starting')
+break
+ case 'Stopping':
+state = this.$t('state.stopping')
+break
+ case 'Suspended':
+state = this.$t('state.suspended')
+break
+ case 'Pending':
+state = this.$t('state.pending')
+break
+ case 'Migrating':
+state = this.$t('state.migrating')
+break
+ case 'Expunging':
+state = this.$t('state.expunging')
+break
+ case 'Error':
+state = this.$t('state.error')
+break
+}
+return state.charAt(0).toUpperCase() + state.slice(1)
}
return ''
},
[cloudstack-primate] branch master updated: locales: Add internationalization for the login, projects top bar, documentation and report errors (#494)
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack-primate.git
The following commit(s) were added to refs/heads/master by this push:
new 5d0f3e9 locales: Add internationalization for the login, projects top
bar, documentation and report errors (#494)
5d0f3e9 is described below
commit 5d0f3e97b04cbdf406cdb2a0e9646bc4189e2c6b
Author: Nicolas Vazquez
AuthorDate: Mon Jul 6 05:21:45 2020 -0300
locales: Add internationalization for the login, projects top bar,
documentation and report errors (#494)
* Translate portal login
* Footer and header and more
* Internationalize header projects view
* Revert instance groups changes from this PR
---
src/components/header/ProjectMenu.vue | 6 +++---
src/components/page/GlobalFooter.vue | 2 +-
src/components/widgets/Breadcrumb.vue | 2 +-
src/locales/en.json | 3 +++
src/locales/es.json | 5 -
src/views/auth/Login.vue | 2 +-
6 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/src/components/header/ProjectMenu.vue
b/src/components/header/ProjectMenu.vue
index adb4f96..4e1314d 100644
--- a/src/components/header/ProjectMenu.vue
+++ b/src/components/header/ProjectMenu.vue
@@ -19,9 +19,9 @@
{
if (page === 1) {
-this.projects = [{ name: 'Default View' }]
+this.projects = [{ name: this.$t('label.default.view') }]
}
if (json && json.listprojectsresponse &&
json.listprojectsresponse.project) {
this.projects.push(...json.listprojectsresponse.project)
diff --git a/src/components/page/GlobalFooter.vue
b/src/components/page/GlobalFooter.vue
index bd63d7a..d6f8abf 100644
--- a/src/components/page/GlobalFooter.vue
+++ b/src/components/page/GlobalFooter.vue
@@ -27,7 +27,7 @@
https://github.com/apache/cloudstack-primate/issues/new/choose;
target="_blank">
-Report Bug
+{{ $t('label.report.bug') }}
diff --git a/src/components/widgets/Breadcrumb.vue
b/src/components/widgets/Breadcrumb.vue
index 053bc3c..e6095b9 100644
--- a/src/components/widgets/Breadcrumb.vue
+++ b/src/components/widgets/Breadcrumb.vue
@@ -34,7 +34,7 @@
-{{ "Open Documentation" }}
+{{ $t('label.open.documentation') }}
- Portal {{ $t('label.login') }}
+ {{ $t('label.login.portal') }}
[GitHub] [cloudstack] Spaceman1984 commented on pull request #4016: Fixed private gateway can't be deleted
Spaceman1984 commented on pull request #4016: URL: https://github.com/apache/cloudstack/pull/4016#issuecomment-654077662 Sorry @rhtyd, I can't give this issue much attention right now, I'm currently busy with a different project. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] rhtyd commented on issue #4204: Test issue: ipmisim/pyghmi does not work with CentOS8 patched ipmitool
rhtyd commented on issue #4204: URL: https://github.com/apache/cloudstack/issues/4204#issuecomment-654073129 @shwstppr I think the best way would be to document this, send a doc PR and for Trillian just install the 1.8.18-12 rpm (instead of 1.8.18-14 rpm) This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] rhtyd commented on issue #4204: Test issue: ipmisim/pyghmi does not work with CentOS8 patched ipmitool
rhtyd commented on issue #4204: URL: https://github.com/apache/cloudstack/issues/4204#issuecomment-654071267 Workaround - install the CentOS 8.1.1911 1.8.18-12 rpm: (the 1.8.18-14 rpm does not work with latest) https://rpmfind.net/linux/centos/8.1.1911/AppStream/x86_64/os/Packages/ipmitool-1.8.18-12.el8_1.x86_64.rpm This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] rhtyd opened a new issue #4204: Test issue: ipmisim/pyghmi does not work with CentOS8 patched ipmitool
rhtyd opened a new issue #4204: URL: https://github.com/apache/cloudstack/issues/4204 During marvin testing it was found that the ipmitool on CentOS8 has patches that no longer works with `ipmisim` test utility. This does not mean that OOBM may not work with CentOS8 management servers, which may need further testing with an actual BMC. The `ipmisim` utility uses `pyghmi` from OpenStack and may need bugfixes/refactoring that is out of scope of CloudStack project. The difference seems to be some patches on CentOS8 build, while the version on both CentOS8, CentOS7, Ubuntu 20.04 are `ipmitool version 1.8.18`, on CentOS7, Ubuntu 20.04 it works. Until this is fixed oobm related simulator tests (using ipmisim) can be skipped in Marvin. # ISSUE TYPE * Bug Report # COMPONENT NAME ~~~ Testing/library ~~~ This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] borisstoyanov commented on pull request #4172: [VMware] Support to attach more than 15 data disks in VMware VM
borisstoyanov commented on pull request #4172: URL: https://github.com/apache/cloudstack/pull/4172#issuecomment-654045876 @sureshanaparti I guess we can merge this, the marvin failures does not seem related This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4068: Adding Centos8, Ubuntu 20.04, XCPNG8.1 Support
blueorangutan commented on pull request #4068: URL: https://github.com/apache/cloudstack/pull/4068#issuecomment-654035177 Trillian test result (tid-1996) Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7 Total time taken: 49147 seconds Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr4068-t1996-kvm-centos7.zip Intermittent failure detected: /marvin/tests/smoke/test_vpc_redundant.py Smoke tests completed. 82 look OK, 1 have error(s) Only failed tests results shown below: Test | Result | Time (s) | Test File --- | --- | --- | --- test_01_create_redundant_VPC_2tiers_4VMs_4IPs_4PF_ACL | `Error` | 962.05 | test_vpc_redundant.py test_03_create_redundant_VPC_1tier_2VMs_2IPs_2PF_ACL_reboot_routers | `Error` | 329.55 | test_vpc_redundant.py test_04_rvpc_network_garbage_collector_nics | `Error` | 3926.77 | test_vpc_redundant.py This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
