29434 Commits

Author SHA1 Message Date
Michael Andersen
230c9cf59e FIX S2S VPN rVPC: Check only redundant routers in state MASTER 2016-01-12 11:24:35 +01:00
Michael Andersen
ecc8cc0bc9 PEP8 of integration/smoke/test_vpc_vpn 2016-01-12 11:24:35 +01:00
Michael Andersen
a42b04695f Add S2S VPN test for Redundant VPC 2016-01-12 11:24:34 +01:00
Michael Andersen
fd83ca00e3 Make integration/smoke/test_vpc_vpn Hypervisor independant 2016-01-12 11:24:34 +01:00
Michael Andersen
dfa924bdee FIX VPN: non-working ipsec commands 2016-01-12 11:24:34 +01:00
Remi Bergsma
867be4145d CLOUDSTACK-9222 Prevent cloud.log.1 filling up the disk
Delay Compress results in more space usage than needed. Since we have copy truncate we don't need it.
2016-01-11 21:09:08 +01:00
Remi Bergsma
b1034ed624 Merge release branch 4.7 to master
* 4.7:
  CLOUDSTACK-9220 Sort list of domains on Domain tab in UI
  Admin cannot see VMs on port forwarding page
  Fix mariadb related listCapacity bug (CLOUDSTACK-8966)
  CLOUDSTACK-9213 - Split the ACL rules using comma instead of dash.
  CLOUDSTACK-9213 - Formatting the code
2016-01-11 16:22:31 +01:00
Remi Bergsma
4014169ccb Merge pull request #1324 from bheuvel/testprofiler-second
Factor in inaccurancy of System.nanoTime in class ProfilerThe time diff measurement by the class Profiler, is done by System.nanoTime().
System.nanoTime() is not 100% accurate (lots of info on this on the web). The inaccurance seems to vary/depend with different dependencies (multi-core/OS/kernels).

Problem:
In my case the code which measures `Thread.sleep(ONE_SECOND);` ~~takes~~ measures 999 milliseconds, which breaks the test expecting the sleep of 1000 milliseconds to ~~take~~ measure at least 1000 milliseconds.

Solution:
A `MARGIN` (of 100 milliseconds) is already present to factor in some time for overhead/surrounding code which adds time. Another margin could be added to factor in the possible time measurement error.
To limit additional lines of code, the constant `ONE_SECOND`, which is used by the testcase (sleep), is increased from 1000 milliseconds to `1000l + (MARGIN / 10)` (effectively 1010 milliseconds).

Thereby the inaccurancy on my system of ~1% ("faster") is caught as the `sleep(1010)` is measured as '1009' milliseconds.

* pr/1324:
  Factor in inaccurancy of System.nanoTime

Signed-off-by: Remi Bergsma <github@remi.nl>
2016-01-11 16:20:51 +01:00
Remi Bergsma
80703ca33c Merge pull request #1325 from remibergsma/vpc_ui_fix_47
CLOUDSTACK-9221 Allow admin to see user VMs on port forwarding pageOn commit a902443708ee10acb9f68fff74af346a6a9fb370 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.

* pr/1325:
  Admin cannot see VMs on port forwarding page

Signed-off-by: Remi Bergsma <github@remi.nl>
2016-01-11 16:19:46 +01:00
Remi Bergsma
4b974c599b Merge pull request #1327 from remibergsma/47_sort_domain_list_ui
CLOUDSTACK-9220 Sort list of domains on Domain tab in UIThe list of domains was unsorted and that annoyed me so I sorted it :-)

* pr/1327:
  CLOUDSTACK-9220 Sort list of domains on Domain tab in UI

Signed-off-by: Remi Bergsma <github@remi.nl>
2016-01-11 16:18:33 +01:00
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
2a9927a559 Merge pull request #1315 from pavanb018/master
Automation for CLOUDSTACK-9214 , detect wrong GW or NMAutomation for CLOUDSTACK-9214

This script automates the validation of  network address or broadcast address given for gateway or wrong netmask is given during network creation,

* pr/1315:
  Automation for CLOUDSTACK-9214 , detect wrong GW or NM

Signed-off-by: Remi Bergsma <github@remi.nl>
2016-01-10 13:27:25 +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 a902443708ee10acb9f68fff74af346a6a9fb370 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
Bob
dbb10a4ed5 Factor in inaccurancy of System.nanoTime 2016-01-08 13:31:27 +01:00
Nitin Kumar Maharana
ba0503d000 CLOUDSTACK-8847: ListServiceOfferings is returning incompatible tagged offerings when called with VM id
Fixed the subset and superset issue.
Added unit test for the same.
2016-01-08 14:17:57 +05:30
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
pavanb018
792e49366b Automation for CLOUDSTACK-9214 , detect wrong GW or NM 2016-01-07 10:47:28 +05:30
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
Remi Bergsma
1bb8b8a66e Merge pull request #1312 from shapeblue/revert-holiday-monkey
README: revert back to the normal cloudstack logocc @remibergsma
Based on https://github.com/apache/cloudstack/pull/1281#issuecomment-169275052

* pr/1312:
  README: revert back to the normal cloudstack logo

Signed-off-by: Remi Bergsma <github@remi.nl>
2016-01-06 17:43:45 +01:00
Rohit Yadav
293eb36f4d README: revert back to the normal cloudstack logo
Holidays are over :(

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2016-01-06 17:21:05 +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
Wido den Hollander
239148c31b CLOUDSTACK-9210: Pass secondary IPs to default_network_rules() function
This is a mandatory argument but it was NOT passed which caused the
re-programming of security groups to fail.

Simple fix to just add the argument since the variable is available
there.
2016-01-05 18:06:34 +01:00
Remi Bergsma
ee2ccc4d41 Merge release branch 4.7 to master
* 4.7:
  QuotaStatementTest: fix the method invocation verification
2016-01-05 15:27:06 +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 1f209ff226a24979cf3a43ce0c02e05c84dd4dc2
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
Remi Bergsma
67b753c11b Merge pull request #1094 from nvazquez/sharedNiciraNVP
CLOUDSTACK-9074: Support shared networking in NiciraNVP PluginJIRA TICKET:
https://issues.apache.org/jira/browse/CLOUDSTACK-9074

Design Document:
https://cwiki.apache.org/confluence/display/CLOUDSTACK/Support+shared+networking+in+NiciraNVP+Plugin

* pr/1094:
  CLOUDSTACK-9074: Move sql to 4.8.0 schema
  CLOUDSTACK-9074: Add NetworkGuruAdditionalFunctions license
  Use NSX specific config values instead of zone config values
  Fix method call bugs when accessign non defined variables
  Use helper method to migrate router vm
  Add helper method to migrate router vms
  Only set L2 Gateway in NSX device if defined
  CLOUDSTACK-9074: Marvin tests for NSX Shared Networks Support
  CLOUDSTACK-9074: Drop nicira_nvp_router_map unique index on logicalrouter_uuid
  CLOUDSTACK-9074: API add Gateway Service Find method
  CLOUDSTACK-9074: Support Shared Networks in NiciraNVP Plugin
  CLOUDSTACK-9074: New NiciraNVP classes for FindLRouterPort and DeleteLRouterPort API methods
  CLOUDSTACK-9074: New NiciraNVP classes to support Shared Networks
  CLOUDSTACK-9074: API Changes: Add nsxLogicalSwitch and nsxLogicalSwitchPort to listNics
  CLOUDSTACK-9074: API Changes: Add l2gatewayserviceuuid to NVP devices

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-12-28 11:21:56 +01:00
nvazquez
de23c94f33 CLOUDSTACK-9074: Move sql to 4.8.0 schema 2015-12-24 16:12:01 -03:00
nvazquez
0b20ed4074 CLOUDSTACK-9074: Add NetworkGuruAdditionalFunctions license 2015-12-24 16:07:06 -03:00
Miguel Ferreira
c285d6cfb4 Use NSX specific config values instead of zone config values 2015-12-24 16:07:06 -03:00