[GitHub] [cloudstack] blueorangutan commented on issue #3243: [WIP DO NOT MERGE] ui: add memory used column in instance metrics view

2019-03-29 Thread GitBox
blueorangutan commented on issue #3243: [WIP DO NOT MERGE] ui: add memory used 
column in instance metrics view
URL: https://github.com/apache/cloudstack/pull/3243#issuecomment-478141680
 
 
   Trillian test result (tid-3455)
   Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 32818 seconds
   Marvin logs: 
https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr3243-t3455-kvm-centos7.zip
   Intermittent failure detected: /marvin/tests/smoke/test_privategw_acl.py
   Intermittent failure detected: /marvin/tests/smoke/test_vpc_redundant.py
   Smoke tests completed. 69 look OK, 1 have error(s)
   Only failed tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   test_05_rvpc_multi_tiers | `Failure` | 429.66 | test_vpc_redundant.py
   test_05_rvpc_multi_tiers | `Error` | 460.46 | 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


With regards,
Apache Git Services


[GitHub] [cloudstack] blueorangutan commented on issue #3212: [WIP DO NOT MERGE] storage: publish delete usage event for snapshot deletion

2019-03-29 Thread GitBox
blueorangutan commented on issue #3212: [WIP DO NOT MERGE] storage: publish 
delete usage event for snapshot deletion
URL: https://github.com/apache/cloudstack/pull/3212#issuecomment-478071872
 
 
   Trillian test result (tid-3452)
   Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 31491 seconds
   Marvin logs: 
https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr3212-t3452-kvm-centos7.zip
   Intermittent failure detected: /marvin/tests/smoke/test_vpc_redundant.py
   Smoke tests completed. 70 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


With regards,
Apache Git Services


[GitHub] [cloudstack] GabrielBrascher commented on issue #3173: Mock Scanner, instead of scan the computer running the test.

2019-03-29 Thread GitBox
GabrielBrascher commented on issue #3173: Mock Scanner, instead of scan the 
computer running the test.
URL: https://github.com/apache/cloudstack/pull/3173#issuecomment-477969205
 
 
   @rhtyd @DaanHoogland I updated the branch with the changes proposed by Daan.


This is an automated message from the 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


With regards,
Apache Git Services


[GitHub] [cloudstack] blueorangutan commented on issue #3245: [WIP DO NOT MERGE] server: allows compute offering with or without constraints

2019-03-29 Thread GitBox
blueorangutan commented on issue #3245: [WIP DO NOT MERGE] server: allows 
compute offering with or without constraints
URL: https://github.com/apache/cloudstack/pull/3245#issuecomment-477966429
 
 
   Packaging result: ✔centos6 ✔centos7 ✔debian. JID-2663


This is an automated message from the 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


With regards,
Apache Git Services


[GitHub] [cloudstack] borisstoyanov commented on issue #3245: [WIP DO NOT MERGE] server: allows compute offering with or without constraints

2019-03-29 Thread GitBox
borisstoyanov commented on issue #3245: [WIP DO NOT MERGE] server: allows 
compute offering with or without constraints
URL: https://github.com/apache/cloudstack/pull/3245#issuecomment-477961176
 
 
   @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


With regards,
Apache Git Services


[GitHub] [cloudstack] blueorangutan commented on issue #3245: [WIP DO NOT MERGE] server: allows compute offering with or without constraints

2019-03-29 Thread GitBox
blueorangutan commented on issue #3245: [WIP DO NOT MERGE] server: allows 
compute offering with or without constraints
URL: https://github.com/apache/cloudstack/pull/3245#issuecomment-477961205
 
 
   @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.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services


[GitHub] [cloudstack] blueorangutan commented on issue #3248: [WIP DO NOT MERGE] server: disk offerings for specified domain(s) and zone(s)

2019-03-29 Thread GitBox
blueorangutan commented on issue #3248: [WIP DO NOT MERGE] server: disk 
offerings for specified domain(s) and zone(s) 
URL: https://github.com/apache/cloudstack/pull/3248#issuecomment-477959883
 
 
   Packaging result: ✖centos6 ✖centos7 ✖debian. JID-2662


This is an automated message from the 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


With regards,
Apache Git Services


[GitHub] [cloudstack] blueorangutan commented on issue #3248: [WIP DO NOT MERGE] server: disk offerings for specified domain(s) and zone(s)

2019-03-29 Thread GitBox
blueorangutan commented on issue #3248: [WIP DO NOT MERGE] server: disk 
offerings for specified domain(s) and zone(s) 
URL: https://github.com/apache/cloudstack/pull/3248#issuecomment-477957709
 
 
   @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.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services


[GitHub] [cloudstack] borisstoyanov commented on issue #3248: [WIP DO NOT MERGE] server: disk offerings for specified domain(s) and zone(s)

2019-03-29 Thread GitBox
borisstoyanov commented on issue #3248: [WIP DO NOT MERGE] server: disk 
offerings for specified domain(s) and zone(s) 
URL: https://github.com/apache/cloudstack/pull/3248#issuecomment-477957552
 
 
   @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


With regards,
Apache Git Services


[GitHub] [cloudstack] blueorangutan commented on issue #3243: [WIP DO NOT MERGE] ui: add memory used column in instance metrics view

2019-03-29 Thread GitBox
blueorangutan commented on issue #3243: [WIP DO NOT MERGE] ui: add memory used 
column in instance metrics view
URL: https://github.com/apache/cloudstack/pull/3243#issuecomment-477957132
 
 
   @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


With regards,
Apache Git Services


[GitHub] [cloudstack] borisstoyanov commented on issue #3243: [WIP DO NOT MERGE] ui: add memory used column in instance metrics view

2019-03-29 Thread GitBox
borisstoyanov commented on issue #3243: [WIP DO NOT MERGE] ui: add memory used 
column in instance metrics view
URL: https://github.com/apache/cloudstack/pull/3243#issuecomment-477957086
 
 
   @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


With regards,
Apache Git Services


[GitHub] [cloudstack] DaanHoogland commented on a change in pull request #3186: Add possibility to set KVM MTU size for NIC

2019-03-29 Thread GitBox
DaanHoogland commented on a change in pull request #3186: Add possibility to 
set KVM MTU size for NIC
URL: https://github.com/apache/cloudstack/pull/3186#discussion_r270344217
 
 

 ##
 File path: 
api/src/main/java/org/apache/cloudstack/api/command/user/vm/UpdateVmNicIpMtuCmd.java
 ##
 @@ -46,9 +28,27 @@
 import com.cloud.uservm.UserVm;
 import com.cloud.utils.net.NetUtils;
 import com.cloud.vm.Nic;
+import com.google.common.base.Strings;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiArgValidator;
+import org.apache.cloudstack.api.ApiCommandJobType;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiConstants.VMDetails;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.BaseAsyncCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ResponseObject.ResponseView;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.NicResponse;
+import org.apache.cloudstack.api.response.UserVmResponse;
+import org.apache.cloudstack.context.CallContext;
+import org.apache.log4j.Logger;
 
-@APICommand(name = "updateVmNicIp", description = "Update the default Ip of a 
VM Nic", responseObject = UserVmResponse.class)
-public class UpdateVmNicIpCmd extends BaseAsyncCmd {
+import java.util.ArrayList;
+import java.util.EnumSet;
+
+@APICommand(name = "updateVmNicIpMtu", description = "Update the default Ip 
and MTU of a VM Nic", responseObject = UserVmResponse.class)
 
 Review comment:
   rename of a public API is a big no-no. it breaks backwards compatibility. if 
the extra parameter is optional, you can just add it, else create an extra API, 
please.


This is an automated message from the 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


With regards,
Apache Git Services


[GitHub] [cloudstack] DaanHoogland commented on a change in pull request #3186: Add possibility to set KVM MTU size for NIC

2019-03-29 Thread GitBox
DaanHoogland commented on a change in pull request #3186: Add possibility to 
set KVM MTU size for NIC
URL: https://github.com/apache/cloudstack/pull/3186#discussion_r270343299
 
 

 ##
 File path: 
api/src/main/java/org/apache/cloudstack/api/command/user/vm/AddNicToVMCmd.java
 ##
 @@ -90,6 +93,14 @@ public String getIpAddress() {
 return ipaddr;
 }
 
+public int getMtu() {
+if (mtu != 0) {
+return mtu;
+} else {
 
 Review comment:
   if !0 else 0??? I do not see reason to this if statement


This is an automated message from the 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


With regards,
Apache Git Services


[GitHub] [cloudstack] DaanHoogland commented on a change in pull request #3186: Add possibility to set KVM MTU size for NIC

2019-03-29 Thread GitBox
DaanHoogland commented on a change in pull request #3186: Add possibility to 
set KVM MTU size for NIC
URL: https://github.com/apache/cloudstack/pull/3186#discussion_r270346622
 
 

 ##
 File path: server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
 ##
 @@ -1459,9 +1459,10 @@ public UserVm 
updateDefaultNicForVirtualMachine(UpdateDefaultNicForVMCmd cmd) th
 }
 
 @Override
-public UserVm updateNicIpForVirtualMachine(UpdateVmNicIpCmd cmd) {
+public UserVm updateNicIpMtuForVirtualMachine(UpdateVmNicIpMtuCmd cmd) {
 
 Review comment:
   service level call renaming is not as bad as API but migyht break third 
party plugins as well!
   Also I don't think it is needed, a small refactor and two methods, one 
calling the other will do the trick.


This is an automated message from the 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


With regards,
Apache Git Services


[GitHub] [cloudstack] DaanHoogland commented on a change in pull request #3186: Add possibility to set KVM MTU size for NIC

2019-03-29 Thread GitBox
DaanHoogland commented on a change in pull request #3186: Add possibility to 
set KVM MTU size for NIC
URL: https://github.com/apache/cloudstack/pull/3186#discussion_r270344571
 
 

 ##
 File path: 
api/src/main/java/org/apache/cloudstack/api/command/user/vm/UpdateVmNicIpMtuCmd.java
 ##
 @@ -101,11 +105,18 @@ public Long getNicId() {
 }
 
 public String getIpaddress () {
-if (ipAddr != null) {
-return ipAddr;
-} else {
+if (Strings.isNullOrEmpty(ipAddr)) {
 return null;
 }
+return ipAddr;
+}
+
+public int getMtu () {
 
 Review comment:
   just retrun mtu will do, unless you are meaning to check for mtu <= 0 or 
something else.


This is an automated message from the 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


With regards,
Apache Git Services


[GitHub] [cloudstack] blueorangutan commented on issue #3186: Add possibility to set KVM MTU size for NIC

2019-03-29 Thread GitBox
blueorangutan commented on issue #3186: Add possibility to set KVM MTU size for 
NIC
URL: https://github.com/apache/cloudstack/pull/3186#issuecomment-477934481
 
 
   Packaging result: ✔centos6 ✔centos7 ✔debian. JID-2661


This is an automated message from the 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


With regards,
Apache Git Services


[cloudstack] branch master updated: fix incorrect iscsi path stat for managed storage (#3181)

2019-03-29 Thread dahn
This is an automated email from the ASF dual-hosted git repository.

dahn pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/master by this push:
 new beb0422  fix incorrect iscsi path stat for managed storage (#3181)
beb0422 is described below

commit beb0422dd54bb288b12b07c9f7d9689df38fb599
Author: skattoju3 <45469763+skatto...@users.noreply.github.com>
AuthorDate: Fri Mar 29 05:25:01 2019 -0400

fix incorrect iscsi path stat for managed storage (#3181)

## Description
The issue was that an Incorrect iscsi path was being passed for managed 
storage pools when collecting volume stats. Storage pools normally have a UUID 
based path while managed storage pools require an IQN based path
---
 server/src/main/java/com/cloud/server/StatsCollector.java | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/server/src/main/java/com/cloud/server/StatsCollector.java 
b/server/src/main/java/com/cloud/server/StatsCollector.java
index 8e2bc7e..80b745e 100644
--- a/server/src/main/java/com/cloud/server/StatsCollector.java
+++ b/server/src/main/java/com/cloud/server/StatsCollector.java
@@ -928,7 +928,11 @@ public class StatsCollector extends ManagerBase implements 
ComponentMethodInterc
 List volumeLocators = new ArrayList();
 for (VolumeVO volume : volumes) {
 if (volume.getFormat() == ImageFormat.QCOW2) {
-volumeLocators.add(volume.getUuid());
+if (pool.isManaged()) {
+volumeLocators.add(volume.getPath());
+} else {
+volumeLocators.add(volume.getUuid());
+}
 } else if (volume.getFormat() == ImageFormat.VHD) {
 volumeLocators.add(volume.getPath());
 } else if (volume.getFormat() == ImageFormat.OVA) {



[GitHub] [cloudstack] DaanHoogland merged pull request #3181: fix incorrect iscsi path stat for managed storage

2019-03-29 Thread GitBox
DaanHoogland merged pull request #3181: fix incorrect iscsi path stat for 
managed storage
URL: https://github.com/apache/cloudstack/pull/3181
 
 
   


This is an automated message from the 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


With regards,
Apache Git Services


[GitHub] [cloudstack] blueorangutan commented on issue #3186: Add possibility to set KVM MTU size for NIC

2019-03-29 Thread GitBox
blueorangutan commented on issue #3186: Add possibility to set KVM MTU size for 
NIC
URL: https://github.com/apache/cloudstack/pull/3186#issuecomment-477928304
 
 
   @DaanHoogland a Jenkins job has been kicked to build packages. I'll keep you 
posted as I make progress.


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services


[GitHub] [cloudstack] DaanHoogland commented on issue #3186: Add possibility to set KVM MTU size for NIC

2019-03-29 Thread GitBox
DaanHoogland commented on issue #3186: Add possibility to set KVM MTU size for 
NIC
URL: https://github.com/apache/cloudstack/pull/3186#issuecomment-477928007
 
 
   @svenvogel because the packaging failed on all platforms. The thumb down is 
on the blueorangutan output.


This is an automated message from the 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


With regards,
Apache Git Services


[GitHub] [cloudstack] DaanHoogland commented on issue #3186: Add possibility to set KVM MTU size for NIC

2019-03-29 Thread GitBox
DaanHoogland commented on issue #3186: Add possibility to set KVM MTU size for 
NIC
URL: https://github.com/apache/cloudstack/pull/3186#issuecomment-477928168
 
 
   restarting
   @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


With regards,
Apache Git Services


[GitHub] [cloudstack] blueorangutan commented on issue #3212: [WIP DO NOT MERGE] storage: publish delete usage event for snapshot deletion

2019-03-29 Thread GitBox
blueorangutan commented on issue #3212: [WIP DO NOT MERGE] storage: publish 
delete usage event for snapshot deletion
URL: https://github.com/apache/cloudstack/pull/3212#issuecomment-477899780
 
 
   @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


With regards,
Apache Git Services


[GitHub] [cloudstack] borisstoyanov commented on issue #3212: [WIP DO NOT MERGE] storage: publish delete usage event for snapshot deletion

2019-03-29 Thread GitBox
borisstoyanov commented on issue #3212: [WIP DO NOT MERGE] storage: publish 
delete usage event for snapshot deletion
URL: https://github.com/apache/cloudstack/pull/3212#issuecomment-477899644
 
 
   @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


With regards,
Apache Git Services


[GitHub] [cloudstack] rhtyd merged pull request #3214: ui: use executable template filter for users

2019-03-29 Thread GitBox
rhtyd merged pull request #3214: ui: use executable template filter for users
URL: https://github.com/apache/cloudstack/pull/3214
 
 
   


This is an automated message from the 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


With regards,
Apache Git Services


[cloudstack] branch master updated: ui: use executable template filter for users (#3214)

2019-03-29 Thread rohit
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 4985e57  ui: use executable template filter for users (#3214)
4985e57 is described below

commit 4985e57f302aec0a093548842a64b2c7d7b5ede5
Author: Rohit Yadav 
AuthorDate: Fri Mar 29 12:13:26 2019 +0530

ui: use executable template filter for users (#3214)

Problem: When reinstalling a VM, the UI only shows featured templates and 
not all possible list of allowed templates.
Root Cause: The list of templates for reinstall used featured as filter in 
‘listTemplates’ API which did not include all available options.
Solution: The issue is fixed by using the executable template filter of the 
‘listTemplates’ API to list all
possible templates that a user is allowed to use to deploy a VM.
---
 ui/scripts/instances.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index b006447..57a060f 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -1137,7 +1137,7 @@
 label: 'label.select.a.template',
 select: function(args) {
 var data = {
-templatefilter: 'featured'
+templatefilter: 'executable'
 };
 $.ajax({
 url: createURL('listTemplates'),



[cloudstack] branch master updated: apidocs: Make the API documentation version not *hardcoded* to v4.9.0 (#3247)

2019-03-29 Thread rohit
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 6c841bf  apidocs: Make the API documentation version not *hardcoded* 
to v4.9.0 (#3247)
6c841bf is described below

commit 6c841bf69b96dfedcc1ab589a64700b85167f361
Author: Gabriel Beims Bräscher 
AuthorDate: Fri Mar 29 03:25:45 2019 -0300

apidocs: Make the API documentation version not *hardcoded* to v4.9.0 
(#3247)

This commit makes the API documentation automatically updated to the
current project version. If one wants to set another version, it is
possible by just editing the ACS_RELEASE variable in 'build-apidoc.sh'.
---
 tools/apidoc/build-apidoc.sh|  4 
 tools/apidoc/generatecommands.xsl   | 11 +--
 tools/apidoc/generatetoc_header.xsl |  3 +--
 tools/apidoc/pom.xml|  1 +
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/tools/apidoc/build-apidoc.sh b/tools/apidoc/build-apidoc.sh
index 4e1f9a6..1b0f4f3 100755
--- a/tools/apidoc/build-apidoc.sh
+++ b/tools/apidoc/build-apidoc.sh
@@ -20,6 +20,8 @@
 # cloud-build-api-doc.sh -- builds api documentation.
 #set -x
 #set -u
+ACS_RELEASE="$1"
+shift
 TARGETJARDIR="$1"
 shift
 DEPSDIR="$1"
@@ -59,6 +61,8 @@ set -e
  cp "$thisdir"/*.java .
  cp "$thisdir"/*.xsl .
  sed -e 's,%API_HEADER%,All APIs,g' "$thisdir/generatetoc_header.xsl" 
>generatetoc.xsl
+ sed -i "s/%ACS_RELEASE%/${ACS_RELEASE}/g" generatetoc.xsl
+ sed -i "s/%ACS_RELEASE%/${ACS_RELEASE}/g" generatecommands.xsl
 
  PLATFORM=`uname -s`
  if [[ "$PLATFORM" =~ .*WIN.* ]]
diff --git a/tools/apidoc/generatecommands.xsl 
b/tools/apidoc/generatecommands.xsl
index 7e8ef78..d727197 100644
--- a/tools/apidoc/generatecommands.xsl
+++ b/tools/apidoc/generatecommands.xsl
@@ -55,13 +55,12 @@ version="1.0">



-   

-   Apache 
CloudStack v4.9.0 Root Admin API Reference
-   
-   
-
-
+   Apache CloudStack %ACS_RELEASE% 
Root Admin API Reference
+   
+   
+   
+   

 
 
diff --git a/tools/apidoc/generatetoc_header.xsl 
b/tools/apidoc/generatetoc_header.xsl
index 6362ab8..b522da6 100644
--- a/tools/apidoc/generatetoc_header.xsl
+++ b/tools/apidoc/generatetoc_header.xsl
@@ -51,8 +51,7 @@ version="1.0">

 

-   
-  Apache CloudStack API Documentation (v4.9.0)
+  Apache CloudStack API Documentation 
(%ACS_RELEASE%)
   http://cloudstack.apache.org/docs/api/;>
 

diff --git a/tools/apidoc/pom.xml b/tools/apidoc/pom.xml
index 8ad3830..c2d5748 100644
--- a/tools/apidoc/pom.xml
+++ b/tools/apidoc/pom.xml
@@ -63,6 +63,7 @@
 bash
 
 ./build-apidoc.sh
+${project.version}
 ${client.config.jars}
 ${client.config.jars}
 ./target



[GitHub] [cloudstack] rhtyd merged pull request #3247: Make the API documentation version not *hardcoded* to v4.9.0

2019-03-29 Thread GitBox
rhtyd merged pull request #3247: Make the API documentation version not 
*hardcoded* to v4.9.0
URL: https://github.com/apache/cloudstack/pull/3247
 
 
   


This is an automated message from the 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


With regards,
Apache Git Services


[cloudstack] branch master updated (671a70a -> fd541ef)

2019-03-29 Thread rohit
This is an automated email from the ASF dual-hosted git repository.

rohit pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.


from 671a70a  schema: add empty DB upgrade path from 4.12.0.0 to 4.13.0.0 
(#3236)
 new 6e51bde  client: don't disable TLSv1, TLSv1.1 by default that breaks 
VMware env
 new c4b06ff  Merge pull request #3238 from shapeblue/tls-vmware-issue-fix
 new c2bd32f  Merge remote-tracking branch 'upstream/4.11' into 4.12
 new fd541ef  Merge remote-tracking branch 'origin/4.12'

The 31840 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 client/conf/java.security.ciphers.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)



[GitHub] [cloudstack] shwstppr opened a new pull request #3248: server: disk offerings for specified domain(s) and zone(s)

2019-03-29 Thread GitBox
shwstppr opened a new pull request #3248: server: disk offerings for specified 
domain(s) and zone(s) 
URL: https://github.com/apache/cloudstack/pull/3248
 
 
   ## Description
   **Problem**: Storage offerings cannot be linked to specified multiple 
domain(s) and zone(s).
   **Root cause**: Storage or disk offerings are independent of zones and they 
can be linked to a single domain/sub-domain
   **Solution**: Storage or disk offerings will be allowed to link with 
specified domain(s) and zone(s). Disk offering linked with multiple domains and 
zones can be created both with UI and API. Existing disk offerings can be 
updated for linking using API. Refactored createDiskOffering and 
updateDiskOffering API to allow passing list of domain and zone IDs with 
domainids and zoneids parameter respectively. UI has been refactored to allow 
selecting multiple domains and zones while creating disk offering using 
multi-select elements. Disk offering details will now show list of linked 
domains and zones as a comma-separated list of names. Linked domains and zones 
will be stored in the cloud.disk_offering_details table in database as 
comma-separated list of IDs with key domainids and zoneids respectively.
   
   ## Types of changes
   
   - [ ] Breaking change (fix or feature that would cause existing 
functionality to change)
   - [x] New feature (non-breaking change which adds functionality)
   - [ ] Bug fix (non-breaking change which fixes an issue)
   - [x] Enhancement (improves an existing feature and functionality)
   - [ ] Cleanup (Code refactoring and cleanup, that may add test cases)
   
   ## Screenshots (if appropriate):
   Updated create disk offering form
   ![Screenshot from 2019-03-27 
17-12-50](https://user-images.githubusercontent.com/153340/55073459-ccfcd300-50b3-11e9-8c1a-2fc74cc893b9.png)
   ![Screenshot from 2019-03-27 
17-11-11](https://user-images.githubusercontent.com/153340/55073466-d128f080-50b3-11e9-92c5-e5793da205c3.png)
   
   Updated disk offering details with domains and zones,
   ![Screenshot from 2019-03-27 
17-07-44](https://user-images.githubusercontent.com/153340/55073505-e9007480-50b3-11e9-81c6-82c161122b64.png)
   
   Cloudmonkey API calls
   ![Screenshot from 2019-03-27 
17-07-27](https://user-images.githubusercontent.com/153340/55073521-f0278280-50b3-11e9-8f50-c98bd6be3c26.png)
   ![Screenshot from 2019-03-27 
17-06-14](https://user-images.githubusercontent.com/153340/55073526-f289dc80-50b3-11e9-8917-9cec20353b0d.png)
   
   
   ## How Has This Been Tested?
   From UI and cmk
   
   
   
   


This is an automated message from the 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


With regards,
Apache Git Services