Commit Graph

29860 Commits

Author SHA1 Message Date
Daan Hoogland 1bc837837f CWE-190 netmask as long form cidr-size as method 2015-11-16 18:25:32 +01:00
Daan Hoogland 3ae4dd06f3 CID-1116482 cidrToLong cleanup of bitshift problem
and some trivial testing
2015-11-16 18:25:32 +01:00
Daan Hoogland f9d5c6918c CID-1116483 cidr to netmask bitshifts guarded with casts
and simple test
2015-11-16 18:25:32 +01:00
Daan Hoogland 2fadfe93dc CID-1116484 cast to long and use long as cidrsize type
and simpel test
2015-11-16 18:25:32 +01:00
Daan Hoogland 637afb9b67 CID-1116485: cast cidr during bit shifting
and simple test included
2015-11-16 18:25:31 +01:00
Daan Hoogland b5625c05d0 CID-1175714 casts before bit shift 2015-11-16 18:25:31 +01:00
Daan Hoogland c669c93b05 CLOUDSTACK-9046 rename enums to adhere to naming conventions 2015-11-16 13:41:16 +00:00
Daan Hoogland 962d4b4afe CLOUDSTACK-9046 renamed enums in kvm plugin 2015-11-16 13:41:14 +00:00
Daan Hoogland 586c325167 CLOUDSTACK-9047 use 'State's only with context
there are more types called 'State'
  (or to be called so but now 'state')
  So remove imports and prepend their enclosing class/context to them.
2015-11-16 13:41:12 +00:00
Wei Zhou 66fc7c62f4 CLOUDSTACK-9055: fix NPE in updating Redundant State of VPC networks 2015-11-16 11:46:26 +01:00
Daan Hoogland d6e77624d9 CLOUDSTACK-9057 remove old system vm upgrade code 2015-11-16 10:46:02 +00:00
Rajani Karuturi 9ed8151169 Fixed version number in build/replace.properties 2015-11-16 15:56:59 +05:30
Rajani Karuturi 17219dfe79 Merge release branch 4.6 to master
* 4.6:
  more poms didn't get updated with script
  implemented upgrade path from 4.6.0 to 4.6.1
  checkstyle pom didn't get updated with script
  debian: add 4.6.1-snapshot to changelog
  Updating pom.xml version numbers for release 4.6.1-SNAPSHOT
  Updating pom.xml version numbers for release 4.6.0
2015-11-16 15:43:08 +05:30
Wei Zhou 89ce8bd9e2 CLOUDSTACK-8958: throw an exception if project account cannot be found 2015-11-16 10:17:50 +01:00
Wei Zhou 37301ed454 CLOUDSTACK-8958: add dedicated ips to domain (account for now) 2015-11-16 10:17:40 +01:00
Remi Bergsma ea7c2d95b2 Merge pull request #1068 from remibergsma/460_470_upgrade_path
Make master 4.7.0-SNAPSHOT and implement upgrade paths towards itThis bumps all pom.xml versions to 4.7.0-SNAPSHOT. It also implements upgrade paths from 4.6.0 and the upcoming 4.6.1 (branch 4.6 is now on 4.6.1-SNAPSHOT) towards 4.7.0.

I will be doing some upgrade tests, will post back results soon.

* pr/1068:
  Add 4.7.0-SNAPSHOT to Debian changelog
  implement upgrade paths from 4.6.0/4.6.1 to 4.7.0
  Updating pom.xml version numbers for release 4.7.0-SNAPSHOT

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-11-16 08:46:13 +01:00
Remi Bergsma 704cbe0ec6 Add 4.7.0-SNAPSHOT to Debian changelog 2015-11-15 21:41:03 +01:00
Remi Bergsma f6db0a2a49 Merge pull request #1067 from remibergsma/460_461_upgrade_path
implement upgrade path from 4.6.0 to 4.6.1The 4.6 branch needs an upgrade path to 4.6.1. I looked at how this was done before and think this will do. Can you give it a second pair of eyes please @DaanHoogland ?

When this is indeed OK, I'll do the same for master for the 4.6.0 -> 4.7.0 path.

I've tried a build and that works: `mvn clean install`
```
[INFO] ------------------------------------------------------------------------
[INFO] BUILD SUCCESS
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 07:33 min
[INFO] Finished at: 2015-11-15T13:45:58+01:00
[INFO] Final Memory: 120M/1591M
[INFO] ------------------------------------------------------------------------
```

Once this is a PR, I'll try an actual upgrade from 4.6.0 to 4.6.1-SNAPSHOT.

* pr/1067:
  implemented upgrade path from 4.6.0 to 4.6.1

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-11-15 21:09:35 +01:00
Remi Bergsma 33fb5efd0c more poms didn't get updated with script 2015-11-15 21:07:45 +01:00
Remi Bergsma 6536992671 implement upgrade paths from 4.6.0/4.6.1 to 4.7.0 2015-11-15 19:11:50 +01:00
Remi Bergsma 1f53f2a93e Updating pom.xml version numbers for release 4.7.0-SNAPSHOT
Signed-off-by: Remi Bergsma <github@remi.nl>
2015-11-15 18:54:13 +01:00
Remi Bergsma e0ac9df529 implemented upgrade path from 4.6.0 to 4.6.1 2015-11-15 14:43:22 +01:00
Remi Bergsma a0c00c0676 checkstyle pom didn't get updated with script 2015-11-15 13:41:17 +01:00
Remi Bergsma d041de0243 debian: add 4.6.1-snapshot to changelog 2015-11-15 08:36:13 +01:00
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
wenwenxiong 3fb23012f8 update for comment in cancelMaintin on start VR
change comment 
//if the instance is of type ssvm, call the ssvm manager
to
//if the instance is of type domain router vm, call the network manager
2015-11-13 18:10:14 +08:00
Wilder Rodrigues 952d9a84d2 CLOUDSTACK-9015 - Add test to cover the rVPC routers stop/start/reboot scenario
- Stop/reboot master router should make the backup router become master
   - Start the stopped router should make be the backup router
2015-11-12 18:32:53 +01:00
Wilder Rodrigues cd05a252fb CLOUDSTACK-9015 - Make sure the Backup router can talk to the Master router after a stop/start/reboot
- Stop KeepaliveD/ConntrackD if the eth2 (guest) interface is not configured and UP
   - Only setup the redundancy after all the router configuration is done
   - Open the FW for the VRRP communitation
     - 224.0.0.18 and 225.0.0.50
   - Set keepalived.conf.templ by default to use interface eth2 (guest)
     - It will be reconfigured anyway, but having eth2 there is more clear
2015-11-12 18:13:51 +01:00
dsclose 8a7deefe64 CLOUDSTACK-9058
Respond with "saved_password" if no password is to be issued.
2015-11-12 08:05:57 +00:00
Remi Bergsma e31ade03c6 Updating pom.xml version numbers for release 4.6.0
Signed-off-by: Remi Bergsma <github@remi.nl>
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
Carles Figuerola 2f5a40065c CLOUDSTACK-9048: Fix typo for public network description 2015-11-09 11:18:44 -06: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