113 Commits

Author SHA1 Message Date
John Burwell
8d11511b1f Adds support for four position versions and optional db upgrades
Often, patch and security releases do not require schema migrations or
data migrations.  However, if an empty upgrade class and associated
scripts are not defined, the upgrade process will break.  With this
change, if a release does not have an upgrade, a noop DbUpgrade is added
to the upgrade path.  This approach allows the upgrade to proceed and
for the database to properly reflect the installed version.  This change
should make the release process simpler as RMs no longer need to
rememeber to create this boilerplate code when starting a new release.

Beginning with the 4.8.2.0 and 4.9.1.0 releases, the project will
formally adopt a four (4) position release number to properly accomodate
rekeases that contain only CVE fixes.  The DatabaseUpgradeChecker and
Version classes made assumptions that they would always parse and
compare three (3) position version numbers.  This change adds the
CloudStackVersion value object that supports both three (3) and four (4)
version numbers.   It encapsulates version comparsion logic, as well as,
the rules to allow three (3) and four (4) to interoperate.

  * Modifies DatabaseUpgradeChecker to handle derive an upgrade path for
  a version that was not explicitly specified.  It determines the
  releases the first release before it with database migrations and uses
  that list as the basis for the list for version being calculated.  A
  noop upgrade is then added to the list which causes no schema changes
  or data migrations, but will update the database to the version.
  * Adds unit tests for the upgrade path calculation logic in
  DatabaseUpgradeChecker
  * Removes dummy upgrade logic for the 4.8.2.0 introduced in previous
  versions of this patch
  * Introduces the CloudStackVersion value object which parses and
  compares three (3) and four (4) position version numbers.  This class
  is intended to replace com.cloud.maint.Version.
  * Adds the junit-dataprovider dependency -- allowing test data to be
  concisely generated separately from the execution of a test case.
  Used extensively in the CloudStackVersionTest.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2016-08-30 13:32:32 +05:30
Will Stevens
740bd45be6 Updating pom.xml version numbers for release 4.8.2-SNAPSHOT
Signed-off-by: Will Stevens <williamstevens@gmail.com>
2016-08-15 10:31:09 -04:00
Will Stevens
a63db21d16 Updating pom.xml version numbers for release 4.8.1
Signed-off-by: Will Stevens <williamstevens@gmail.com>
2016-08-08 10:06:21 -04:00
Remi Bergsma
32fcc47117 Updating pom.xml version numbers for release 4.8.1-SNAPSHOT
Signed-off-by: Remi Bergsma <github@remi.nl>
2016-01-26 09:39:00 +01:00
Remi Bergsma
62f218b7bd Updating pom.xml version numbers for release 4.8.0
Signed-off-by: Remi Bergsma <github@remi.nl>
2016-01-20 23:43:35 +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
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
Rafael da Fonseca
1958a8e9c1 Cleanup awsapi leftovers
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

This closes #328
2015-05-29 19:15:51 +02:00
Hugo Trippaers
4ebaf0a583 Bump master version to 4.6.0-SNAPSHOT after branching 4.5.0-SNAPSHOT 2014-10-29 14:54:23 +01:00
Santhosh Edukulla
7cf33f96aa Fixed few loggers according to new changes 2014-08-14 00:25:53 +05:30
Rohit Yadav
b157104563 devcloud: user insert on duplicate update in devcloud.sql
This commit modifies insert statements to use the insert on duplicate update
syntax to update configuration table name, values in case primary key already
exists

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-08-04 22:47:25 +02:00
Hugo Trippaers
99b7cc80ec Add provisioning_type to the devcloud offerings. 2014-06-25 15:51:29 +02:00
Tim Mackey
a8212d9ef4 Cleanup of Xen and XenServer terms. Cloned xen plugin creating a xenserver plugin, then removed xen plugin
Signed-off-by: Tim Mackey <tmackey@gmail.com>
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
2014-06-07 04:50:23 -04:00
Sachchidanand Vaidya
537536835b - Created new devcloud advanced networking config file (devcloud-advanced_juniper-contrail.cfg). - Modification to deployDataCenter script, to enable "JuniperContrailRouter" & "JuniperContrailVpcRouter" providers.
Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-05-01 13:10:12 +02:00
Hugo Trippaers
4402685e11 Update master to 4.5.0-SNAPSHOT 2014-03-14 14:55:26 +01:00
Hugo Trippaers
ac00ab0087 Cleanup all mysql dependencies and set all to provided. 2014-02-21 14:55:11 +01:00
Santhosh Edukulla
6b70a6db94 CLOUDSTACK-5413: Fixed bug CLOUDSTACK-5413 2013-12-09 19:45:22 +05:30
Hugo Trippaers
cf715ff491 Bump 4.3.0 to 4.4.0 in master 2013-11-21 16:01:15 +01:00
John Kinsella
45e4d4fc3b Summary: Updated sudoers approved commands for cloud user
Detail: Previously the cloud user has full password-less sudo access.
This commit changes that to only allow access to a specific list of
commands. Been tested in production on ACS 4.0 and 4.2 mangement servers.

BUG-ID: CLOUDSTACK-967
Bugfix-for:
Reviewed-by:
Reported-by:
Signed-off-by: John Kinsella <jlk@stratosec.co> 1382560936 -0700
2013-10-23 13:42:16 -07:00
Wei Zhou
567a05d18a CLOUDSTACK-4726: complete secondary storage configuration in devcloud-advanced.cfg and devcloud-advancedsg.cfg
(cherry picked from commit 9d00a6da654bcf12ed2ad67b23efc0032abe858c)
2013-09-23 11:10:33 +02:00
Hugo Trippaers
15a97ec412 Cleanup pom.xml in various projects to properly use managed versions and other defaults 2013-09-21 17:21:06 +08:00
Chip Childers
8225374138 Updating pom.xml version numbers for release 4.3.0-SNAPSHOT
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-08-01 10:35:00 -04:00
Min Chen
09f50ca506 Update marvin config to work for deployDataCenter.py. 2013-06-20 17:43:20 -07:00
Min Chen
18aeef3ef1 Merge branch 'master' (up to commit
c30d9be3cea30339cfff40c1002906634291b373) into object_store.
2013-06-12 11:20:32 -07:00
Shane Witbeck
5fa1ad518f fix for incorrect secondary dns 2013-06-05 17:21:44 -04:00
Wei Zhou
e6863c612b Integration test for advanced zone with security groups
Description:
This patch includes three parts for advancedsg:
(1) Marvin support.
(2) devcloud support.
(3) integration test scripts

Testing Done:
devcloud testing ok.

Signed-off-by: Anthony Xu <anthony.xu@citrix.com>
2013-05-22 15:39:22 -07:00
Min Chen
dafe2654b6 Fix default devcloud.cfg 2013-05-13 15:46:00 -07:00
Min Chen
0d580ccb26 Fix NPE in adding host and also put back lost change in deployDataCenter
due to rebase with master.
2013-05-11 22:00:40 -07:00
Alex Huang
342624e0eb Merged with head 2013-05-10 16:33:57 -07:00
Alex Huang
3047929367 Merged 2013-05-10 16:21:43 -07:00
Min Chen
f965e2d892 Download system template while adding S3 image store is working. 2013-05-09 21:49:12 -07:00
Min Chen
292e77b96b Fix marvin test to add S3 image store and cache storage. 2013-05-09 16:19:06 -07:00
Edison Su
4d992fd18f fix template download to primary storage 2013-05-01 17:51:24 -07:00
Min Chen
881165e5d3 Fix devcloud.cfg to work with new addImageStore api. 2013-04-30 17:44:16 -07:00
Chiradeep Vittal
271d232d62 QuickCloud: we moved the SecondaryStorageDiscoverer from the com.cloud package to the org.apache.cloudstack package
QuickCloud: fix license issue
QuickCloud: use a different activation for deploying quickcloud
Otherwise marvin gets invoked during mvn install -Dquickcloud
2013-04-09 14:45:27 -07:00
Chiradeep Vittal
5ff8bcaa2e QuickCloud: when using SSVM, pass in the new name of the SS class (com.cloud -> org.apache.cloudstack)
QuickCloud : configuration moved to applicationContext.xml from componentContext.xml
QuickCloud: default to enabled state for devcloud zone
QuickCloud: environment.properties helps customize location of pid file
2013-04-09 14:45:26 -07:00
Chiradeep Vittal
c5b11df6b7 QuickCloud: option to build with componentContext tailored for quickcloud
For now it replaces ConsoleProxyManagerImpl with StaticConsoleProxyManager
Usage: mvn install -Dquickcloud

QuickCloud: rename deploy profile

QuickCloud: remove cyclic dependency introduced in nonoss build by moving SecondaryStorageDiscoverer into services
However with this fix, developers will be unable to run 'PremiumSecondaryStorageResource' (for VMWare installations) using mvn exec:java.
Instead they will have to use the exploded archive from systemvm.zip
2013-04-09 14:45:26 -07:00
Chiradeep Vittal
a806ce43d3 QuickCloud: allow specification of network offering name in datacenter config. The deployDatacenter python script will use this to pick the network offering during creation of the default network in a basic zone 2013-04-09 14:45:26 -07:00
Chiradeep Vittal
e7983b25cc QuickCloud: Enable secondary storage daemon to run outside the system vm 2013-04-09 14:45:25 -07:00
Rohit Yadav
80d58b6c73 CLOUDSTACK-1317: Bump CloudStack package version to 4.2.0-SNAPSHOT in all poms
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-20 16:42:56 +05:30
Gavin Lee
07102fc8ab CLOUDSTACK-1318:Fix build devcloud issue 2013-02-19 23:22:16 +08:00
Prasanna Santhanam
a4510efc24 maven: parent pom of tools/* projects is tools/pom.xml
Fixes broken builds for tools

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-02-18 10:26:49 +05:30
Prasanna Santhanam
05437d0e97 maven pom: put apache cloudstack tools together in umbrella pom
minor pom refactor to put all the tools under one placeholder pom.
Also adds a profile for marvin to run deployDataCenter via mvn options.

$mvn -Pdeveloper,marvin -pl :cloud-marvin -Dmarvin.config=<path/to/config>

OR
$cd tools/marvin
$mvn -Pmarvin -pl :cloud-marvin -Dmarvin.config=path/to/config

will deploy the datacenter using the marvin.config property's value

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-02-15 20:53:41 +05:30
Rohit Yadav
733ec50d46 maven: don't use process-test-resources lifecycles, target are skipped if test are
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-12 12:17:25 +05:30
Chip Childers
ebe738ee20 CLOUDSTACK-1233: Fixed veewee config file legal documentation
The veewee configuration files used for the devcloud base-box build, as
well as the newly introduced files used to create a system vm, were
inappropriately identified as ASLv2 licensed and copyrighted by the ASF.

The fixes:
- The ASF headers stripped to match the source.
- The files are now excluded from RAT checks in the root pom.
- The tools/whisker/descriptor.xml file updated
- The root LICENSE and NOTICE were re-generated

Changes in the Apache Whisker templates for LICENSE and NOTICE files
caused a good bit of whitespace oddness in this commit for those 2
files.

Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-02-11 21:40:06 -05:00
Rohit Yadav
356866c72b Merge branch 'master' into javelin
- Fixed new join dao impls as spring components
- Fixed component context xml to load api rate limit checker
- Fixed root pom.xml for duplicate plugin
- Fixed list data centers method
- Fixed following conflicts:
	api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java
	api/src/org/apache/cloudstack/api/command/user/offering/ListServiceOfferingsCmd.java
	api/src/org/apache/cloudstack/api/command/user/template/DeleteTemplateCmd.java
	api/src/org/apache/cloudstack/api/command/user/template/ExtractTemplateCmd.java
	plugins/api/discovery/src/org/apache/cloudstack/discovery/ApiDiscoveryServiceImpl.java
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/api/query/QueryManagerImpl.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/swift/SwiftManagerImpl.java

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-24 19:18:53 -08:00
Rohit Yadav
7b11b71d81 maven: create dependency, deploydb on developer first and then on devcloud
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
(cherry picked from commit afb27700120fed84cd5fd8cb81c5adf503ebe888)

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-22 16:32:57 -08:00
Rohit Yadav
1a695b84b4 tools: Fix devcloud artifact name, avoid confusion
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-22 16:32:51 -08:00
Rohit Yadav
afb2770012 maven: create dependency, deploydb on developer first and then on devcloud
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-22 16:30:35 -08:00
Rohit Yadav
a736f6b44f tools: Fix devcloud artifact name, avoid confusion
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-22 16:19:45 -08:00