Commit Graph

29174 Commits

Author SHA1 Message Date
Boris Schrijver de11b7307c Add integration test for restartVPC with cleanup, and Private Gateway enabled. 2016-01-11 16:02:32 +01:00
Boris Schrijver 78fbaf7d4d Nullpointer Exception in NicProfileHelperImpl 2016-01-11 09:57:35 +01:00
Remi Bergsma 93bbc1afb7 CLOUDSTACK-9220 Sort list of domains on Domain tab in UI 2016-01-09 21:02:38 +01:00
Remi Bergsma f186181910 Admin cannot see VMs on port forwarding page
On commir a902443708 the 'listAll=true'
is removed. On some places the domainid and accountid are added but not
on these. I added them now.

It's either doing this, or readding listAll is true. I've seeing other
folks doing that so let's see what performs best.
2016-01-08 22:00:01 +01:00
Remi Bergsma 456d854480 Merge pull request #1314 from lttmtins/4.7-CLOUDSTACK-8966
Fix mariadb related listCapacity bug (CLOUDSTACK-8966)type bigint(20) with type  varchar does not work well on MariaDB
So forcing it to type decimal

* pr/1314:
  Fix mariadb related listCapacity bug (CLOUDSTACK-8966)

Signed-off-by: Remi Bergsma <github@remi.nl>
2016-01-08 20:10:31 +01:00
Nitin Kumar Maharana 55f8b32aa0 CLOUDSTACK-9132: API createVolume takes empty string for name parameter
Added conditions to check if the name is empty or blank.
If it is empty or blank, then it generates a random name.
Made the name field as optional in UI as well as in API.
Added required unit tests.
2016-01-08 13:41:41 +05:30
Michael Andersen 9b9272c019 [UI] MADNESS 2016-01-07 19:27:51 +01:00
Michael Andersen 74f670dc3c [DB] Add force_encap field to s2s_customer_gateway table 2016-01-07 19:27:43 +01:00
Michael Andersen 21acc95d57 [ROUTER] Add forceencaps field to python router ipsec config method 2016-01-07 19:27:42 +01:00
Michael Andersen 4a08dbe235 [TEST] unittest needs rework 2016-01-07 19:27:42 +01:00
Michael Andersen 0b54871fa3 [MARVIN] Add forceencap field to VpnCustomerGateway class in marvin base 2016-01-07 19:27:42 +01:00
Michael Andersen 6da3bc1237 [CORE] Add Force UDP Encapsulation option to Site2Site VPN 2016-01-07 19:27:37 +01:00
Remi Bergsma 3ee53d3f53 Merge pull request #1311 from ekholabs/fix/4.7-acl-cidrs-CLOUDSTACK-9213
CLOUDSTACK-9213 - As a user I want to be able to use multiple ip's/cidrs in an ACLThis PR fixes a problem with iptables when creating ACL items using a comma separated value list of CIDRs. Please refer to the details in the Jira issue.

* pr/1311:
  CLOUDSTACK-9213 - Split the ACL rules using comma instead of dash.
  CLOUDSTACK-9213 - Formatting the code

Signed-off-by: Remi Bergsma <github@remi.nl>
2016-01-07 12:07:43 +01:00
Anton Opgenoort 65d39d0346 Fix mariadb related listCapacity bug (CLOUDSTACK-8966)
type bigint(20) with type  varchar does not work well on MariaDB
So forcing it to type decimal
2016-01-07 10:21:13 +01:00
Nitin Kumar Maharana 9014cd3101 CLOUDSTACK-9186: Root admin cannot see VPC created by Domain admin user
Added the parameter listAll=true in case of Internal LB as well as Public LB IP addresses.
2016-01-06 23:53:07 +05:30
Nitin Kumar Maharana 116b2b691f CLOUDSTACK-9192: UpdateVpnCustomerGateway is failing
The response name was wrong so corrected it.
Added the error function.
2016-01-06 23:49:41 +05:30
Wilder Rodrigues 94c0dc5dfe CLOUDSTACK-9213 - Split the ACL rules using comma instead of dash.
- The router code no longer deals with parsing the ALC list again. It's not necessary if it's sent in the proper way.
2016-01-06 09:48:53 +01:00
Wilder Rodrigues 61f3706255 CLOUDSTACK-9213 - Formatting the code 2016-01-06 09:48:32 +01:00
Remi Bergsma d6815742b8 Merge pull request #1306 from shapeblue/4.7-quota-test
4.7 quota testQuotaStatementTest: fix the method invocation verification

* pr/1306:
  QuotaStatementTest: fix the method invocation verification

Signed-off-by: Remi Bergsma <github@remi.nl>
2016-01-05 15:24:47 +01:00
Abhinandan Prateek 0eac900fc4 QuotaStatementTest: fix the method invocation verification 2016-01-05 11:04:33 +05:30
Remi Bergsma 2c07ce590d CLOUDSTACK-6485 prevent ip asignment of private gw iface
Prevent ipaddress asignment of gateway to gateway-interface on vpc router by setting vpcid to null in network

Was fixed in 4.4 by 1f209ff226
Reimplemented for 4.7
2015-12-31 14:22:52 +01:00
Remi Bergsma 779f4b36e0 CLOUDSTACK-9204 Do not error when staticroute is already gone
When deleting fails because it isn't there any morei (KeyError), it should succeed instead.
2015-12-31 14:11:06 +01:00
Remi Bergsma 8fb677027d make both check lines consistent
No need to make a variable, use it on one place and hardcode it on another.
2015-12-28 17:06:58 +01:00
Remi Bergsma 525949e027 CLOUDSTACK-9181 Prevent syntax error in checkrouter.sh 2015-12-28 17:06:43 +01:00
Miguel Ferreira 47a23c22c1 Implement CheckHealthCommand for NSX controllers 2015-12-28 15:56:25 +01:00
Miguel Ferreira 13f1ed7f14 Fix log message that refers to agent, not host 2015-12-28 15:56:25 +01:00
Miguel Ferreira 1cc610f617 Prevent NullPointerException when host does not belong to a pod
NSX controllers are hosts that do not belong in a Pod.
When investigators kick-in an exception is thrown because of the
missing pod foreign key.
2015-12-28 15:56:25 +01:00
Remi Bergsma 1c5e899a2d CLOUDSTACK-9202 Bump ssh timeout
It seems the VR needs more time for some of its commands. Until we figured
out the root cause, this allows the VRs to start again.
2015-12-28 15:54:26 +01:00
Wilder Rodrigues 5ef3144fdf CLOUDSTACK-9154 - Sets the pub interface down when all guest nets are gone
- Refactors the set_backup, set_master and set_fault methods to have better names for the variable
   - Increase the sleep on the test in order to wait for the routers to be ready. It's now 3 times the GC settings
2015-12-22 14:52:08 +01:00
Wilder Rodrigues f5a6dee8dd CLOUDSTACK-9187 - Makes code ready for more something like ethXXXX, if we ever get that far
- Adds log info to NetworkOrchestrator in order to make the work of the Net-Scavenger more visible.
2015-12-22 14:52:07 +01:00
Wilder Rodrigues 2aab4c142d CLOUDSTACK-9188 - Reads network GC interval and wait from configDao 2015-12-22 14:52:07 +01:00
Wilder Rodrigues c99d6f18c9 CLOUDSTACK-9187 - Fixes interface allocation to VRRP instances 2015-12-22 14:52:06 +01:00
Wilder Rodrigues b1e4210682 CLOUDSTACK-9187 - Adds test to cover multiple nics and nic removal 2015-12-22 14:52:06 +01:00
Wilder Rodrigues 749ac2e224 CLOUDSTACK-9154 - Adds test to cover nics state after GC 2015-12-22 14:52:05 +01:00
Wilder Rodrigues 7988f51ac0 CLOUDSTACK-9154 - Returns the guest iterface that is marked as added
- Force a restart of keepalived if conntrackd is not running or configuration has changed
2015-12-22 14:52:05 +01:00
Remi Bergsma 9be76b350f Merge pull request #1267 from remibergsma/471_version
Set version 4.7.1-SNAPSHOT in 4.7 branch- setnextversion.sh
- upgrade path

Build succeeds:
```
[INFO] ------------------------------------------------------------------------
[INFO] BUILD SUCCESS
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 10:04 min
[INFO] Finished at: 2015-12-21T20:37:29+01:00
[INFO] Final Memory: 126M/1635M
[INFO] ------------------------------------------------------------------------
```

* pr/1267:
  Debian changelog updated
  Implement upgrade path 4.7.0 -> 4.7.1
  Updating pom.xml version numbers for release 4.7.1-SNAPSHOT

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-12-21 21:56:02 +01:00
Remi Bergsma 0779362f0e Debian changelog updated 2015-12-21 21:29:31 +01:00
Remi Bergsma 04c759390b Implement upgrade path 4.7.0 -> 4.7.1 2015-12-21 20:25:54 +01:00
Remi Bergsma 5b112408c7 Updating pom.xml version numbers for release 4.7.1-SNAPSHOT
Signed-off-by: Remi Bergsma <github@remi.nl>
2015-12-21 19:55:04 +01:00
Remi Bergsma e213fa50be Merge release branch '4.6' into 4.7
* 4.6:
  Implement upgrade path 4.6.2 -> 4.6.3
  Updating pom.xml version numbers for release 4.6.3-SNAPSHOT

Merge made with the 'ours' strategy.
2015-12-21 19:49:49 +01:00
Remi Bergsma 451ae2bab8 Merge pull request #1265 from remibergsma/463_version
Set version 4.6.3-SNAPSHOT in 4.6 branch- setnextversion.sh
- upgrade path

Build succeeds:
```
[INFO] ------------------------------------------------------------------------
[INFO] BUILD SUCCESS
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 08:44 min
[INFO] Finished at: 2015-12-21T14:13:29+01:00
[INFO] Final Memory: 123M/1578M
[INFO] ------------------------------------------------------------------------
```

Will try upgrade soon.

* pr/1265:
  Implement upgrade path 4.6.2 -> 4.6.3
  Updating pom.xml version numbers for release 4.6.3-SNAPSHOT

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-12-21 15:02:52 +01:00
Remi Bergsma 6646c7df61 Implement upgrade path 4.6.2 -> 4.6.3 2015-12-21 13:55:00 +01:00
Remi Bergsma 2b76f394c0 Updating pom.xml version numbers for release 4.6.3-SNAPSHOT
Signed-off-by: Remi Bergsma <github@remi.nl>
2015-12-21 13:53:54 +01:00
Remi Bergsma 2f26a859a9 Updating pom.xml version numbers for release 4.7.0
Signed-off-by: Remi Bergsma <github@remi.nl>
2015-12-13 21:09:53 +01:00
Remi Bergsma 7c83e1b240 Merge pull request #1205 from shapeblue/master-9126
QUOTA: Ensuring that the dates displayed are as per user expectations    When querying db we use start of next day to query quota usage for
    today, but while displaying it to user we still need to show it as
    todays date

* pr/1205:
  QUOTA: Ensuring that the dates displayed are as per user expectations

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-12-13 21:08:10 +01:00
Remi Bergsma c1533a1918 Merge pull request #1239 from remibergsma/fix-debian-changelog
build_asf.sh: fix debian changelog alteringThe script already adds a new entry so we shouldn't replace the
previous one. That is done only in the next version script.

As discussed with @DaanHoogland

* pr/1239:
  build_asf.sh: fix debian changelog altering

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-12-13 20:47:51 +01:00
Remi Bergsma 97b5e12704 build_asf.sh: fix debian changelog altering
The script already adds a new entry so we shouldn't replace the
previous one. That is done only in the next version script.
2015-12-13 20:41:56 +01:00
Remi Bergsma 7c9a8c1740 Merge pull request #1234 from shapeblue/master-9153
CLOUDSTACK-9153: When negative credits are added to an account theWhen negative credits are added to an account the balance credits can become negative for that account. This will fix will lock the account if quota is enforced.

* pr/1234:
  CLOUDSTACK-9153: When negative credits are added to an account the balance credits can become negative for that account. This will fix will lock the account if quota is enforced.

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-12-13 20:03:59 +01:00
Remi Bergsma 9862b2c780 Merge pull request #1217 from milamberspace/L10N-update-before-4.7.0RC1
L10N update before 4.7.0 RC1Some sentences (mainly for the new quota plugin) needs to be translated before the 4.7.0 release candidate (planned for 14th december)
https://www.transifex.com/ke4qqq/CloudStack_UI/47xmessagesproperties/

Stats:
German (Germany)            100%
French (France)             100%
Portuguese (Brazil)          98%
Norwegian Bokml (Norway)    98%
Dutch (Netherlands)          98%
Chinese (China)              97%
Japanese (Japan)             97%
Hungarian                    96%
(only languages over 90%)

Ping me after adding the L10N strings into transifex, I will update this PR.

Thanks

cc @remibergsma @agneya2001 @DaanHoogland @nvazquez @barunhalder1234 @K0zka

* pr/1217:
  Update L10N resource files with 4.7 strings from Transifex (20151211)

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-12-13 19:41:44 +01:00
Daan Hoogland 50c20dab17 Merge release branch 4.6 to master
* 4.6:
  CLOUDSTACK-9134: set device_id as the first device_id not in use instead of nic count
2015-12-13 19:04:22 +01:00