Commit Graph

29124 Commits

Author SHA1 Message Date
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 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
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
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
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
Daan Hoogland 2478414d47 Merge pull request #1196 from SudharmaJain/cs-9127
CLOUDSTACK-9127 Missing PV-bootloader-args for "SUSE Linux Enterprise Server 10 SP2 and SP3"

ISSUE
--------
STOP-START of SUSE Linux VMs fail, as PV-bootloader-args are missing during the start command.
DESCRIPTION
----------------------
Repro steps
1. Upload Suse ISO
2. Create a VM with this ISO, and install it.
3. Detach ISO from the VM.
4. Reboot the VM, :>>>> This will work fine, as the pv-bootloader-args are not missing during reboot.
5.Stop the VM from CCP(VM will get destroyed in Xencenter)
6. Start the same VM from CCP , it will try to start but will fail.

Before Applying the fix
--------------------------------
Before applying the starting the VM failed with following exception
com.cloud.utils.exception.CloudRuntimeException: Unable to start VM(i-2-6-VM) on host(7cfd6388-b763-4c09-b3a3-9679db2904a3) due to Task failed! Task record:                 uuid: 21a6799f-9523-7c0e-bb86-1de750a38d74
           nameLabel: Async.VM.start_on
     nameDescription:
   allowedOperations: []
   currentOperations: {}
             created: Wed Dec 09 07:00:29 UTC 2015
            finished: Wed Dec 09 07:00:31 UTC 2015
              status: failure
          residentOn: com.xensource.xenapi.Host@513d238c
            progress: 1.0
                type: <none/>
              result:
           errorInfo: [BOOTLOADER_FAILED, OpaqueRef:0b10b6ac-837d-29af-da9d-6ef1e11a064a, Unable to find partition containing kernel
]
         otherConfig: {}
           subtaskOf: com.xensource.xenapi.Task@aaf13f6f
            subtasks: []

![image](https://cloud.githubusercontent.com/assets/12229259/11678758/bd0fc9aa-9e70-11e5-9687-c77bfecaa4dd.png)

After Applying the fix
--------------------------
After applying the fix I am able to start the vm.
![image](https://cloud.githubusercontent.com/assets/12229259/11678938/6d44f5b0-9e72-11e5-83b0-60a736408b4d.png)

* pr/1196:
  CLOUDSTACK-9127 Missing PV-bootloader-args for "SUSE Linux Enterprise Server 10 SP2 and SP3"

Signed-off-by: Daan Hoogland <daan@onecht.net>
2015-12-14 11:39:32 +01:00
Maneesha.P 626052128b CLOUDSTACK-9103 : Missing OS Mappings for VMware 6.0 2015-12-14 15:30:46 +05:30
SudharmaJain 9ae3c0a5a9 CLOUDSTACK-9127 Missing PV-bootloader-args for "SUSE Linux Enterprise Server 10 SP2 and SP3"
Added Unit test for the new method
2015-12-14 11:26:45 +05:30
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