20a747601c
CLOUDSTACK-1331: Upgrade fails for a 2.2.14 Zone having multiple guest networks using network_tags and Public Vlan
...
Changes:
-We need to update the physical_network_id for public vlans.
-Physical network ID should be retrieved from the network if present.
2013-02-20 11:25:36 -08:00
7ce22fc2b2
db: Fix commas which should be dots in create-schema, fix debug msg
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
(cherry picked from commit 44c8a33cf2
2013-02-20 14:57:05 +05:30
12b439baa6
db: Fix Upgrade40to41 and add cleaning path schema-40to410-cleanup.sql
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
(cherry picked from commit 46ab973143
2013-02-20 14:52:37 +05:30
2c102ca0e5
db: Fix upgrade paths to 4.1.0
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
(cherry picked from commit ca432fe6b7
2013-02-19 14:02:48 +05:30
f95b0edaff
CLOUDSTACK-1181: Fix NPE, ignore if default path is not readable, we're passing props file anyway
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
(cherry picked from commit 7c003611d0
2013-02-07 11:10:37 +05:30
1b2b369ecb
Merge latest master into javelin
2013-01-31 11:34:49 -08:00
b6727e5646
CLOUDSTACK-299: Egress firewall rules feature for guest network on VR
2013-01-31 11:20:47 +05:30
176523254e
Improve component lifecycle management with system run-level concept
2013-01-30 15:21:02 -08:00
2c5859dbd4
Bring javelin back to the status of being able to start System VMs after another round of master branch merge
2013-01-18 19:15:32 -08:00
64f13e1cd8
DatabaseCreator: Fast forward merge due to recent pull in merge of master
2013-01-18 18:16:04 -08:00
03a3837d92
DatabaseCreator: Make it reinit db, add flags, opts, run scripts and upgrade checkers
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-18 18:09:04 -08:00
10d9c019a9
All merge conflicts resolved
2013-01-18 12:14:57 -08:00
b45cdef5d9
DatabaseCreator: Process db props, sql and upgrade classes separately
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-17 18:25:27 -08:00
ef07cde449
DBCreator: Fix ScriptRunner to strip comments, reformat code
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-17 16:10:07 -08:00
c7840cf91f
reverting the earlier commit 432ea9c7d4
...
done for bug CLOUDSTACK-265 due to IP clearence issues.
2013-01-16 15:10:27 +05:30
56e5fbdee2
removed import of componentlocator and inject from all files
2013-01-10 11:44:47 -08:00
30f2565d98
Merge branch 'api_refactoring' into javelin
2013-01-08 12:36:04 -08:00
259e6d5f74
Fix a few Spring bootstrap issues
2012-12-27 17:46:52 -08:00
057ac12d23
Enforce InternalIdentity interface on all VO classes that impls long getId()
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-26 15:09:44 -08:00
296b49c2f8
Merge branch 'master' into test-merge-api
...
Conflicts:
api/src/com/cloud/agent/api/BackupSnapshotCommand.java
api/src/com/cloud/agent/api/storage/PrimaryStorageDownloadCommand.java
api/src/com/cloud/agent/api/to/PortForwardingRuleTO.java
api/src/com/cloud/network/NetworkService.java
api/src/com/cloud/resource/ResourceService.java
api/src/org/apache/cloudstack/api/ApiConstants.java
api/src/org/apache/cloudstack/api/ResponseGenerator.java
api/src/org/apache/cloudstack/api/response/SSHKeyPairResponse.java
client/tomcatconf/commands.properties.in
core/src/com/cloud/storage/SnapshotVO.java
pom.xml
server/src/com/cloud/api/ApiDispatcher.java
server/src/com/cloud/api/ApiResponseHelper.java
server/src/com/cloud/api/ApiServer.java
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/rules/RulesManagerImpl.java
server/src/com/cloud/offerings/NetworkOfferingVO.java
server/src/com/cloud/resource/ResourceManagerImpl.java
server/src/com/cloud/upgrade/dao/Upgrade40to41.java
server/src/com/cloud/vm/UserVmManagerImpl.java
server/test/com/cloud/vpc/MockNetworkManagerImpl.java
setup/db/create-schema.sql
setup/db/db/schema-40to410.sql
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-23 13:54:46 -08:00
3ae5986b87
Update DB version during DB deploy
...
1. Modified create-schema.sql to add version as 4.1.0 instead of 4.0.0
2. Removed schema-40to41.sql amd moved the content to schema-40to410.sql
3. Added to schema-40to410.sql Upgrade40to41.java
Conflicts:
server/src/com/cloud/upgrade/dao/Upgrade40to41.java
setup/db/create-schema.sql
setup/db/db/schema-40to41.sql
setup/db/db/schema-40to410.sql
Signed-off-by: Min Chen <min.chen@citrix.com>
2012-12-21 15:11:05 -08:00
8acc85ca53
Update DB version during DB deploy
...
1. Modified create-schema.sql to add version as 4.1.0 instead of 4.0.0
2. Removed schema-40to41.sql amd moved the content to schema-40to410.sql
3. Added to schema-40to410.sql Upgrade40to41.java
2012-12-21 15:27:00 +05:30
e4dbc2033f
Add upgrade script from 4.0 to 4.1.
...
Signed-off-by: Min Chen <min.chen@citrix.com>
2012-12-20 18:18:06 -08:00
432ea9c7d4
CLOUDSTACK-265: provide option to turn-off automatic public IP association for each VM when using EIP service.
...
- introduces Capability in the network offering, which
decides when EIP service is enabled, by defualt public IP
should be assigned to the VM or not
- default network offering with EIP/ELB service will still work with old EIP
semantics, i.e) assign a public IP to each VM on start
2012-12-11 23:06:13 +05:30
57c9b4c6b1
Figured out how to add annotations to jackson
2012-12-07 15:21:22 -08:00
550f4fbcdc
create template/primary data store is done
2012-11-20 18:57:19 -08:00
f25a78111f
CLOUDSTACK-493: 22x-30 upgrade for Advance SG enabled zone
...
* enable SG provider if the zone is SG enabled
* don't create public traffic type for the zone if there is no public network exist in the zone in 2.2.x
2012-11-16 10:00:45 -08:00
aab02e2743
Add Spring annotation to major components
2012-11-07 14:53:39 -08:00
772f660c33
Changed the create database steps to be create from a single create-schema.sql and then apply database modifications
2012-11-01 13:40:15 -07:00
a388a748d0
Added a database creator class. not working yet. Edison will look at it
2012-10-25 17:34:54 -07:00
5fee891162
merge from master
2012-10-11 17:42:25 -07:00
b7a93be47e
Added license header to Upgrade40to41.java
2012-10-02 13:06:59 -04:00
93aaa5f975
Provide an (for now) empty upgrade path so the server will start.
2012-10-01 14:07:24 -07:00
387c6fc135
Merge branch 'master' into javelin
2012-09-17 15:31:37 -07:00
ff81fda4e0
adding missing import that should have been part of commit b28749f2b1
2012-09-17 13:18:32 +05:30
b28749f2b1
upgrade external devices support from 2.2.14 to network offering framework
2012-09-17 11:39:41 +05:30
06b7d80fec
latest changes
2012-09-13 11:31:54 -07:00
39a676c496
Correct license header mainly for patches folder
...
Signed-off-by: Chip Childers <chip.childers@gmail.com>
I've assumed that Gavin's commit is appropriate, based
on an assumption that we will keep these files in the source
tree. If https://issues.apache.org/jira/browse/LEGAL-146
results in a different opionion from the members, then we
will end up having to do something more drastic anyway.
2012-08-31 10:50:46 -04:00
ff7c964a66
Add ability to do jetty:run in eclipse
2012-08-28 09:16:44 -07:00
aec6b4af48
[ASFCS40]Upgrade to 4.0: host_details unique key addition needs IGNORE keyword to correct the duplicates
2012-08-23 17:52:04 -07:00
0b31a0af62
[ASFCS40]304 -> 305 DB upgrade merge to 302-> 4.0
2012-08-21 16:27:57 -07:00
4bffd71d71
[ASFCS40]Db upgrade: merging changes from 303->304 upgrade to 3.0.2 -> 4.0 on master branch.
2012-08-21 16:27:54 -07:00
cd0004bb86
CS-16111 - DB upgrade; fixed foreign keys names
2012-08-21 15:38:17 -07:00
4433c5a51a
Database upgrade from 302 to 40
2012-08-13 16:20:09 -07:00
237d91d4c9
Removed @author tags in some classes
2012-08-03 14:25:17 -07:00
e7a1862867
VPC: CS-15827 - register only VpcVirtualNetworkApplianceMgr
...
Conflicts:
api/src/com/cloud/api/BaseCmd.java
api/src/com/cloud/network/VpcVirtualNetworkApplianceService.java
plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
server/src/com/cloud/configuration/DefaultComponentLibrary.java
server/src/com/cloud/ha/UserVmDomRInvestigator.java
2012-08-03 14:23:45 -07:00
a39fd61249
Merge branch 'master' into vpc
...
Conflicts:
server/src/com/cloud/network/rules/RulesManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
server/src/com/cloud/vm/VirtualMachineGuru.java
2012-07-27 13:47:46 -07:00
2a95258fe9
setup: Add database upgrade for 3.0.3 to 4.0
...
Also added a upgrade path from 3.X.X to 4.0, this should work.
2012-07-27 18:06:38 +02:00
6d15ba85d3
Removed Citrix license header.
2012-07-26 23:04:18 -04:00
a6086dc806
Removed @author tag from bunch of resources
2012-07-06 17:25:36 -07:00
Prachi Damle
Rohit Yadav
Kelven Yang
Jayapal
Alex Huang
Murali Reddy
Kishan Kavala
Min Chen
Edison Su
Alena Prokharchyk
Kelven Yang
Chip Childers
Hugo Trippaers
Gavin Lee
Darren Shepherd
Wido den Hollander