Commit Graph

29860 Commits

Author SHA1 Message Date
Miguel Ferreira acdc42cb48 Fix method call bugs when accessign non defined variables 2015-12-24 16:07:06 -03:00
Miguel Ferreira f804c9756d Use helper method to migrate router vm 2015-12-24 16:07:06 -03:00
Miguel Ferreira 3dba689f31 Add helper method to migrate router vms 2015-12-24 16:07:06 -03:00
Miguel Ferreira 88774a93e8 Only set L2 Gateway in NSX device if defined 2015-12-24 16:07:06 -03:00
nvazquez 4ac2737754 CLOUDSTACK-9074: Marvin tests for NSX Shared Networks Support 2015-12-24 16:07:06 -03:00
nvazquez 07264204f5 CLOUDSTACK-9074: Drop nicira_nvp_router_map unique index on logicalrouter_uuid 2015-12-24 16:07:06 -03:00
nvazquez eb889c0c49 CLOUDSTACK-9074: API add Gateway Service Find method 2015-12-24 16:07:06 -03:00
nvazquez c67637180f CLOUDSTACK-9074: Support Shared Networks in NiciraNVP Plugin 2015-12-24 16:07:06 -03:00
nvazquez 55f460772e CLOUDSTACK-9074: New NiciraNVP classes for FindLRouterPort and DeleteLRouterPort API methods 2015-12-24 16:07:06 -03:00
nvazquez 06d5b46e53 CLOUDSTACK-9074: New NiciraNVP classes to support Shared Networks 2015-12-24 16:07:06 -03:00
nvazquez 8149081658 CLOUDSTACK-9074: API Changes: Add nsxLogicalSwitch and nsxLogicalSwitchPort to listNics 2015-12-24 16:07:06 -03:00
nvazquez 46f9fbabdf CLOUDSTACK-9074: API Changes: Add l2gatewayserviceuuid to NVP devices 2015-12-24 16:07:06 -03:00
Rohit Yadav 60f006569b Merge pull request #1281 from shapeblue/happy-holidays15
README: happy holidays!Happy holidays, let's merge this asap
cc @remibergsma @DaanHoogland @wido @wilderrodrigues @abhinandanprateek @jburwell @borisroman @miguelaferreira @runseb @milamberspace @ke4qqq @karuturi @mlsorensen @mike-tutkowski @NuxRo @pdion891 @resmo @pyr and others

* pr/1281:
  README: happy holidays!

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-12-24 10:18:26 +05:30
Rohit Yadav 1a194e6745 README: happy holidays!
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-12-23 13:27:40 +05:30
Anshul Gangwar 149f6c0514 CLOUDSTACK-9199: Fixed deployVirtualMachine API does not throw an error when cpunumber is specified for static compute offering 2015-12-23 12:12:44 +05:30
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
Anshul Gangwar cbbec6f8e2 CLOUDSTACK-9196: Fixing null pointer exception when vm meta data is synced on
upgraded setup.
2015-12-22 16:39:22 +05:30
Koushik Das a6f9181ee1 CLOUDSTACK-9195: Cancelled/failed async jobs not getting cleaned up from DB
Setting 'job_complete_msid' field in async_job table when marking job as cancelled during MS restart.
This will ensure that the job is cleaned up as part of GC thread.
2015-12-22 13:53:29 +05:30
Anshul Gangwar e985db9057 CLOUDSTACK-9194: Making the console popup window resizable in IE to make sure the focus is not lost. 2015-12-22 11:23:46 +05:30
Remi Bergsma 7e12ebf280 Merge pull request #1268 from remibergsma/480_version
Set version 4.8.0-SNAPSHOT in master branch- setnextversion.sh
- upgrade path to `4.8.0` via `4.7.0` -> `4.7.1` as this is the one set in `4.7` branch. Then we also have the next minor release of `4.7` covered.

Build succeeds:
```
[INFO] ------------------------------------------------------------------------
[INFO] BUILD SUCCESS
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 10:07 min
[INFO] Finished at: 2015-12-21T22:45:41+01:00
[INFO] Final Memory: 124M/1609M
[INFO] ------------------------------------------------------------------------
```

Will run upgrade test soon and post results.

* pr/1268:
  Implement upgrade path 4.7.1 -> 4.8.0
  Update Debian changelog
  Updating pom.xml version numbers for release 4.8.0-SNAPSHOT

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-12-21 23:08:57 +01:00
Remi Bergsma 18fb10439b Implement upgrade path 4.7.1 -> 4.8.0 2015-12-21 23:02:43 +01:00
Remi Bergsma 117635fb19 Update Debian changelog 2015-12-21 22:12:21 +01:00
Remi Bergsma 8f5a2920e8 Updating pom.xml version numbers for release 4.8.0-SNAPSHOT
Signed-off-by: Remi Bergsma <github@remi.nl>
2015-12-21 22:09:31 +01:00
Remi Bergsma 9537f5d32b Merge release branch '4.7' into master
* 4.7:
  Debian changelog updated
  Implement upgrade path 4.7.0 -> 4.7.1
  Updating pom.xml version numbers for release 4.7.1-SNAPSHOT
  Implement upgrade path 4.6.2 -> 4.6.3
  Updating pom.xml version numbers for release 4.6.3-SNAPSHOT
2015-12-21 21:57:52 +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 7147f4af72 Initial merge of release branch '4.7'
* 4.7:
  Updating pom.xml version numbers for release 4.7.0

Merge made with the 'ours' strategy.
2015-12-21 19:33:06 +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
cirstofolini 935113fbd3 Removed unnecessary code from getGuestOsType in CitrixResourceBase 2015-12-20 15:08:44 -02:00
pedro-martins 5d3adb3a2d Removed unused variables from class NetworkStateListener 2015-12-19 15:54:26 -02:00
Abhinandan Prateek 983dee7f20 CLOUDSTACK-9174: A deleted account results in NPE
When an account is deleted from cloudstack for which quota is still
being calculated and if the quota reaches minimum threshold then
quota service will try to alert the user. This results in NPE and is
fixed by excluding such accounts from alerting and other quota related
mechanisms.

Quota service: Fix check for admin account
2015-12-18 08:52:16 +05:30
Suresh Kumar Anaparti 2d5f6a7911 CLOUDSTACK-9185: [VMware DRS] VM sync failed with exception due to out-of-band changes
Summary: The target "ClusteredVirtualMachineManagerImpl.HandlePowerStateReport" invoked during the VM power state sync is not found as HandlePowerStateReport was not implemented in ClusteredVirtualMachineManagerImpl and was private in VirtualMachineManagerImpl, which was resulting in InvocationTargetException. Changed HandlePowerStateReport() in VirtualMachineManagerImpl to protected.
2015-12-17 10:59:38 +05:30
Koushik Das de8942644d CLOUDSTACK-9180: Optimize concurrent VM deployment operation on same network
Check if VR needs to be allocated for a given network and only acquire lock if required
2015-12-16 17:53:03 +05:30
Abhinandan Prateek ccd0f22061 CLOUDSTACK-9161: fix the quota marvin test
1. Create a dummy user, as existing user may already have stale quota
  data
  2. fix the tests to use the dummy user
  3. a boundary condition was revealed and fixed for a new user where
  quota service has never run and created bootstrap entries

Quota Marvin: If the quota plugin is not enabled skip tests

Quota Service: Enable quota plugin in zone setup configuration

Quota: Moving test_quota.py the test to test/integration/plugins
    In most automated environment this test case will not run as it
    requires a mangement server restart to enable the plugin. Due to
    this requirement moving it to plugin folder. This condition is
    already documented in the test case.
2015-12-16 16:22:31 +05:30
Daan Hoogland 94a14485f7 license 2015-12-14 17:39:06 +01:00
Boris Schrijver a00fef8c33 Revert "Merge pull request #1243 from SudharmaJain/cs-9166"
This reverts commit 8d2e031a89, reversing
changes made to 1b3a792b12.

No 2x LGTM where given to this PR.
2015-12-14 16:49:11 +01:00
Daan Hoogland 8d2e031a89 Merge pull request #1243 from SudharmaJain/cs-9166
CLOUDSTACK-9166:Build failed in Jenkins: cloudstack-rat-master #7038With my last PR#1196, I missed to place the license disclaimer into CitrixHelperTest.java. Updated the file with the disclaimer.

* pr/1243:
  CLOUDSTACK-9166:Build failed in Jenkins: cloudstack-rat-master #7038

Signed-off-by: Daan Hoogland <daan@onecht.net>
2015-12-14 12:51:03 +01:00
Daan Hoogland 1b3a792b12 Merge pull request #1216 from maneesha-p/BUG-9103
CLOUDSTACK-9103 : Missing OS Mappings for VMware 6.0Added suitable db entries in tables hypervisor_capabilities and guest_os_hypervisor to support VMware 6.0 by copying from 5.5 and excluding few depricated guest os.And also added entries for guest os RHEL 7 for vmware 5.5 and 6.0.

* pr/1216:
  CLOUDSTACK-9103 : Missing OS Mappings for VMware 6.0

Signed-off-by: Daan Hoogland <daan@onecht.net>
2015-12-14 12:49:55 +01:00
SudharmaJain 601f2dba24 CLOUDSTACK-9166:Build failed in Jenkins: cloudstack-rat-master #7038 2015-12-14 17:13:54 +05:30