28763 Commits

Author SHA1 Message Date
Remi Bergsma
b38c3bed0c Updating pom.xml version numbers for release 4.6.1-SNAPSHOT
Signed-off-by: Remi Bergsma <github@remi.nl>
2015-11-13 21:27:57 +01:00
Remi Bergsma
e31ade03c6 Updating pom.xml version numbers for release 4.6.0
Signed-off-by: Remi Bergsma <github@remi.nl>
4.6.0 shapeblue-4.6.0-00
2015-11-10 15:45:34 +01:00
Remi Bergsma
e1cc673ead Merge pull request #1055 from DaanHoogland/CLOUDSTACK-9023
CLOUDSTACK-9023 filtering privatekey info from loggingtested off-line but rebased afterwards!

* pr/1055:
  CLOUDSTACK-9023 filtering privatekey info from logging

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-11-10 14:57:02 +01:00
Remi Bergsma
62f57d2355 Merge pull request #1053 from milamberspace/DoubleCheckL10N-Fix-SpanishNewLine
Fix the new line bug (invalid char on UI), add some Spanish translation from Transifex

Some strings with invalid encoding has been fixed too (Thanks Nicolas Vazquez)

Related to CLOUDSTACK-9043

* pr/1053:
  Fix the new line bug (invalid char on UI), add some Spanish translation from Transifex

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-11-10 13:44:57 +01:00
Remi Bergsma
ee639cffe4 Merge pull request #1052 from davidamorimfaria/centos7-packaging
CLOUDSTACK-9049: fix Centos7 with Tomcat7 packaging and python libsCLOUDSTACK-9049: Fix Centos7 with Tomcat7 packaging and python libs

* pr/1052:
  CLOUDSTACK-9049: fix Centos7 with Tomcat7 packaging and python libs * adjust library to support tomcat7 config files * adjust centos7 spec to use tomcat7 config files from deployment * add option to use tomcat7 files in management server setup
  reorder content to match original

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-11-10 13:30:55 +01:00
Daan Hoogland
a580330864 CLOUDSTACK-9023 filtering privatekey info from logging 2015-11-10 12:08:01 +01:00
Remi Bergsma
5c48ce9260 Merge pull request #1034 from ustcweizhou/ui-changes
Fix some small UI bugs[UI] fix typo for user data field
[UI] Private Cloud VPC always shows 0 in Site-to-Site VPN, even when one is configured
[UI] change the Icon for changing ACL's for a tier in a VPC
[UI] Network names are not being displayed in Infra  VRs  router  NICS

* pr/1034:
  [UI] change alert to ui dialog in response of instance wizard
  [UI] Network names are not being displayed in Infra » VRs » router » NICS
  [UI] change the Icon for changing ACL's for a tier in a VPC
  [UI] Private Cloud VPC always shows 0 in Site-to-Site VPN, even when one is configured
  [UI] fix typo for user data field

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-11-10 12:06:56 +01:00
David Amorim Faria
3c4a24cf2c CLOUDSTACK-9049: fix Centos7 with Tomcat7 packaging and python libs
* adjust library to support tomcat7 config files
* adjust centos7 spec to use tomcat7 config files from deployment
* add option to use tomcat7 files in management server setup
2015-11-10 11:55:19 +01:00
Remi Bergsma
7e42978a77 Merge pull request #1046 from borisroman/CLOUDSTACK-9044
CLOUDSTACK-9044: Add RBD Primary Storage to the Zone Wizard.Added to option to use RBD as primary storage in the Zone Wizard.

Pure UI change.

* pr/1046:
  CLOUDSTACK-9044: Add RBD Primary Storage to the Zone Wizard.

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-11-10 11:23:08 +01:00
Remi Bergsma
752cf119f2 Merge pull request #999 from pdion891/dockerfile7
squashed commit for dockerfiles part#2 including comments from PR#910This PR replace PR#910 which include fix from comments in PR#910.

This PR simplify download of systemvm templates, work with docker-compose and enable integration-api port and use of localstorage without reconfiguration of cloudstack.

Rebased on Oct28.

* pr/999:
  squashed commit for dockerfiles part#2 including comments from PR#910

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-11-10 11:21:32 +01:00
David Amorim Faria
c84bb6b725 reorder content to match original 2015-11-10 08:38:59 +01:00
Milamber
875e12213e Fix the new line bug (invalid char on UI), add some Spanish translation from Transifex
Related to CLOUDSTACK-9043
2015-11-10 00:13:29 +00:00
Remi Bergsma
04f72088c0 Merge pull request #1040 from borisroman/CLOUDSTACK-9040
CLOUDSTACK-9040: Use Tomcat6 for Debian packages.Use Tomcat6 for Debian packages.

How to test:
Package debian packages and install them. Will depend specifically on tomcat6 for now.

Error log before:
```
DEBUG:root:execute:uname -r
DEBUG:root:execute:uname -m
DEBUG:root:execute:hostname -f
DEBUG:root:execute:iptables-save|grep INPUT|grep -w 8080
DEBUG:root:Failed to execute:
DEBUG:root:execute:ufw allow 8080/tcp
DEBUG:root:execute:iptables-save|grep INPUT|grep -w 8250
DEBUG:root:Failed to execute:
DEBUG:root:execute:ufw allow 8250/tcp
DEBUG:root:execute:iptables-save|grep INPUT|grep -w 9090
DEBUG:root:Failed to execute:
DEBUG:root:execute:ufw allow 9090/tcp
DEBUG:root:execute:rm -f /etc/cloudstack/management/server.xml
DEBUG:root:execute:rm -f /etc/cloudstack/management/tomcat6.conf
DEBUG:root:execute:ln -s /etc/cloudstack/management/server-nonssl.xml /etc/cloudstack/management/server.xml
DEBUG:root:execute:ln -s /etc/cloudstack/management/tomcat6-nonssl.conf /etc/cloudstack/management/tomcat6.conf
DEBUG:root:execute:touch /var/run/cloudstack-management.pid
DEBUG:root:execute:chown cloud.cloud /var/run/cloudstack-management.pid
DEBUG:root:execute:hostname --fqdn
DEBUG:root:execute:mkdir /var/log/cloudstack-management/
DEBUG:root:Failed to execute:mkdir: cannot create directory '/var/log/cloudstack-management/': File exists
DEBUG:root:execute:sudo /usr/sbin/service tomcat6 status
DEBUG:root:Failed to execute:tomcat6: unrecognized service
DEBUG:root:execute:sudo /usr/sbin/service tomcat6 stop
DEBUG:root:Failed to execute:tomcat6: unrecognized service
DEBUG:root:execute:sudo update-rc.d -f tomcat6 remove
DEBUG:root:execute:sudo /usr/sbin/service cloudstack-management status
DEBUG:root:Failed to execute: * cloudstack-management is not installed
DEBUG:root:execute:sudo /usr/sbin/service cloudstack-management stop
DEBUG:root:Failed to execute: * cloudstack-management is not installed
DEBUG:root:execute:sudo update-rc.d -f cloudstack-management remove
DEBUG:root:execute:sudo update-rc.d -f cloudstack-management defaults
DEBUG:root:execute:sudo /usr/sbin/service cloudstack-management status
DEBUG:root:Failed to execute: * cloudstack-management is not installed
DEBUG:root:execute:sudo /usr/sbin/service cloudstack-management start
DEBUG:root:Failed to execute: * cloudstack-management is not installed
DEBUG:root:None
```

After:
```
root@cs1:~# cloudstack-setup-management
Starting to configure CloudStack Management Server:
Configure Firewall ...        [OK]
Configure CloudStack Management Server ...[OK]
CloudStack Management Server setup is Done!
```

Error log after:
```
DEBUG:root:execute:uname -r
DEBUG:root:execute:uname -m
DEBUG:root:execute:hostname -f
DEBUG:root:execute:iptables-save|grep INPUT|grep -w 8080
DEBUG:root:Failed to execute:
DEBUG:root:execute:ufw allow 8080/tcp
DEBUG:root:execute:iptables-save|grep INPUT|grep -w 8250
DEBUG:root:Failed to execute:
DEBUG:root:execute:ufw allow 8250/tcp
DEBUG:root:execute:iptables-save|grep INPUT|grep -w 9090
DEBUG:root:Failed to execute:
DEBUG:root:execute:ufw allow 9090/tcp
DEBUG:root:execute:rm -f /etc/cloudstack/management/server.xml
DEBUG:root:execute:rm -f /etc/cloudstack/management/tomcat6.conf
DEBUG:root:execute:ln -s /etc/cloudstack/management/server-nonssl.xml /etc/cloudstack/management/server.xml
DEBUG:root:execute:ln -s /etc/cloudstack/management/tomcat6-nonssl.conf /etc/cloudstack/management/tomcat6.conf
DEBUG:root:execute:touch /var/run/cloudstack-management.pid
DEBUG:root:execute:chown cloud.cloud /var/run/cloudstack-management.pid
DEBUG:root:execute:hostname --fqdn
DEBUG:root:execute:mkdir /var/log/cloudstack-management/
DEBUG:root:execute:sudo /usr/sbin/service tomcat6 status
DEBUG:root:execute:sudo /usr/sbin/service tomcat6 stop
DEBUG:root:execute:sudo update-rc.d -f tomcat6 remove
DEBUG:root:execute:sudo /usr/sbin/service cloudstack-management status
DEBUG:root:execute:sudo /usr/sbin/service cloudstack-management stop
DEBUG:root:execute:sudo update-rc.d -f cloudstack-management remove
DEBUG:root:execute:sudo update-rc.d -f cloudstack-management defaults
DEBUG:root:execute:sudo /usr/sbin/service cloudstack-management status
DEBUG:root:execute:sudo /usr/sbin/service cloudstack-management start
```

* pr/1040:
  CLOUDSTACK-9040: Use Tomcat6 for Debian packages.

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-11-09 17:55:05 +01:00
Remi Bergsma
bd80df4504 Merge pull request #1050 from ekholabs/fix/upgrade_path-CLOUDSTACK-9046
CLOUDSTACK-9046 - Fix upgrade path from 4.4 and 4.5 to 4.6This PR fixes the upgrade path from 4.4.x/4.5.x to 4.6.0. We introduced the logic to update the database with the correct information about the SystemVMs.

We tested this PR with by doing an upgrade from 4.4.4 to 4.6.0 and it works as expected.

* pr/1050:
  CLOUDSTACK-9046 - Add new ACS systemVMs website
  CLOUDSTACK-9046 - Add SystemVM upgrade from 4.5 to 4.6 in the Upgrade452to460.java file

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-11-09 17:39:40 +01:00
Remi Bergsma
6a1b886951 Merge pull request #1039 from borisroman/CLOUDSTACK-9039
CLOUDSTACK-9039: Fix paths for logging Ubuntu ManagementFix paths for logging Ubuntu Management.

How to test:
Install via DEB packages...

* pr/1039:
  CLOUDSTACK-9039: Fix paths for logging Ubuntu Management.

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-11-09 17:33:29 +01:00
Remi Bergsma
ca860348dc Merge pull request #1033 from Carles-Figuerola/centos-7-redhat-release
CLOUDSTACK-9029: Proper support to identify CentOS 7 version numberhttps://issues.apache.org/jira/browse/CLOUDSTACK-9029

* pr/1033:
  CLOUDSTACK-9029: Proper support to identify CentOS 7 version number

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-11-09 16:54:38 +01:00
Remi Bergsma
ac00c50b49 Merge pull request #1047 from borisroman/CLOUDSTACK-9045
CLOUDSTACK-9045: Corrected mount point for management server DEBIAN.Corrected mount point for management server DEBIAN.

See issue: https://issues.apache.org/jira/browse/CLOUDSTACK-9045

* pr/1047:
  CLOUDSTACK-9045: Corrected mount point for management server DEBIAN.

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-11-09 16:38:54 +01:00
Boris Schrijver
acd49d801b CLOUDSTACK-9039: Fix paths for logging Ubuntu Management. 2015-11-09 15:50:18 +01:00
Remi Bergsma
790297cdba Merge pull request #1043 from milamberspace/CLOUDSTACK-9043-Unexpected-token-ILLEGAL_de_DE-zh_CN
CLOUDSTACK-9043 Remove \n (new line) in German and Chinese translationThe new line isn't in the original strings and are invalid character in the javascript files/ui

Tested with success on Chrome

* pr/1043:
  Remove \n (new line) in German and Chinese translation

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-11-09 15:32:38 +01:00
Wilder Rodrigues
72e79bcaa6 CLOUDSTACK-9046 - Add new ACS systemVMs website
- Also change the URl in the SQL file.
2015-11-09 15:13:53 +01:00
Remi Bergsma
b1c29d5ed5 Merge pull request #1036 from rags22489664/master
CLOUDSTACK-9038 - Infrastructure tab is slow because of synchronous API callsMaking parallel asynchronous calls to speed up the infrastructure page.

* pr/1036:
  CLOUDSTACK-9038 - Infrastructure tab is slow because of synchronous API calls

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-11-09 15:13:42 +01:00
Wilder Rodrigues
4b503b4582 CLOUDSTACK-9046 - Add SystemVM upgrade from 4.5 to 4.6 in the Upgrade452to460.java file 2015-11-09 10:06:19 +01:00
Boris Schrijver
7bbc5338c5 CLOUDSTACK-9045: Corrected mount point for management server DEBIAN. 2015-11-08 20:38:47 +01:00
Boris Schrijver
c4f64dce21 CLOUDSTACK-9044: Add RBD Primary Storage to the Zone Wizard. 2015-11-08 18:22:39 +01:00
Milamber
813cbc0c57 Remove \n (new line) in German and Chinese translation
The new line isn't in the original strings and are invalid character in the javascript files/ui
2015-11-06 15:37:23 +00:00
Wei Zhou
552c08f0b4 [UI] change alert to ui dialog in response of instance wizard 2015-11-06 13:49:32 +01:00
Wei Zhou
cb9bf44538 [UI] Network names are not being displayed in Infra » VRs » router » NICS 2015-11-06 11:05:12 +01:00
Wei Zhou
d76a47b9fd [UI] change the Icon for changing ACL's for a tier in a VPC 2015-11-06 11:05:10 +01:00
Wei Zhou
eccdf4f1fb [UI] Private Cloud VPC always shows 0 in Site-to-Site VPN, even when one is configured 2015-11-06 11:05:08 +01:00
Boris Schrijver
e5040b5cbd CLOUDSTACK-9040: Use Tomcat6 for Debian packages. 2015-11-05 20:16:11 +01:00
ramamurtis
fc0ed447e5 CLOUDSTACK-9038 - Infrastructure tab is slow because of synchronous API calls
Making parallel asynchronous calls to speed up the page.
2015-11-05 16:54:05 +05:30
Wei Zhou
0cdca3137f [UI] fix typo for user data field 2015-11-05 08:06:51 +01:00
Carles Figuerola
3ce420c367 CLOUDSTACK-9029: Proper support to identify CentOS 7 version number 2015-11-04 11:21:47 -06:00
Remi Bergsma
f948e96299 Merge pull request #1023 from ekholabs/fix/egress_state-CLOUDSTACK-8925
CLOUDSTACK-8925 - Default allow for Egress rules is not being configured properly in VR iptables rulesThis PR fixes the router default policy for egress. When the default is DENY, the router still allows outgoing connections.

The test component/test_routers_network_ops.py was improved to cover that case as well. The results were:

Test redundant router internals ... === TestName: test_01_isolate_network_FW_PF_default_routes_egress_true | Status : SUCCESS ===
ok
Test redundant router internals ... === TestName: test_02_isolate_network_FW_PF_default_routes_egress_false | Status : SUCCESS ===
ok
Test redundant router internals ... === TestName: test_01_RVR_Network_FW_PF_SSH_default_routes_egress_true | Status : SUCCESS ===
ok
Test redundant router internals ... === TestName: test_02_RVR_Network_FW_PF_SSH_default_routes_egress_false | Status : SUCCESS ===
ok

----------------------------------------------------------------------
Ran 4 tests in 3636.656s

OK
/tmp//MarvinLogs/test_routers_network_ops_QDL429/results.txt (END)

* pr/1023:
  CLOUDSTACK-8925 - Implement the default egress DENY/ALLOW properly
  CLOUDSTACK-8925 - Improve the default egress tests in order to cover newly entered rules
  CLOUDSTACK-8925 - Add egress dataset to test_data.py
  CLOUDSTACK-8925 - Drop the traffic when default egress is set to false

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-11-04 14:59:02 +01:00
Wilder Rodrigues
79dabfdae4 CLOUDSTACK-8925 - Implement the default egress DENY/ALLOW properly
- Make tests work with right IP and rules
   - Add egress rule for port 53 protocol UDP when testing default egress DENY on RVR
2015-11-04 13:48:04 +01:00
Remi Bergsma
ea70a1872f Merge pull request #1032 from milamberspace/L10N-update-updateMaster-20151104
Update de_DE Localization. Now Web UI 4.6 is fully translated in GermanLast update to have 100% on German in Web UI

Please 2 LGTM before the RC1!

Thanks @resmo

cc @remibergsma @DaanHoogland @karuturi

* pr/1032:
  Update de_DE Localization. Now Web UI 4.6 is fully translated in German

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-11-04 13:42:25 +01:00
Remi Bergsma
2af9611c20 Merge pull request #902 from sanju1010/simulator
CLOUDSTACK-8924: Enable dynamic scaling to run test_scale_vm.py test on simulatorSimulator setup uses the config file from following location:
tools/marvin/marvin/config/setup.cfg
Added global setting parameter "enable.dynamic.scale.vm" to above config file, so that dynamic scale vm tests can be run on simulator.

* pr/902:
  CLOUDSTACK-8924: Made changes based on the comments from @pvr9711

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-11-04 13:05:43 +01:00
Remi Bergsma
5f61041550 Merge pull request #1009 from rags22489664/master
CLOUDSTACK-9006 - ListTemplates API returns result in inconsistent order when called concurrentlyThe order of templates returned in the response is based on a field called sortkey and by default value for the field is set to 0.

With more than 1000 templates, we tried listing the templates with different page sizes concurrently, and we noticed the results being inconsistent.

Thus we added a secondary order by clause to list templates call on tempZonePair column to make sure the results are consistent.

The addOrderby method of Filter class was also not appending , if we added more orderby clauses.

* pr/1009:
  CLOUDSTACK-9006 - ListTemplates API returns result in inconsistent order when called concurrently
  CLOUDSTACK-9006 - ListTemplates API returns result in inconsistent order when called concurrently

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-11-04 11:48:08 +01:00
Remi Bergsma
2fd6fac214 Merge pull request #898 from bvbharatk/CLOUDSTACK-8902
CLOUDSTACK-8902 Restart Network fails in EIP/ELB zoneThe restart network was failing when using external loadbalencer. The failure was because of a number format exception. When BroadcastDomainType.getValue(guestConfig.getBroadcastUri() is executed this returns a string untagged. We were trying to parse this as long so there was a number pointer exception.

This happens only when the vlan uri is vlan://untagged. in other cases were there is a number instead of untagged (vlan tag) this used to succeed. Although we were trying to convert the number to long we were not really using it. we were converting the number to long and then back to string when creating the IpAddressTo. so I removed this unnecessary conversion in this case for fixing the issue at hand.

I did a manual restart of the network and checked for this number format exception in a EIP/ELB setup.

* pr/898:
  CLOUDSTACK-89027 Restart Network fails in EIP/ELB zone

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-11-04 11:37:51 +01:00
Remi Bergsma
6f2e6a7fac Merge pull request #1028 from michaelandersen/fix/vpc_vpn
smoke/test_vpc_vpn: Add template wait & refactor- Added a wait for template download as the test was failing in some environments
- Removed debug timer in setup and teardown
- Increased time.sleep before ssh connection from 10 to 20 seconds
- PEP8
- Changed required_hardware tag to true

* pr/1028:
  smoke/test_vpc_vpn: Add template wait & refactor

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-11-04 11:27:58 +01:00
Milamber
54e77df5bb Update de_DE Localization. Now Web UI 4.6 is fully translated in German 2015-11-04 09:52:06 +00:00
Michael Andersen
c883853892 smoke/test_vpc_vpn: Add template wait & refactor
PEP8

Changed hardware tag to true
2015-11-04 07:45:10 +01:00
ramamurtis
9d1a469ae5 CLOUDSTACK-9006 - ListTemplates API returns result in inconsistent order when called concurrently
Adding filter test to verify addOrderBy method.
2015-11-04 10:31:02 +05:30
Remi Bergsma
0ba871b127 Merge pull request #1024 from shapeblue/CLOUDSTACK-9019-master
[4.6/master] CLOUDSTACK-9019: Add storage network offering in ssvm only if storage network is defined

During creation of SSVM, checks and adds NetworkOffering.SystemStorageNetwork to
offerings only if storage network exists for the target datacenter.

(Manually tested)

* pr/1024:
  CLOUDSTACK-9019: Add storage network offering in ssvm only if storage network is defined

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-11-03 21:30:52 +01:00
Wilder Rodrigues
ad4fbcd577 CLOUDSTACK-8925 - Improve the default egress tests in order to cover newly entered rules 2015-11-03 13:59:17 +01:00
Wilder Rodrigues
334daef78f CLOUDSTACK-8925 - Add egress dataset to test_data.py 2015-11-03 13:58:36 +01:00
Rajani Karuturi
0c62c611dd Merge pull request #1026 from ekholabs/fix/test_ssvm-CLOUDSTACK-9021
CLOUDSTACK-9021 - Add right interface when test is executed against HyperV/VMwareThe test now check the IP taking into account the right interface for VMware/HyperV (eth1).

@karuturi could you please have a look? Unfortunately, I do not have HyperV/VMware test environment.

* pr/1026:
  CLOUDSTACK-9021 - Add right interface when test is executed against HyperV/VMware

Signed-off-by: Rajani Karuturi <rajani.karuturi@citrix.com>
2015-11-03 17:35:32 +05:30
Wilder Rodrigues
86d1b9632c CLOUDSTACK-9021 - Add right interface when test is executed against HyperV/VMware 2015-11-03 11:18:11 +01:00
Rohit Yadav
8922707076 CLOUDSTACK-9019: Add storage network offering in ssvm only if storage network is defined
During creation of SSVM, checks and adds NetworkOffering.SystemStorageNetwork to
offerings only if storage network exists for the target datacenter

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-11-03 13:47:23 +05:30
Wilder Rodrigues
caa0b4071c CLOUDSTACK-8925 - Drop the traffic when default egress is set to false
- The DROP rule should be appended and the other rules inserted.
2015-11-02 21:45:03 +01:00