ff047e75d3
refactor snapshot, move existing snapshot code into its own snapshotstrategy
2013-02-21 11:22:49 -08:00
020be66f9d
add copy volume and create volume from snapshot
2013-02-21 11:22:49 -08:00
0b86b33c56
rebase to master
2013-02-21 11:22:48 -08:00
ec09e34f86
fix downloading template
2013-02-21 11:22:48 -08:00
a22403edcd
squash changes into one giant patch
2013-02-21 11:22:48 -08:00
6c01b62cdc
CLOUDSTACK-667: VM's base image update facility
2013-02-21 15:04:29 +05:30
7a3f072a50
CLOUDSTACK-745: Reset a VM on reboot. On every reboot of VM, the root disk state is reset. This is for the VMs created using service offering where an optional parameter isvolatile is set true.
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-02-21 14:59:35 +05:30
744c24ee68
CLOUDSTACK-1346: Check to see if external devices are used in the network, is hardcoded for specific devices
...
- Changes the check to list all providers of a network and check if it is an external provider
2013-02-20 15:37:27 -08:00
70ac773f69
CLOUDSTACK-1344 Typo in use.external.dns setting description
...
Fixed the typo.
2013-02-20 11:58:14 -08:00
ec1f48a4b2
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:23:32 -08:00
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
35b83b2adc
CLOUDSTACK-1317: In DatabaseUpgradeChecker, add upgrade path to 4.2.0
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-20 16:42:27 +05:30
817548bac1
IPv6: Add ipv6 for user vm view
2013-02-19 15:50:55 -08:00
da75e4ac8a
IPv6: Add IPv6 for domain router view
2013-02-19 15:50:23 -08:00
f2b97db0f9
CLOUDSTACK-1172: LDAP enhancements
2013-02-19 15:36:39 +05:30
c94a75c0a6
CLOUDSTACK-752: Removed 1 private gateway for VPC limitation.
...
Verified that more than 8 private gateways can be created.
2013-02-19 14:15:02 +05:30
ca432fe6b7
db: Fix upgrade paths to 4.1.0
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-19 13:36:21 +05:30
447b2d9c95
listroutercmd: response should be set to the name of router
...
host name of router returned instead of the name of the router.
correcting the setter.
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-02-19 13:22:21 +05:30
cc2a3c5498
CLOUDSTACK-651: Removed 7 nics limitation for VR on XenServer
...
# of nics can be configured using global param xen.nics.max. Param defaults to 7
Added new param to upgrade schema.
2013-02-18 20:30:03 +05:30
8094e933b0
ApiServer: Get rid of finding system account and user at init() time
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-16 17:09:37 +05:30
0e354473f7
db: Add stubs for Upgrade410to420, schema-410to420.sql and schema-410to420-cleanup.sql
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-16 13:31:58 +05:30
44c8a33cf2
db: Fix commas which should be dots in create-schema, fix debug msg
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-16 13:31:46 +05:30
46ab973143
db: Fix Upgrade40to41 and add cleaning path schema-40to410-cleanup.sql
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-16 12:28:00 +05:30
87b668b71b
CLOUDSTACK-863: Fix Non-printable characters in api call
...
Non-printable characters results in empty pages for all users loading the
corrupted object in the web interface. It also results in the API call results
getting truncated with an error when it encounters the non-printable characters.
Every decoded parameter value is checked for control character using OWASP's
ESAPI library.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-16 11:54:12 +05:30
a621048869
CLOUDSTACK-1307 Noticed NPE when we put host in maintenance mode in clustered management setup
...
Changes:
- Use of class variable of type GenericSearchBuilder causes issues when multiple threads invoke this method to findCapacity
- Changing the scope of the variable to be local to these methods.
2013-02-15 20:38:19 -08:00
5147fb16ac
CLOUDSTACK-1253: Remove @author tag.
2013-02-15 10:42:06 -08:00
3c764c0be7
CLOUDSTACK-1207. UpdateNetwork API fails with NPE if the network offering is not being updated and is non-persistent.
2013-02-15 17:18:43 +05:30
bc493bd39b
CLOUDSTACK-672: Set VMware cluster max. limit based on HV version
...
Max. number of hosts in a Vmware clueter is specific to the version of the HV. This limit is read from the hypervisor_capabilities table
2013-02-15 16:19:40 +05:30
bd4661e467
CLOUDSTACK-1137: force reconnect to a disconnected host throws error.
2013-02-14 17:57:41 -08:00
ca5c6d5d14
CLOUDSTACK-1219, CLOUDSTACK-1220: Fix IPv6 error messages
2013-02-14 16:28:29 -08:00
cf7ac9d6c4
CLOUDSTACK-1277: populating transit password field to UserVmJoinVO in
...
converting from UserVm to UserVmJoinVO.
2013-02-14 12:03:18 -08:00
f542c320d3
Removed a bunch of missing files and useless imports
2013-02-13 15:41:27 -08:00
d346f632c3
add missing file, fix build
2013-02-13 15:27:03 -08:00
8652e5f87e
Summary: Fix hanging references to /var/lib/cloud, changed to /var/cloudstack
...
BUG-ID: CLOUDSTACK-1201
BUG-ID: CLOUDSTACK-1196
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1360786749 -0700
2013-02-13 13:22:28 -07:00
9a12756ae4
CLOUDSTACK-684 support vm snapshot
2013-02-14 01:26:30 +08:00
2e2ee2f3ed
CLOUDSTACK-1088: EnableStaticNat error will clear the data in database
...
The issue occur in two conditions
(1) If I use two sessions or browsers to EnableStaticNat on CloudStack
UI. one is successful, the other is failed. However, there is no ip in
database.
(2) If I use API call EnableStaticNat several times The first time
succeed, the second failed, the third succeed. the result is
success-fail-success-fail-success-fail, which it is not correct.
Reported-by: Wei Zhou <w.zhou@leaseweb.com>
Reviewed-by: https://reviews.apache.org/r/9254/
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-02-13 18:43:42 +05:30
fcb4b7a6a7
CLOUDSTACK-1237: Fix an overriding method that would help find template adapter
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-13 15:19:30 +05:30
0a9af54c9f
rat: Fix license for ResourceLimitManagerImplTest.java
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-13 14:32:33 +05:30
ae2b673e03
Summary: fix cloud-agent KVM calls to cloudstack-agent for centos6.3
...
BUG-ID: CLOUDSTACK-1234
Bugfix-for: 4.1, master
Reported-by: Rayees Namathponnan
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1360736064 -0700
2013-02-12 23:16:22 -07:00
15e466c56d
Add missing break to applyRules in FirewallManager
...
Otherwise it would falling through PortForwarding rule.
Seems like a typo after network refactor.
2013-02-12 20:27:31 -08:00
2776ad14c8
CLOUDSTACK-1242: Fix inline mode
...
Network refactor dropped many inline mode codes. I've added at least part of
them back. Now I can create LB rule for inline mode.
2013-02-12 20:27:26 -08:00
c0442e2556
Fix a bug in register template, cannot find template adapter.
2013-02-12 16:56:02 -08:00
5828e526b3
CLOUDSTACK-713: Limit Resources(CPU and Memory) to domain/accounts
...
Addition of two new resource types i.e. CPU and Memory in the existing pool of
resource types.
Added some methods to set the limits on these resources using updateResourceLimit
API command and to get a count using updateResourceCount. Also added calls in the
Virtual machine life cycle to check these limits and to increment/decrement the new
resource types
Resource Name :: Resource type number
CPU 8
Memory 9
Also added Unit Tests for the same.
2013-02-12 12:02:07 -08:00
bd034e0b9f
CLOUDSTACK-1243: Add @Inject to fix NPE in AccountManagerImpl
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-12 17:58:17 +05:30
c809d057ef
CLOUDSTACK-1241: Network apply rules logic is broken
...
added logic to check if the network element is configured service
provider for the network before applying rules
2013-02-12 15:28:05 +05:30
6320cad9a1
Merge branch 'master' into vim51_win8
2013-02-11 15:47:08 -08:00
d9aa051953
Fix a typo
...
CanUseForDeploy() didn't return correct result due to this
2013-02-08 14:48:14 -08:00
0c5c08b78b
IPv6: CLOUDSTACK-1107: Add support for createVlanIpRange to extend existed network
2013-02-08 14:48:08 -08:00
1cf85aa87a
CLOUDSTACK-1216: insert UUID when we create "admin" user in DB.
2013-02-08 14:18:31 -08:00
6df0ff2596
fix build issue after revert
2013-02-08 12:30:12 -08:00
c0f2cf1e06
Revert "Revert "CLOUDSTACK-737""
...
This reverts commit dd67cfc5d0
2013-02-08 12:19:31 -08:00
b66f6c88f9
Revert "Revert "CLOUDSTACK-737""
...
This reverts commit 447d49ae91
2013-02-08 12:19:03 -08:00
27d1f3fa07
Revert "CLOUDSTACK-737"
...
This reverts commit 8a86d08fe3
2013-02-08 10:47:40 -08:00
a2fa167613
Revert " CLOUDSTACK-737"
...
This reverts commit 65210f4e7e
2013-02-08 10:47:08 -08:00
447d49ae91
Revert "CLOUDSTACK-737"
...
This reverts commit d7201dfe1f
2013-02-08 10:46:20 -08:00
dd67cfc5d0
Revert "CLOUDSTACK-737"
...
This reverts commit d7201dfe1f
2013-02-08 10:45:40 -08:00
0a6c6bb254
Revert "CLOUDSTACK-737"
...
This reverts commit d7201dfe1f
2013-02-08 10:42:36 -08:00
b4f3f92607
Revert " CLOUDSTACK-737,"
...
This reverts commit 95aef332cc
2013-02-08 10:29:53 -08:00
68c110cb18
CLOUDSTACK-1208: Failed to shutdown guest network
...
Firewall manager was being used instead of LoadBalancingRules manager
while applying the load balancer rules in shut down network. Changing it
to LoadBalancingRules manager.
2013-02-08 18:54:15 +05:30
b59a18d1a1
CLOUDSTACK-1210: Fix pluggable service, apiserver, mgmt server impl, api-discovery
...
- Mgmt server impl is a pluggable service, fix it's method
- Fix getCommands() to return all cmd api classes supported by this mgmt server
- For api-discovery, get commands from pluggable services only, don't use reflections
- Don't use reflections in ApiServer, iterate pluggableservices
- Fix api discovery unit test
- The fix was done automatically using following python program along with
following step:
1. Get all apis provided by default mgmt server, all of them are in cloud-api now
cd api/src/org/apache/cloudstack/api/command
find . >> apis
2. For all apis, generate java code that adds the class to the cmdList arraylist:
f = open('apis', 'r')
data = f.read()
f.close()
output = ""
for a in data.split('\n'):
output += "cmdList.add(%s);" % a.split('/')[-1].replace('.java', '.class')
# wrote output to a file, copied content to mgmt server impl's getCommands()
# similarly, fixed import statements using same code, splitting on /
Testing:
Ran apiserver, put breakpoints in ApiServer's init() where classes are processed
Total cmd classes found by reflections (ReflectUtil) = 354
Total cmd classes found by getCommands for all pluggable services = 354
Next, copied the comma separated values for each set to a string in ipython, a & b
set(a).difference(set(b)) returned null.
The above test implies both set of cmd classes found by both methods, i.e. using
reflections and using getCommands() had same set of apis and all were unique.
Conclusion:
The changes are idempotent and don't break api server's cmd class api discovery
processing.
BUG-ID: CLOUDSTACK-1210
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-08 16:48:13 +05:30
0b1e3a4af0
Move Api rate limit configurations from xml file to global
...
configuration, and also modify listCapabilitiesCmd to also return api
limit interval and max for UI consumption.
2013-02-08 00:02:25 -08:00
14ef9151a5
Fix ClassCastException.
2013-02-07 16:23:56 -08:00
951cba92bb
Merge branch 'sg-in-advanced-zone'
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
2013-02-07 15:19:41 -08:00
a71fb83c77
CLOUDSTACK-1178:DB Commit warning logged for every Deploy VM request
...
removing the regression that introduced premature transaction commit
2013-02-07 13:12:37 +05:30
13a4c0670e
CLOUDSTACK-1176 1) remove 'final' modifier from id attribute in SnapshotVO 2) make state setter method comply with convention
2013-02-07 13:41:49 +08:00
7c003611d0
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>
2013-02-07 11:09:56 +05:30
06acd9f0ea
IPv6: One network can have more than one vlan
2013-02-06 20:07:07 -08:00
3d1989c103
IPv6: CLOUDSTACK-1141: Fix reboot router with IPv6 assigned VM
2013-02-06 13:59:53 -08:00
c5185c09ef
Summary: Add missing ResizeVolumeCommand in VmwareResource.java
...
Submitted-by: hongtu_zang <hongtu_zang@tcloudcomputing.com>
Signed-off-by: Marcus Sorensen <marcus@betterservers.com>
2013-02-06 07:52:37 -07:00
dfcd9b05a0
ApiServer: Ask pluggable services to return list of apis to ApiServer
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-06 16:54:46 +05:30
8c5cd42b56
ManagementServerImpl: Fix NPE, PluggableService should not return null list
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-06 16:54:46 +05:30
fda8ec3c59
IPv6: CLOUDSTACK-1153: Fix integer overflow on IPv6 address calcuation
...
Use BigInteger, which is 128 bits long.
2013-02-05 17:41:37 -08:00
f89dd9050c
IPv6: CLOUDSTACK-1113: Fix the mechanism to find the usable IP in the IPv6
...
The new policy is:
1. Generate a random IP.
2. Find the next available IP, start from the generated IP.
3. If we cannot find an available IP after certain times(10000 by default,
network.ipv6.search.retry.max) retry, give up.
2013-02-05 14:31:12 -08:00
2e236a8322
IPv6: Fix ip address in range check
2013-02-05 14:31:06 -08:00
0ff6612f7f
CLOUDSTACK-446 : Host going to alert state, if you are adding already added host
...
Adding an already added host fails with error but in the process incorrectly updates the status of the host to 'Alert'. Put a check to prevent this.
2013-02-05 19:11:22 +05:30
0816a0bdea
CLOUDSTACK-1154: Added @Component annotation to RegionServiceImpl and RegionManagerImpl
2013-02-05 17:18:23 +05:30
fc0bf21a13
CLOUDSTACK-786, CLOUDSTACK-1014: Moved usage APIs to cloud-api. Removed ManagementServerExt. Usage API related implementation is added to UsageServiceImpl
2013-02-05 16:49:34 +05:30
2b267c1ceb
CLOUDSTACK-1142: Refactor handleRequest definition, clean redundant code
...
- Get rid of boolean decode arg
- Method assumes that OTW params have been already decoded
- Remove redundant code that tries to decode again based on boolean arg
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-05 10:37:09 +05:30
d8062e5633
CLOUDSTACK-1142 Testing LDAP Auth Failed - due to % being illegal character in queryfilter
2013-02-05 11:26:42 +08:00
8a86d08fe3
CLOUDSTACK-737
...
Security Group script assume there is only one nic per VM, it is a big task to support multiple NICs, may seperate that as another project
2013-02-04 17:09:06 -08:00
f8a22d7520
Fix the situation where only a gateway and a netmask is passed with the
...
createNetwork command.
2013-02-04 15:08:53 +01:00
6b3da5fbdc
CLOUDSTACK-1083: Include removed projects while listing usage records
2013-02-04 19:29:59 +05:30
0495f5309e
Remove yet another test where the database was not properly mocked. FIXME
2013-02-02 12:18:51 +01:00
296c20332d
Merge javelin into master
2013-02-01 14:40:45 -08:00
7b75f0d990
Sync master to javelin one more time
2013-02-01 11:37:33 -08:00
777147ce8a
CS-CLOUDSTACK-606:
...
The issue happens randomly when hosts in a cluster gets distributed across multiple MS. Host can get split in following scenarios:
a. Add host – MS on which add host is executed takes ownership of the host. So if 2 hosts belonging to same cluster are added from 2 different MS then cluster gets split
b. scanDirectAgentToLoad – This runs every 90 secs. and check if there are any hosts that needs to be reconnected. The current logic of host scan can also lead to a split
The idea is to fix (b) to ensure that hosts in a cluster are managed by same MS. For (a) only the entry in the database is going to be created except in case if the host getting added is first in the cluster (in this case agent creation happens at the same time) and then (b) will take care of connection and agent creation part. Since currently addHost only creates an entry in the db there is a small window where the host state will be shown as 'Alert' till the time (b) is scheduled and picks up the host to make a connection. The MS doing add host will immediately schedule a scan task and also send notification to peers to start the scan task.
2013-02-01 15:34:41 +05:30
13ee8d1865
Persistent Networks support
...
Signed-off-by: Murali Reddy <murali.reddy@citrix.com>
2013-02-01 15:10:06 +05:30
482ea4a71e
CLOUDSTACK-822: system.vm.password is not encrypted
...
Signed-off-by: Kishan Kavala <kishan@cloud.com>
2013-02-01 14:18:59 +05:30
fc925022bd
Upgrade changes for Region schema. Made region_id not null
2013-02-01 13:49:57 +05:30
519ca619df
Encode password using UserAuthenticator
2013-02-01 12:23:15 +05:30
4f53eb11f0
Merge branch 'master' into regions
2013-02-01 11:59:12 +05:30
1a348c85fd
adding apache license heders to the files that are faling RAT check
2013-02-01 11:41:30 +05:30
9ea90c3359
Merge branch 'master' into regions
...
Conflicts:
client/tomcatconf/components.xml.in
server/src/com/cloud/api/ApiResponseHelper.java
2013-02-01 11:38:16 +05:30
96c24930ae
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
2013-02-01 08:45:53 +05:30
c0b18c76f0
IPv6: Add missing license header
2013-01-31 17:26:46 -08:00
7bd8bec68a
Sync javelin with master up to 894cb8f7d9
2013-01-31 17:20:19 -08:00
65210f4e7e
CLOUDSTACK-737
...
support multiple NICs in Security group in java side
2013-01-31 15:45:52 -08:00
5cb9df91a1
Merge branch 'ipv6'
...
Conflicts:
api/src/com/cloud/network/NetworkProfile.java
2013-01-31 15:07:33 -08:00
44d1397d36
fix CS-1080
2013-01-31 13:04:36 -08:00
e7a554fc6a
Merging events framework branch into master. This commit will bring
...
following changes
- introduced notion of event bus with publish, subscribe, unsubscribe
semantics
- a plug-in can implement the EventBus abstraction to provide event
bug to CloudStack
- A rabbitMQ based plug-in that can interact with AMQP servers to
provide message broker based event-bug
- stream lines, action events, usage events, alerts publishing in to
convineance classed which are also used to publish corresponding
event on to event bus
- introduced notion of state change event. On a state change, in the
state machine corrsponding to the resource, a state change event is
published on the event bug
- associated a state machined with Snapshot and Network objects
- Virtual Machine, Volume, Snaphost, Network object state changes wil
result in a state change event
2013-02-01 01:37:24 +05:30
6a6d93c309
Fix a bug in listStoragePools api where SQL exception is thrown when a
...
parameter is passed.
2013-01-31 11:56:48 -08:00
1b2b369ecb
Merge latest master into javelin
2013-01-31 11:34:49 -08:00
a33d8f9601
Fixed listRegions serach by id, name
2013-01-31 23:25:29 +05:30
c607e03f0e
Merge branch 'master' into regions
2013-01-31 22:31:25 +05:30
e7341313e9
Added unit tests
2013-01-31 22:28:09 +05:30
c17c7007f4
Added RegionServiceImpl to DefaultComponentLibrary
2013-01-31 18:26:54 +05:30
1b922e816c
Revert "CS-15922 : to avoid race condition when expunge vm, expunge interval and expunge deplay should be larger than 600 second"
...
Reverted as per discussion at http://s.apache.org/NOm
This reverts commit 5060f98268
2013-01-31 18:15:41 +05:30
8b1a5b1de2
- Separated RegionServiceImpl and RegionManagerImpl
...
- Added comments
- Changed package name to org.apache.cloudstack.region
2013-01-31 18:08:20 +05:30
ed777bb7f3
IPv6: Check startipv6, endipv6 and ip6Gateway with ip range
2013-01-30 22:13:46 -08:00
b6727e5646
CLOUDSTACK-299: Egress firewall rules feature for guest network on VR
2013-01-31 11:20:47 +05:30
f57cbaacd6
IPv6: Fix VlanIpRangeResponse
2013-01-30 20:01:04 -08:00
f45576bce5
IPv6: Fix missed AddressFormat in nic table
2013-01-30 19:46:30 -08:00
4adc974ab7
IPv6: Disable untested features
2013-01-30 17:43:29 -08:00
d7ad2da7e0
server: Fix network refactor regressions for CLOUDSTACK-297
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-30 17:33:53 -08:00
b21595c10d
CLOUDSTACK-297: Reset SSH key to access VM
...
This feature provides resetting a SSH key for an existing VM which means,
setting the old ssh key that is assigned to the VM previously with the new ssh
key.
Signed-off-by: Harikrishna Patnala <harikrishna.patnala@citrix.com>
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-30 17:33:44 -08:00
ed547d91f7
IPv6: Rename public_ipv6_address to user_ipv6_address
2013-01-30 17:05:47 -08:00
15906c03ca
Summary: add/remove/update default nics feature
...
Description: Adds API calls updateDefaultNicForVirtualMachine,
addNicToVirtualMachine, and removeNicFromVirtualMachine. These are
intended to allow a user to modify a VM's configuration post
deployment, to adjust the networks to which the VM belongs.
BUG-ID: CLOUDSTACK-645
Submitted-by: Brian Angus <blangus@betterservers.com>
Submitted-by: Ryan Dietrich <ryan@betterservers.com>
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1359494800 -0700
2013-01-30 17:43:21 -07:00
99556a4f30
CLOUDSTACK-617: Unable to edit a sub-domain. Change UpdateDomain to be consistent with CreateDomain i.e. before this operation, while checking if the domain-name is unique, search under the parent domain instead of searching under the ROOT domain.
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-30 16:40:48 -08:00
85aa3a9977
Revert "api: Include cloudstack-version in both xml and json api response"
...
This reverts commit f8a483fc5a
2013-01-30 16:12:21 -08:00
176523254e
Improve component lifecycle management with system run-level concept
2013-01-30 15:21:02 -08:00
da2e6461a6
Remove temporary hacking and use Official way to wire-up servlet with injection under Spring
2013-01-30 15:21:01 -08:00
25ae2e4f3f
IPv6: Remove dualstack parameter from createNetworkCmd
...
We can tell if it's dual stack by looking into the startIp and startIpv6.
2013-01-30 13:35:47 -08:00
6b19086874
Fix a bug in listHosts that returns wrong zoneId for host.
2013-01-30 10:47:16 -08:00
301c4413bc
CLOUDSTACK-1054: When calling listDomains through the API do not restrict ADMIN users
...
When an admin calls this command without the ID parameter do not set the domain's ID
to the ID where the admin is in, this prevents him from doing lookups.
2013-01-30 15:48:01 +01:00
f9a68e7f15
IPv6: Add vlan overlap checking
2013-01-29 22:01:38 -08:00
b1972f6c11
IPv6: Update NetworkResponse and NicResponse
2013-01-29 22:01:31 -08:00
60fd29dacd
Add sync entry to region_sunc table on region api failure
2013-01-30 11:11:49 +05:30
0b62fc4c17
IPv6: Verify if requested IPv4/IPv6 addresses are valid
...
Also rename NetUtils.isValidIPv6() to NetUtils.isValidIpv6()
2013-01-29 19:08:09 -08:00
cb9f2d018d
IPv6: move assignPublicIp6Address() from NetworkManager to new Ipv6AddressManager
...
Don't want to involve IP address management code in NetworkManager.
2013-01-29 19:08:03 -08:00
1f7eaf3d61
CloudStack CLOUDSTACK-774
...
Supporting kickstart in CloudStack baremetal
merge baremetal feature to master
2013-01-29 17:19:57 -08:00
d3089ba2a5
Merge branch 'master' into regions
2013-01-29 11:50:49 +05:30
158ee8b2fa
Add sync entry to region_sunc table on region api failure
2013-01-29 11:49:23 +05:30
2cbca372bf
IPv6: Add support for IPv6 on DeployVMCmd
2013-01-28 18:54:34 -08:00
8887f01b37
CLOUDSTACK-1070: HypervisorTemplateAdapter needs to be configured with proper name
2013-01-28 17:12:41 -08:00
71835018e5
CLOUDSTACK-249: Add hostId to failed VM deploy alerts
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-28 15:27:09 -08:00
ea660cd06d
removed MockAPI server
2013-01-28 17:50:38 +05:30
def9fd1f2e
remove finduser, findaccount, finddomain APIs
2013-01-28 17:04:25 +05:30
fa00ddf07e
IPv6: Fix getIp6FromRange()
2013-01-27 19:07:44 -08:00
74811fa8b4
IPv6: Disable password and userdata service for ipv6 for now
...
Would add support later.
2013-01-26 23:14:48 -08:00
6169c1d724
IPv6: Enable IPv6 address for router
2013-01-26 23:14:21 -08:00
bd4bc025d1
IPv6: Accept IPv6 parameter for createNetworkCmd
...
Also ass public_ipv6_address for ipv6 address management.
Extend nics and vlans for ipv6 address.
Add dependency to com.googlecode.ipv6(java-ipv6).
Modify dhcpcommand for ipv6.
2013-01-26 23:14:15 -08:00
1450547987
Put usage server under Spring
2013-01-25 23:00:55 -08:00
767f54cc9a
Make nonoss build work under Spring
2013-01-25 17:18:36 -08:00
fc7d07305f
Fix a bug in listHosts that returns wrong zoneId for host.(cherry picked from commit 17c419ceb4)
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-25 14:21:41 -08:00
17c419ceb4
Fix a bug in listHosts that returns wrong zoneId for host.
2013-01-25 14:18:25 -08:00
e9bca76a32
set local storage as up
2013-01-25 13:07:36 -08:00
c6ae19d12f
Merge branch 'master' into regions
2013-01-25 18:49:47 +05:30
de20cb6c1a
Apply API refactoring changes. Make changes to Regions API to work with new code
2013-01-25 18:45:01 +05:30
1f57d925eb
Apply API refactoring changes. Make changes to Regions API to work with new code
2013-01-25 18:41:59 +05:30
df5c4c3048
Fixing VPC unit test to use Spring
2013-01-24 23:05:31 -08:00
f56b96ad19
merge: Fast forward merge branch 'javelin'
...
FF merge commit due to recent merge of master and then Edison's commit.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-24 19:30:28 -08:00
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
6f5655cb03
generalize storage orchestration: DataObjectManager will handle all the object life cycle management
2013-01-24 18:30:08 -08:00
f8e5740c31
A workaround to injection problems in servlets (ConsoleProxyServlet and RegisterCompletionServlet) classes
2013-01-24 18:04:48 -08:00
d7201dfe1f
CLOUDSTACK-737
...
add xenserver support in UI
only XenServer and KVM clusters are allowed in security enabled zone.
only shared security enabled networks are allowed in security enabled zone.
2013-01-24 17:26:51 -08:00
b6f780fa33
Fix StoragePool unit testcase.
2013-01-24 16:11:35 -08:00
f85ac65645
Fix Snapshot unit testcase.
2013-01-24 16:05:03 -08:00
e5b23e387d
AccountManagerImpl: Fix method to check and return systemuser, spring injection failsafe
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-24 15:41:04 -08:00
753b884044
spring: Fix component annotation for VolumeDaoImpl and CfgServerImpl
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-24 15:40:40 -08:00
1567a112fa
unit test works again
2013-01-24 14:36:44 -08:00
057097d0e0
Planner should set the pool information in the destination for volumes that are not yet ready.
2013-01-23 17:31:00 -08:00
45a92ba369
Fix the initialization of management server
2013-01-23 15:29:41 -08:00
a7fd74f94a
ApiDispatcher: Fix uuid->id translation and throw better debug statement
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-23 14:57:41 -08:00
b335684ec5
EntityManager: Implement method to search by uuid including removed entities
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-23 14:57:41 -08:00
7a927e36f0
ReflectUtil: Use collections to grow list and not manual array memory management
...
Fix usage in ApiDispatcher. Add two kinds of helpers:
- One that gets list of exclude cmd whose fields are not be included
- One that loops till a base class is asssignable from superclass
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-23 14:57:41 -08:00
a8623bacd7
ApiXmlDocWriter: Fix multiple field occurence in apidocs by using set
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-23 14:57:41 -08:00
95aef332cc
CLOUDSTACK-737,
...
allow to add security group enabled networks in security group enabled zone
2013-01-23 11:08:24 -08:00
485761f0b4
Fix a bug for listZones and listServiceOfferings for normal user, caused
...
by a misuse of SearchCriteria class.
2013-01-23 10:17:08 -08:00
1e40551cd5
Disabled test 'com.cloud.network.vpn.RemoteAccessVpnTest' as it requires
...
a database connection which we don't have during unittest phase.
2013-01-23 08:46:53 +01:00
c3f1a9d324
CLOUDSTACK-355: fix count for listSwiftsCmd.
2013-01-22 17:14:44 -08:00
e5bf16b00f
Fixing error with merge
2013-01-22 16:44:28 -08:00
26be5ce2df
CLOUDSTACK-355: create DB view for ZoneResponse to fix count for
...
listZonesByCmd.
2013-01-22 16:39:45 -08:00
aa7b3e0f6d
Renaming VmInstanceVO: dataCenterIdToDeployIn to dataCenterId
...
Corresponding getter/setter is renamed too.
Reason is GenericDao does not update the field unless the method name matches the field name; the setter of this VO was one such case.
2013-01-22 12:56:39 -08:00
434c21a149
Fixing Merge error
2013-01-22 12:54:18 -08:00
02185d4240
VO should not contain any DAO. Transient should be loaded by the caller using the Dao.
2013-01-22 12:54:16 -08:00
e6cd47ddc0
More changes for deployVM flow.
2013-01-22 12:54:07 -08:00
94e8090bf3
Deploy, Start, Stop, Destroy VM orchestration service changes
2013-01-22 12:54:04 -08:00
ee39ec82d3
Making unit tests work
2013-01-22 11:18:51 -08:00
2e14cf5b57
Summary: Allow for same vlan num on different physical NICs
...
Detail: A previous bug in the database schema did not allow the same vlan num
to exist on separate physical networks, even though this is possible and should
be allowed. To fix this, the code was changed to also disallow the same vlan
num on different physical networks, to avoid hitting the database constraint.
The database constraint has now been changed to allow only one of a vlan num
per physical nic per data center, so different physical nics can reuse vlan
numbers. This fix adjusts the code to match by removing the old fix.
BUG-ID: CLOUDSTACK-686
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1358881555 -0700
2013-01-22 12:05:55 -07:00
4fbecf15ec
add unit test back, primary storage life cycle is tested
2013-01-21 17:01:00 -08:00
6e40c33628
CLOUDSTACK-355: create DB view for ServiceOfferingResponse to fix count
...
for ListServiceOfferingsCmd.
2013-01-21 15:25:49 -08:00
6db719d58b
CLOUDSTACK-355: Create DB view to fix count issue for
...
listDiskOfferingsCmd.
2013-01-21 10:50:10 -08:00
f27692aa7a
Removed a useless class?
2013-01-21 10:25:58 -08:00
04d93ef0aa
Use the user.home property instead of a bash thing. See
...
http://docs.oracle.com/javase/tutorial/essential/environment/sysprop.html
2013-01-21 11:56:53 +01: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
fe6f0457d5
fixed unit tests from merge
2013-01-18 15:58:55 -08:00
2955d58976
Fix "Count" for listSnapshotPoliciesCmd.
2013-01-18 13:55:11 -08:00
10d9c019a9
All merge conflicts resolved
2013-01-18 12:14:57 -08:00
5a865462e9
Merge branch 'api_limit'
2013-01-18 09:43:54 -08:00
ce4b49d30b
network-refactor merge: fix nonoss build
...
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
2013-01-18 09:38:49 -08:00
e45a9f3aed
CLOUDSTACK-803: HA gets triggered even when the host investigator is unable to determine the state of the host HA won't be triggered in case the host investigator is not able to determine the state
...
Signed-off-by: Koushik Das <koushik.das@citrix.com>
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-01-18 17:20:51 +05:30
070856affd
CLOUDSTACK-988: HV version must be updated in hypervisor_version column of host table HV version is stored in hypervisor_version column in host table wherever present Also correctly populating version column in host table with resource file version
...
Signed-off-by: Koushik Das <koushik.das@citrix.com>
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-01-18 16:49:52 +05:30
51c1ca7cbe
CLOUDSTACK-1010: Fix count issue for listHosts command
2013-01-18 16:13:25 +05:30
2fd1d476b4
Merge branch 'master' into api_limit
2013-01-17 21:23:50 -08:00
e5507c3892
Deprecate 2.1.x migration DAOs, it breaks EntityManager's singleton assumption
2013-01-17 18:55:14 -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
17a94b20ec
Always use premium setting in ConsoleProxyManager
2013-01-17 18:23:06 -08:00
b120e19280
ApiDispatcher: In case of incorrect long int value or uuid, throw error
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-17 17:59:53 -08:00
cd37e22f9b
CLOUDSTACK-810: Make DirectAgent thread pool size configurable Removed hard-coding of directagent thread pool size and now reading it from configuration
...
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
2013-01-17 17:21:52 -08:00
f264571e92
ApiServer: Fix default reponse type for apiserver on intergration port to xml
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-17 17:03:27 -08:00
2d19f3b052
network-refactor: merge stomped on a logical not'
2013-01-17 16:59:48 -08:00
8d016d035b
MockConfigurationDaoImpl: Fix build issue, add base class method
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-17 16:15:15 -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
86ada92ffa
Fix some bugs and add java integration test for api rate limit plugin.
2013-01-17 15:13:51 -08:00
6d155416c2
System VM can start now with Spring bootstraped management server
2013-01-17 14:22:14 -08:00
56cd809600
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
...
Re-merge with network-refactor
2013-01-17 11:32:49 -08:00
cbb7ff1c32
added missing files
2013-01-17 06:50:59 -08:00
b751b69c55
Merge branch 'javelin' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack into javelin
2013-01-17 06:50:19 -08:00
9759ad57f2
Commit the current changes to unit tests
2013-01-17 06:50:11 -08:00
c1a540c6bb
Merge branch 'master' into api_limit
...
Conflicts:
api/src/org/apache/cloudstack/api/BaseCmd.java
server/src/com/cloud/api/ApiServer.java
server/src/com/cloud/api/ApiServlet.java
Signed-off-by: Min Chen <min.chen@citrix.com>
2013-01-16 22:48:22 -08:00
3dabd5fbf3
Clean up ApiServer, ApiServlet and ApiDispatcher flow to handle various CloudRuntimeException
...
and CloudException in one place, and Introduced ApiErrorCode to handle CloudStack API error
code to standard Http code mapping.
Signed-off-by: Min Chen <min.chen@citrix.com>
2013-01-16 22:36:34 -08:00
06fa338d42
Add some tests for api rate limit plugin.
2013-01-16 21:56:25 -08:00
bdcfa1919b
Clean up ApiServer, ApiServlet and ApiDispatcher in handling various
...
exceptions, and Introduced ApiErrorCode to handle CloudStack API error
code to standard Http code mapping.
2013-01-16 21:52:48 -08:00
d9e36ac37b
network-refactor: fix license issues
...
Fix build after merge of network-refactor
2013-01-16 19:25:23 -08:00
4d4fb9c959
https://issues.apache.org/jira/browse/CLOUDSTACK-993
...
Changes:
- Introduction of maven skipped the java code that inserts the admin user. This causes the NPE in management server while trying to find the user and also, admin user cannot login as expected.
- Fixing the insertion of the admin user as part of startup.
2013-01-16 19:18:59 -08:00
cadca5fc0c
Merge branch 'master' into network-refactor-merge2
...
Conflicts:
api/src/com/cloud/network/NetworkService.java
api/src/com/cloud/network/element/RemoteAccessVPNServiceProvider.java
plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java
server/src/com/cloud/acl/DomainChecker.java
server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java
server/src/com/cloud/network/NetworkManager.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
server/test/com/cloud/network/MockNetworkManagerImpl.java
server/test/com/cloud/vpc/MockNetworkManagerImpl.java
2013-01-16 19:17:14 -08:00
497dcd5044
Get rid of PlugService annotation, replace it with Spring standard injection in command classes
2013-01-16 18:44:44 -08:00
c08d151e05
https://issues.apache.org/jira/browse/CLOUDSTACK-993
...
Changes:
- Introduction of maven skipped the java code that inserts the admin user. This causes the NPE in management server while trying to find the user and also, admin user cannot login as expected.
- Fixing the insertion of the admin user as part of startup.
2013-01-16 17:18:11 -08:00
975021dda1
Summary: adding resizeVolume api call
...
Detail: This merges the resizevolume feature branch, which provides the
ability to migrate a disk between disk offerings, thereby changing its
size, or specifying a new size if current disk offering is custom.
BUG-ID: CLOUDSTACK-644
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1358358209 -0700
2013-01-16 17:43:35 -07:00
2be270de89
Separate loadable components like Gurus, Elements, Adapters to componentContext.xml
2013-01-16 16:33:59 -08:00
727fab71cb
Disable StorageProvider, storageType introduced in Javelin new code, temporarily, to make existing code run
2013-01-16 14:16:01 -08:00
4c1257bf18
Handle proxy object situation in dispatching API command
2013-01-16 11:28:09 -08:00
e83fe471c7
Merge branch 'master' into api_limit
2013-01-16 10:49:25 -08:00
4b67340d8c
Revert "Summary: partical check-in for L4-L7 network services in the
...
shared"
This reverts commits 0de5a145e428bbf6c527
2013-01-16 16:43:37 +05:30
316c5267cc
Revert " Summary: check-in for L4-L7 network services in the shared network in"
...
This reverts commit 7fcfcdf91e
2013-01-16 16:04:14 +05:30
156ed7a336
Revert "Summary: partical check-in for L4-L7 network services in the shared"
...
Reverting due to IP clearance issued for the commit done as part of
CLOUDSTACK-312
This reverts commit d4c604cfd8
2013-01-16 15:58:44 +05:30
c7840cf91f
reverting the earlier commit 432ea9c7d4
...
done for bug CLOUDSTACK-265 due to IP clearence issues.
2013-01-16 15:10:27 +05:30
97cb16944f
Merge branch 'master' into api_limit
2013-01-15 18:18:34 -08:00
df684261cf
Put command classes under Spring injection framework
2013-01-15 18:07:19 -08:00
8608925216
Consolidate RuntimeCloudException and CloudRuntimeException into one
...
class CloudRuntimeException, and removed RuntimeCloudException to avoid
confusion.
2013-01-15 18:07:08 -08:00
4355d06a86
Reuse APIChecker adapter interface for APi Rate limit checking and optimize ApiRateLimitService interface.
...
Signed-off-by: Min Chen <min.chen@citrix.com>
2013-01-15 15:53:19 -08:00
4f889bd426
CLOUDSTACK-985: Make sure RvR would always have same MAC address
...
Even with newly created RvR using "restartNetwork&cleanup=false" API.
2013-01-15 15:22:41 -08:00
c32dbec468
CLOUDSTACK-985: Revert "Using different MAC for a pair of redundant routers"
...
The different MAC address for a pair of redundant router have issues when short
time network outrage happened. When this happened:
1. BACKUP(r-2) cannot receive the broadcast from MASTER(r-1).
2. Then r-2 would announce it's MASTER after 3 seconds, and send gratuitous ARP
to the gateway of public ip(usually a rack router).
3. The gateway of public ip would update it's ARP cache to associate the public
ip of the network to the MAC of r-2.
4. In the meantime, r-1 still sending out VRRP broadcast(due to network issue,
the broadcast never arrived at r-2), and acting as MASTER.
5. After network outrage, r-2 would receive the higher priority VRRP broadcast
from MASTER again, then receded as BACKUP.
6. But the public gateway would still associate public ip with MAC of r-2, thus
caused the issue. r-1 would no longer able to receive any packets from public
network.
And there is no way for r-1 to send gratuitous ARP again, because it's always
consider itself as MASTER, no state changed, and no hook existed for receiving
lower priority broadcast.
So I would revert this change, and introduce another commit to ensure the newly
create redundant router would share the same MAC as the first one.
This reverts commit 9f257aa60b
2013-01-15 15:02:21 -08:00
47251b51a7
Summary: Allow ssh keypairs to be created if developer flag set and user ! cloud
...
Detail: Previously in the code we allowed the configuration to create ssh
keypairs and put them in the configuration table so that systemvms could have
ssh key auth and work properly if the user was 'cloud' or if the developer
configuration item was set to true. It got changed to requiring both the cloud
user and the developer flag (using an || on a negative) somwhere along the way.
This changes it back to && on a negative to allow us to run as non-cloud users
with the dev flag set, and for cloud to deploy properly without the developer
flag.
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1358285190 -0700
2013-01-15 14:53:28 -07:00
af67d87662
Fix issues with @DB support in Spring environment
2013-01-15 12:35:03 -08:00
7f1486e2dc
We need to catch PermissionDeniedException in checking if command is
...
available to an user.
2013-01-15 11:43:59 -08:00
7fad27b846
network-refactor: unfortunately have to ignore tests during build since the tests involve verification of injection. This causes the database to get invoked during component initialization. The database is not available on the build server
2013-01-15 11:43:53 -08:00
a6b9027630
default Security rule doesn't apply to system VMs since nic.getIsolationUri is not set
...
use to.setSecurityGroupEnabled to indicate if securitygroup is enabled on this NIC
CLOUDSTACK-983: default Security rule doesn't apply to system VMs
2013-01-15 11:15:42 -08:00
101f64410a
Do not allow add multiple VLANs or subnets into shared network
...
CS allows to add multiple VLANs and subnets to a shared network, but it doesn't really work, for example , vm on second VLAN or subnet cannot get IP through DHCP
This patch will not allow to add mulitple VLANS or subnets into shared network
CLOUDSTACK-982:Do not allow add multiple VLANs or subnets into shared network
2013-01-15 09:17:12 -08:00
510450b11b
Remove duplicate systemUse clausule when fetching service offerings.
...
A couple of lines back there is:
if (isSystem != null) {
sc.addAnd("systemUse", SearchCriteria.Op.EQ, isSystem);
}
So it was set redundantly, this can be removed.
2013-01-15 12:14:57 +01:00
bca2c928e8
PluggableService: Fix interface definition
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-14 19:01:26 -08:00
8f27c711e5
ApiServer: Process through chain of api access checker, on failure it will throw exception
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-14 19:01:26 -08:00
3aba867e16
only basic network is pod based.
...
it has nothing to do with shared SG enabled netwokr
2013-01-14 18:29:09 -08:00
f304df44df
Add ActionEventIntercepter to implement origianl ActionEventCallback in Spring AOP
2013-01-14 17:44:31 -08:00
4d0c850dc8
Fix plugin component configuration.
2013-01-14 17:13:18 -08:00
896e505da6
APIChecker: Make interface generic, pass user and not just role
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-14 15:08:45 -08:00
96bd1d4172
Forget to save changed file in last commit
2013-01-14 14:10:47 -08:00
6dfbcee63d
Fix singleton initialization in ApiServer/ApiDispatcher to make it work under Spring bootstraped environment
2013-01-14 13:57:30 -08:00
64c947a9f8
Re-fix startup of management server
2013-01-14 10:52:37 -08:00
38eaa04b98
Pull changes from master into javelin
...
- Disables simulator plugin, breaks build, available via simulator profile
- Fixes spring injections
- Fix api,acl plugins, ApiServer, ApiDispatcher
- Fix other merge conflicts
Conflicts:
docs/en-US/external-firewalls-and-load-balancers.xml
plugins/acl/static-role-based/src/org/apache/cloudstack/acl/StaticRoleBasedAPIAccessChecker.java
server/src/com/cloud/api/ApiDispatcher.java
server/src/com/cloud/api/ApiServer.java
server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
utils/test/com/cloud/utils/log/CglibThrowableRendererTest.java
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-12 06:02:54 -08:00
452e9c3efd
maven: Remove duplicate cloud-core dependency in server
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-12 03:41:27 -08:00
ad063ed610
StaticRoleBasedAPIAccessChecker: Throw exception on failed check
...
Plugin should not be responsible for existence of checking an API, this was wrong.
Throw exception boldly when checkAccess fails.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-11 19:24:11 -08:00
0dca44efe8
ApiServer: Debug messages, don't spam with info, remove identity helper in ResponseGenerator
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-11 18:44:20 -08:00
83e7214b02
ConsoleProxyManagerImpl: Get rid of IdentityDao
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-11 18:44:20 -08:00
8eba0ee0bb
ApiDispatcher: Remove helper method that proxies via ApiResponseHelper to get entity by IdentityDao
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-11 18:44:20 -08:00
8cdb40a416
NetworkManagerImpl: Add method to getNetwork by uuid
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-11 18:44:19 -08:00
24687973a8
ApiServer: Get rid of IdentityDao, reuse domain manager to get domain id
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-11 18:44:19 -08:00
31dd412626
DomainService: Fix getDomain by uuid string
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-11 18:44:19 -08:00
6fb1a1e6f1
Fix issues after another round of merge
2013-01-11 16:54:32 -08:00
57e67c57d7
Merge branch 'master' into api_limit
...
Conflicts:
server/src/com/cloud/api/ApiServer.java
Signed-off-by: Min Chen <min.chen@citrix.com>
2013-01-11 15:50:21 -08:00
f57dcaa820
Loadable components to be in separted Spring component bundling
2013-01-11 15:33:15 -08:00
53da542001
Another round of fixes after merge
2013-01-11 15:21:04 -08:00
74bb043c37
APIChecker: Rename refactor and add interface checkExistence
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-10 18:51:30 -08:00
757e1a931b
cleanup warnings in utils
2013-01-10 17:19:30 -08:00
e63e352508
ApiServer: Log a better message if api access fails and debug it
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-10 16:08:16 -08:00
1294cdc701
pulled from master
2013-01-10 16:01:01 -08:00
d6f44a4d6a
merged from master
2013-01-10 15:55:42 -08:00
8f26e171e6
ManagementServerImpl: Fix missing import of PropertiesUtil
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-10 15:55:02 -08:00
c4e890c55d
PluggableService: Refactor method to return map of key value pairs
...
- Makes plugins self contained so they decide their properties file format
- PluggableService creates the contract that implementing entity will return a
properties map which is apiname:rolemask (both are strings)
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-10 15:55:02 -08:00
a56f355ceb
ApiServer: get role type from account manager using account
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-10 15:55:01 -08:00
1425736c19
AccountManager: Add method to translate account type to role type
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-10 15:55:01 -08:00
fac2270240
more files changed
2013-01-10 15:29:14 -08:00
f922c6fc03
Keep removing
2013-01-10 14:46:52 -08:00
62a42723f9
APIAccessChecker: Make it check based on role type and not user
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-10 11:49:15 -08:00
56e5fbdee2
removed import of componentlocator and inject from all files
2013-01-10 11:44:47 -08:00
395de6f2b3
merge from latest pull
2013-01-10 11:07:11 -08:00
f40e7b7511
removed componentlocator and inject
2013-01-10 11:05:20 -08:00
0b69d9449a
Merge branch 'master' into api_limit
2013-01-10 09:51:41 -08:00
cd7f771615
CLOUDSTACK-721: Fixed network usage. Send network usage command for isolated guest nic of non VPC VR. Send network usage command for public nic in VPC VR.
2013-01-10 14:56:11 +05:30
1776659fe7
Network-refactor: move validateRule to LB manager since it now has access to LB elements.
...
NetworkServiceImpl does not need a cache of system network offerings
Ensure mocks build to new APIs.
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
2013-01-09 18:36:29 -08:00
745fae93f6
Network-refactor: some clean up of the NetworkService interface
...
- remove unused public apis
- remove unused members
- change visibility of methods to protected if they do not implement a method in the interface
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
2013-01-09 18:36:23 -08:00
7f8262d45e
Remove IdentityProxy and IdentityTypeAdapter class.
...
Signed-off-by: Min Chen <min.chen@citrix.com>
2013-01-09 17:40:58 -08:00
0bcebd33b6
Fix problems after merge
2013-01-09 17:36:53 -08:00
657fb6ac0b
ApiServer: Don't depend on plugin for apiname:cmd class mapping
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-09 17:20:46 -08:00
72693ea382
server: Fix ApiServer init method, we won't use cfg files and it's not used there
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-09 17:20:46 -08:00
8d98daa1be
Add API throttling config items and APILimitChecker Adapter interface,
...
add api limit checking in APIServer flow.
2013-01-09 16:11:23 -08:00
05a85c7cd6
Network-refactor: reduce verbosity of test logs.
...
Icky way to do it, but unable to get maven to pick up log4j properties from test/resources
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
2013-01-09 15:49:02 -08:00
dbe3fe2d34
Network-refactor: interaction between firewall manager and network manager changed, verify this works as expected
...
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
2013-01-09 15:49:02 -08:00
728db6c8ca
Network-refactor: fix bugs in components.xml discovered by unit tests
...
Provide injection tests for NetworkManager and FirewallManager
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
2013-01-09 15:49:02 -08:00
1339650c2c
Network-refactor: remove unused members. Makes testing of injection a PIA.
...
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
2013-01-09 15:49:02 -08:00
e0578180c5
Network-refactor: verify injection is correct. Verify that dhcp service providers and ip deployers get injected independently in addition to the list of network elements
...
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
2013-01-09 15:49:02 -08:00
88df984ff3
Network-refactor: add a method for plugins to get the source nat ip
...
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
2013-01-09 15:49:02 -08:00
a34ce77b77
Network-refactor: verify that s2s provider gets injected as expected
...
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
2013-01-09 15:49:01 -08:00
0c3001530f
Network-refactor: move readonly interface NetworkModel into api project so that plugins can stop depending on the server project
...
Network-refactor: accidentally injected NetworkModel twice (revert one of them)
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
2013-01-09 15:49:01 -08:00
504264236c
Network-refactor: In preparation for moving the read-only interface NetworkModel
...
to the api project, ensure that all methods use interfaces from the api project.
By moving it to the api project, it lessens the dependency of plugins on the server components.
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
2013-01-09 15:49:01 -08:00
6b6d8c5710
Network-refactor: Move code from NetworkManager to NetworkModel.
...
NetworkModel is intended as a read-only view on the network model.
This includes Networks, Nics, Ip address, PhysicalNetwork, NetworkOfferings, etc
The code in configure() and start() is used to support queries on the network model which is now the responsibility of the NetworkModel service
Network-refactor: Fix tests so that they get injected with the required NetworkModel mock
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
2013-01-09 15:49:01 -08:00
5a830c4db0
Network-refactor: Refactor NetworkManager into NetworkModel and NetworkManager.
...
NetworkManager's exclusive focus is now
- handling plugins during orchestration, and
- to deal with ip address allocation.
Those classes that used to refer to NetworkManager to get access to the datamodel now refer to NetworkModel
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
2013-01-09 15:49:01 -08:00
cf5d935d81
Seperate configurable components out and let them be loaded from Spring configuration file
2013-01-09 14:39:16 -08:00
9924b64830
commit 3a3cb60e85c0254ebceff55d0b210ca1ff5386a6
...
Author: Likitha Shetty <likitha.shetty@citrix.com>
Date: Wed Jan 9 11:54:25 2013 +0530
CLOUDSTACK-614: ListTemplates API is not returning "Enable SSH Key" attribute for any given template. Update the TemplateResponse by adding 'sshkeyenabled' attribute to it. This attribute is set to the value that the user passes as input for parameter 'sshkeyenabled' while registering the template.
Signed-off-by: Min Chen <min.chen@citrix.com>
2013-01-09 10:42:44 -08:00
b6c56736e5
merge from master
2013-01-09 05:20:36 -08:00
0bcb64605f
all built with the latest
2013-01-09 05:02:39 -08:00
0b0752f047
CLOUDSTACK-932: Fix incorrect param that caused casting error while processing api
...
Reported-by: Kishan Kavala <kishan.kavala@citrix.com>
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-09 04:47:53 -08:00
14bd345f1f
merge compiles
2013-01-09 04:41:27 -08:00
fc92f04c6b
ApiDispatcher: Remove unused methods which were for acl processing
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-09 04:18:35 -08:00
765504c070
ApiServer: Fix apidiscovery fail case, fix comment
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-09 04:18:35 -08:00
2c04dad529
ApiDiscovery: New plugin to help discover apis on mgmt server
...
- Introduces api/discovery plugin that helps discover apis on the mgmt server
- It's a pluggable service, therefore has it's own api-discovery_commands.properties
where the discovery api, listApi can be blacklisted (by removing it), or it's
role mask can be changed
- By default its response has all the apis
- Changes in other parts of the code to make it work, viz. components.xml, pom.xml,
and in ApiServer where it is used as an adapter to get apiname, cmd mappings
The ApiDiscoveryService interface is a contract that the implementing class will
provide:
1. A means to get all the apis as a list of response, plugin is free to implement
the response class, as long as it extends on the BaseResponse:
ListResponse<? extends BaseResponse> listApis();
2. Provides a map of apiname as the key and cmd class as the value:
Map<String, Class<?>> getApiNameCmdClassMapping();
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-08 18:54:29 -08:00
d760271945
ApiDispatcher: Get rid of reflections, reuse utils' ReflectUtil
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-08 18:54:29 -08:00
539d94b4a6
ApiXmlDocWriter: Reuse methods from ReflectUtil
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-08 18:54:29 -08:00
cc23a23324
Fix startup sequence for classes that have due Manager/Adapter interfaces
2013-01-08 18:42:12 -08:00
b274c570f9
Cleanup places that use explicit wiring of the components
2013-01-08 17:45:33 -08:00
d22229eb9d
Remove updateUuids code in ConfigurationServerImpl (which is not the
...
right approach to populate uuid column since it will impact upgrade as
well), and populate UUID column in seed data sql script.
Signed-off-by: Min Chen <min.chen@citrix.com>
2013-01-08 17:12:14 -08:00
7f3a748d6c
Merge branch 'javelin' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack into javelin
2013-01-08 14:46:38 -08:00
32e67f60d4
Work with Spring proxy-ed object
2013-01-08 14:24:19 -08:00
cf8de7ee17
Removed all the .project files
2013-01-08 14:11:00 -08:00
30f2565d98
Merge branch 'api_refactoring' into javelin
2013-01-08 12:36:04 -08:00
74c15a22a0
Create DB view for ListStoragePools API performance optimization.
...
Signed-off-by: Min Chen <min.chen@citrix.com>
2013-01-08 12:33:18 -08:00
a4f4c98670
OrchestrationService: some changes for DeployVM
2013-01-08 11:53:54 -08:00
992fa473be
convert existing singleton objects into Spring loadable bean components
2013-01-08 11:07:22 -08:00
b96bb8feb9
Hook log4j to Spring bootstrapped Javelin server
2013-01-07 18:21:58 -08:00
0894822651
DB view dao cleanup, and introduce global configuration parameter for
...
entity detail batch query size to remove hard-coded
VM_DETAILS_BATCH_SIZE.
Signed-off-by: Min Chen <min.chen@citrix.com>
2013-01-07 16:40:31 -08:00
559933f062
First page of Javelin management server bootstraped by Spring is able to show now
2013-01-07 15:54:18 -08:00
af1abe4056
Forgot some element adapters + dont add JuniperSRX by default
2013-01-07 15:21:57 -08:00
e262eef296
Fix mocks
2013-01-07 15:21:49 -08:00
c876f02c6f
Clean up some unused imports
2013-01-07 15:21:36 -08:00
cf90685985
Remove old applyRules implementation
2013-01-07 14:26:09 -08:00
f4da21998c
WIP : extract NetworkService
...
WIP : move stuff between network manager and network service.
at this point there is about 700 lines of duplicated code
WIP: Leave creation of default offerings to NetworkManager init
WIP: clean up imports
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
2013-01-07 14:25:03 -08:00
a948a89378
Sync updates: Merge branch 'master' into api_refactoring
...
Conflicts:
server/src/com/cloud/api/commands/AddTrafficMonitorCmd.java
server/src/com/cloud/api/commands/ListTrafficMonitorsCmd.java
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-07 10:38:43 -08:00
13de3ca253
Enable default sorting for listVirtualMachines and listRouters to keep
...
back compatible.
2013-01-07 10:26:33 -08:00
3ffbc4320a
CLOUDSTACK-595 : Recreate root volume scenarios doesn't work in vmware
...
Issue seen during system vm template upgrade and restoreVM command
scenarios for vmware. In these cases CS tries to recreate root disk with
same name as the existing one, in case of vmware this results in creation
of vmdk file with same name for both existing and new root volume.
This results in undesired behavior when storage cleanup thread tries to
cleanup old volume. Made the vmdk file name unique by adding the volume
id to it. This will ensure that during volume recreation in the scenarios
mentioned vmdk will get created with a new name and there will be
no undesired side effects of running the storage cleanup thread.
2013-01-07 16:18:05 +05:30
5502f4b20c
Corrected response object in Traffic Monitor APIs Implementation annontation as TrafficMonitorResponse
2013-01-07 12:32:24 +05:30
39b829bffe
api: ACL annotation and checkAccess removal refactor for StopVMCmd
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-06 17:19:49 -08:00
96b9164e4b
Fix ACL processor and methods in ApiDispatcher and their usages
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-06 17:18:45 -08:00
19cf665094
ApiServer: Fix debug output for role based user access checking
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-06 16:51:14 -08:00
ed0637b8c2
api: Refactor move acl to org.apache.cloudstack
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-06 15:30:58 -08:00
6f6ed85839
ApiXmlDocWriter: Fix apidocs generation based on new commands.properties syntax
...
Makes it backward compatible to old syntax as well
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-06 15:01:09 -08:00
e17e68f0af
server: Fix base template*cmd class imports and names
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-06 14:47:00 -08:00
b720675bfe
Merge branch 'master' into api_refactoring
...
Getting ready for merge request for master, sync changes
Conflicts:
client/tomcatconf/commands.properties.in
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-06 01:11:16 -08:00
aa9701a10c
CLOUDSTACK-799: Redundant router: Speed up RvR status update
...
The basic idea behind this is, deploy a fix sized threadpool for updating RvR
status, then using producer/consumer model. There is a global configuration
router.check.poolsize(10 by default) to control the pool size.
Using pool size 100 for 1000 RvR is tested with simulator and works well.
Also we can adjust the global configuration option router.check.interval to e.g.
60s from default 30s to mitigate the issue.
2013-01-05 21:02:37 -08:00
21d6cd304b
server: Reformat DomainChecker
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-05 17:00:13 -08:00
6a112bd64c
api: Rename Validator to Validate, cosmetic fixes
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-05 16:52:53 -08:00
b00ed17f4b
server: Cosmetic fix for methodname in ApiDispatcher
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-05 16:40:59 -08:00
63481ecb34
CLOUDSTACK-212: Move api response classes to cloud-api under org.apache.cloudstack
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-05 16:27:36 -08:00
73a0c3e07f
api: Refactor move storagepool apis to storage pkg
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-05 15:32:58 -08:00
f07a98a740
api: Refactor and move s3 to api.command.admin.storage
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-05 15:30:38 -08:00
5119785cf7
Get latest changes, merge branch 'master' into api_refactoring
...
Conflicts:
api/src/com/cloud/network/element/RemoteAccessVPNServiceProvider.java
server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java
server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java
setup/db/db/schema-40to410.sql
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-04 22:21:20 -08:00
a64b386714
Move applyRules to the rightful place(s). Not sure why applyIps is required during applyRules, so we still have a reference back into a (simplified) applyRules in NetworkManager
2013-01-04 19:22:53 -08:00
42c8c73ab6
CLOUDSTACK-306: Introducing IpDeployingRequester and implement inline mode
...
For LB device in inline mode, the ip deployer(the owner of public ip) is the
firewall in front of it, not itself. So check if it's inline or not, if it's
inline, return the firewall as ip deployer
2013-01-04 19:18:03 -08:00
177e157cbf
CLOUDSTACK-306: Move inline mode parameter from device to network offering
...
One F5 device can be used as inline and side-by-side at the same time(for
different networks). So we can define inline or not on network base.
2013-01-04 19:17:58 -08:00
717f9dcd4d
CLOUDSTACK-306: Implement SRX firewall
...
Use SRX firewall filter as SRX firewall. The old security policy mechanism
cannot be used as IP based. This would enable SRX's ability to control traffic
for F5 behind it.
2013-01-04 19:17:50 -08:00
dea8227001
server: Exclude ListPerf test in as it requires real MS and DB
...
Excluded test as per test author's comment:
"Currently we commented out this test suite since it requires a real MS and Db running"
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-04 18:25:13 -08:00
0659c21f2d
Get latest changes, Merge branch 'master' into api_refactoring
2013-01-04 17:22:57 -08:00
65a1284e83
srx: Annotate api classes, remove IdentityMapper
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-04 17:00:10 -08:00
4dd5f14e76
f5: Annotate f5 cmd classes, remove IdentityMapper
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-04 16:49:27 -08:00
e37f458a8d
Rationalize the interface by injecting all service providers by the service provider interface instead of assuming everybody implements NetworkElement. This is step 2 and includes all the plugins
...
import cleanups - remove unneeded and add explicit classes
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
2013-01-04 15:13:47 -08:00
3529c47248
Rationalize the interface by injecting ipDeployers. This is step 1 and includes 2 service providers - Remote AccessVPN and S2S VPN
...
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
2013-01-04 15:08:55 -08:00
0428b30a5a
Fix reflections cmd class loading in ApiServer
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-04 14:35:05 -08:00
2e9c55f8f6
More Spring issues to bootstrape javalin server
2013-01-04 14:25:12 -08:00
b0a1a47d48
Not all network service providers need to be NetworkElements. NetworkElements are only those that are interested in L2 events. Since only NetworkElements were injected, and only in NetworkManagerImpl, this has led to all kinds of contortions. As a first step, enable individual service providers to be injected.
...
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
2013-01-04 12:14:49 -08:00
0055d80211
CLOUDSTACK-771: maven: add mysql version reference to enable non-snapshot builds
...
If you update your build to build a version with a name not ending in -SNAPSHOT,
you are required to declare versions on all your depdendencies. There is already
a cs.mysql.version property, this patch makes sure it is used where appropriate.
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-01-04 12:20:06 -05:00
7240204a50
Pass on the destination host in StartCommand
...
I added this in commit bc94948e06110903a91a
2013-01-04 14:37:23 +01:00
6929bd9473
server: Don't silently ignore uuid param translation for required param in case they fail
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-03 22:32:47 -08:00
98d5719b57
server: Make ApiDispatcher backward compatible to not throw error on incorrect params
...
Incorrect params are silently ignored in 4.0 and before. The fix would log the error
in debug log, but will continue processing. In case of an issue with uuid or param
an empty response is sent, for ex. in case of deleted entities as well.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-03 22:32:46 -08:00
daeb4abcca
Create DB views for AsyncJobResponse to speed up listAsyncJobsCmd.
...
Signed-off-by: Min Chen <min.chen@citrix.com>
2013-01-03 15:35:26 -08:00
ff8fdbd194
Add missing @Id annotation to id fields for all the join VOs to support
...
findById call.
2013-01-03 14:12:15 -08:00
01701b1d9c
Missing two files in last check-in
2013-01-03 14:11:16 -08:00
25d14418b9
Replace Adapters<T> with standard List<T> to work with Spring injection
2013-01-03 13:33:52 -08:00
edb00bb613
Merge branch 'master' into api_refactoring
2013-01-03 08:32:56 -08:00
cc3d692ab8
Summary: Remove useless and commented code
2013-01-03 11:57:37 +01:00
580bf857ff
server: ApiServer inits with processing cmd classes to fill apiname:class mapping
...
- Add maven dependency reflections (wtfl license, apl compliant)
- Use reflections to recurse and get apiname:class mapping
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-02 18:43:59 -08:00
65e4f00a10
Annotate api name on usage related apis
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-02 18:43:58 -08:00
ebfb90e217
Create DB view for Account to speed up ListAccountsCmd, and add missing async job information for some response objects.
...
Signed-off-by: Min Chen <min.chen@citrix.com>
2013-01-02 17:38:58 -08:00
bc8e0af0a3
plugin: ACL Static Role Based api access checker
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-02 17:06:19 -08:00
d235859168
Fix PluggableService to provide interface for ACL adapters etc. to get configs
...
- Fix interface to return array of strings, or filenames
- Fix StaticRoleBased ACL adapter to process config files by going through all pluggable services
- Refactor interface names
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-02 16:29:39 -08:00
d8d87adc22
Merge branch 'master' into api_refactoring
...
Conflicts:
api/src/com/cloud/api/commands/ListS3sCmd.java
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
setup/db/db/schema-40to410.sql
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-02 13:57:55 -08:00
e2078ec6e4
Solve Spring loading issues with a few Dao and Manager components
2013-01-02 13:55:26 -08:00
e4583ced2e
S3-backed Secondary Storage
2013-01-02 10:28:47 -08:00
e936c32a04
Fixed problems with inject checkin
2012-12-28 16:24:54 -08:00
259e6d5f74
Fix a few Spring bootstrap issues
2012-12-27 17:46:52 -08:00
623e7389ef
api: Make APIServer backward compatible to accept both uuid and id for pre 3.x apis
...
- Allow both uuid and id in param for pre 3.x apis
- Enforce uuid as param for all >= 3.x apis
- Use regex to better match uuid param
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-27 15:24:17 -08:00
840da55520
api: Entities will extend InternalIdentity and Identity
...
Entities correlated to the Identity and carry a uuid and those
correlated to InternalIdentity carry an id. Those entities that carry
both will correlated to Identity and InternalIdentity.
This refactors entities wherever possible to ensure the VO only
implements the first class entity.
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2012-12-26 19:11:15 -08:00
7a7fe583e0
Rename Implementation annotation to APICommand
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-26 15:55:34 -08:00
a18464dbe5
Rename @Entity to @EntityReference used in Response classes
...
- Renames to @EntityReference as @Entity is too general and used in javax's pkg
- Remove redundant imports
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-26 15:34:35 -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
21c1623a03
Create DB view for Volume to speed up ListVolumesCmd.
...
Signed-off-by: Min Chen <min.chen@citrix.com>
2012-12-25 17:08:50 -08:00
78d70d349b
Merge branch 'master' into api_refactoring
...
- Applies Isaac Chian'gs fix (CLOUDSTACK-648) to allow user change their password
- TODO: Fix response, only partially applied
Conflicts:
api/src/org/apache/cloudstack/api/response/UserResponse.java
client/tomcatconf/commands.properties.in
server/src/com/cloud/api/ApiResponseHelper.java
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-25 09:51:17 -08:00
5aefd77f77
Fix for CloudStack-648
...
Signed-off-by: Gavin Lee <gavin.lxh@gmail.com>
2012-12-26 00:00:58 +08:00
beb2fccf1c
api: Finally get rid of IdentityMapper annotation processing in ApiDispatcher
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-23 18:06:36 -08:00
9d3ab8ded7
server: Get rid of db helpers that work with IdentityMapper
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-23 18:04:32 -08:00
e849d70af1
api: Annotate some juniper-src apis
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-23 17:41:10 -08:00
a4fed07a7e
api: Annotate usage related apis
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-23 17:33:30 -08:00
a5dddb4a83
api: Extend or Implement InternalIdentity's getId method on a lot of VOs and Interfaces
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-23 16:52:35 -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
503db14127
Add back Identity interface to most VO class to avoid cast error in
...
ApiDispatcher.setupParameter call.
2012-12-22 22:35:09 -08:00
e7fa1a86fb
Create DB views to improve ListHostsCmd performance.
...
Signed-off-by: Min Chen <min.chen@citrix.com>
2012-12-22 21:47:05 -08:00
5d8e106602
api: Add method in ApiDispatcher to be reused for both UUID and List<Uuid>
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-22 18:57:26 -08:00
2140ff55ea
api: Refactor and move VPN related api cmd classes to command.user.vpn
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-22 16:13:37 -08:00
024f0d95dd
api: Use Identity interface instead of java reflect to getId
...
- Add new interface method to getId
- Fix method definition in AsyncJob
- Get rid of mechanism to getId using reflect, use Identity interface
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-21 19:05:45 -08:00
08892c51a3
api: Fix jobid and entitytype for BaseResponse and QueryAsyncJob*
...
- Fix jobid serialization issue that broke the UI
- Fix AsyncJob Result and Response
- Get rid of getUuid(), setUuid(), just use getId, setId for uuid...
- All uuids from over the wire are UUIDs
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-21 19:05:45 -08:00
877e16029c
Fix a few Spring issues to Bootstrap javaline server
2012-12-21 16:49:27 -08:00
96c7bbeb86
Update the router status after start network
...
Start network can possible start the router as well. If it's already started by
start network, then we won't need to start it again.
2012-12-21 15:22:07 -08:00
9f257aa60b
Using different MAC for a pair of redundant routers
...
In the past, we use same MAC address therefore once MASTER is down, the packet
to the same MAC would go to BACKUP ASAP.
But now we also have arping after BACKUP become MASTER, which should update the
ARP cache of public gateway router quickly. Though it would be a little
delay(likely less than 1 second), it's still fine for different MAC.
And it would solve some cache issue for same mac on vSwitch different ports.
2012-12-21 15:21:53 -08:00
f4a90a151f
Merge branch 'api_refactoring' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack into api_refactoring
2012-12-21 15:11:54 -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
03b47cb501
api: Temp. fix to be backward compatible to old way of id passing
...
For some apis, the param=-1 is used to evaluate conditionals. Allow -1 to be passed
for now. This is a APITODO/FIXME to fix stuff in service layer and then only get rid of it.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-21 14:41:14 -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
d72f8a695d
Add new global configuration option to enable user specify guest OS DHCP policy
...
This is improvement of:
commit 1ca493e4fa
2012-12-20 19:21:02 -08:00
53e6825b74
CLOUDSTACK-689: Clean stop pending flags when VR start/stop
2012-12-20 18:51:01 -08:00
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
b14b39a69f
Remove IdentityProxy from BaseResponse, ExtractResponse. Now
...
IdentityProxy is only referenced in CreateCmdResponse, which involves
some async job logic change. Since it is not impacting list performance,
will leave it there for now.
Signed-off-by: Min Chen <min.chen@citrix.com>
2012-12-20 16:52:52 -08:00
a88ce6bb7f
Remove IdentityProxy from CloudException and ExceptionResponse.
2012-12-19 23:49:44 -08:00
98b022a430
Remove IdentityProxy from plugin response classes.
...
Signed-off-by: Min Chen <min.chen@citrix.com>
2012-12-19 13:09:02 -08:00
e397f23f6b
Revert "Guard null pointer exceptions."
...
This reverts commit fc56e29a3e
2012-12-19 11:23:09 -08:00
1d729578d4
Remove IdentityProxy from Response classes.
...
Signed-off-by: Min Chen <min.chen@citrix.com>
2012-12-18 23:16:38 -08:00
fc56e29a3e
Guard null pointer exceptions.
2012-12-18 22:26:38 -08:00
7b6132e8e2
api: Skip empty uuid processing in ApiDispatcher for received params
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-18 18:16:18 -08:00
a9df2cb0f5
api: Fix NullPointerException for listProjects in ProjectJoinDaoImpl
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-18 17:44:18 -08:00
434258080f
api: Fix NullPointerException in ApiResponseHelper for DomainResponse
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-18 17:44:17 -08:00
22ee4200c3
api: Fix findByXId to findByUuid in EntityManager and ApiDispatcher
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-18 17:44:17 -08:00
4b75132aa2
Remove IdentityProxy from Response classes.
...
Signed-off-by: Min Chen <min.chen@citrix.com>
2012-12-18 16:33:12 -08:00
16be94e9d7
Remove IdentityProxy from OfferingResponse, FirewallResponse,
...
FirewallRuleResponse, HypervisorCapabilitiesResponse, IPAddressResponse.
Signed-off-by: Min Chen <min.chen@citrix.com>
2012-12-18 12:02:08 -08:00
1aa30f03e7
Remove IdentityProxy from AutoScale responses.
...
Signed-off-by: Min Chen <min.chen@citrix.com>
2012-12-18 11:19:36 -08:00
a390b273ae
Merge branch 'api_refactoring' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack into api_refactoring
2012-12-18 10:07:51 -08:00
5fdce84e81
api: Process UUID and Parameter annotations in ApiDispatcher
...
- Use @Parameter's entityType and type annotation fields
- Use @Entity annotation in Reponse class to get table info for Dao
- Use findByXId to process all entities and translate UUID to ID
- Handle error in reflection method invoking
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-18 04:16:33 -08:00
837d21bb2d
api: Implement findByXId in GenericDaoBase and EntityManagerImpl
...
Declare and define findByXId() in GenericDao and EntityManager.
This method would return a VO by UUID and EntityManager's interface would
take in the VO Interface.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-18 04:10:36 -08:00
3d344738b1
Fix ControlledEntityResponse interface to remove IdentityProxy for
...
projectId and domainId.
Signed-off-by: Min Chen <min.chen@citrix.com>
2012-12-17 23:24:08 -08:00
57eda4e3f4
Merge branch 'api_refactoring' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack into api_refactoring
2012-12-17 23:03:55 -08:00
d54d8cbcd7
api: Fix ApiServer's handle() which runs on integration.api.port
...
- Fix URI parsing using apache hc
- Remove bloated c-like parsing code
- Fix param processing
- TODO: To use Guava's multimap
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-17 20:51:51 -08:00
5572707ec6
maven: Bump httpcore version, add guava and httpclient dependency
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-17 20:44:48 -08:00
79f8c104eb
Remove IdentityProxy from GuestOSResponse and GuestOSCategoryResponse.
...
Signed-off-by: Min Chen <min.chen@citrix.com>
2012-12-17 18:01:31 -08:00
e017dc2c00
commit ba3fef5d0650c42463d0f225f4ca14b5f9046c44
...
Author: Min Chen <min.chen@citrix.com>
Date: Mon Dec 17 17:42:30 2012 -0800
Remove IdentityProxy from AlertResponse and AsyncJobResponse.
Signed-off-by: Min Chen <min.chen@citrix.com>
2012-12-17 17:44:39 -08:00
348d3ae448
Conflicts:
...
api/src/org/apache/cloudstack/api/response/AccountResponse.java
Signed-off-by: Min Chen <min.chen@citrix.com>
2012-12-17 15:41:56 -08:00
ba30500402
CLOUDSTACK-505: Added string cleaning to the start and end debug
...
log statements within the API servlet.
2012-12-17 15:13:59 -05:00
44da7b1841
CLOUDSTACK-505: Reworked approach to cleaning request / response strings
...
As noted in the bug, several of the API command in question
are async calls. I've added a simple regex-based string cleaning
function, and have the request and response strings running through
it prior to being appended to the audit log.
Unit tests added for the new cleaning function as well.
The call to skip logging the createSSHKeyPair response remains intact
for now, although it should probably be scrubbed similarly to the
password fields.
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2012-12-17 14:11:09 -05:00
6ed1989133
Summary: Allow for custom storage adaptors based on pool type in KVM
...
Detail: Instead of using LibvirtStorageAdaptor for everything, you can create
your own storage adaptor and use it. We select storage adaptor based on storage
pool type, thus we needed to adjust LibvirtComputingResource to pass pool type
to everything in KVMStoragePoolManager. This in turn required that we pass the
info necessary to LibvirtComputingResource as well, so a few agent Commands were
modified.
Note this patch in and of itself shouldn't change any existing behavior, just
allow for new storage adaptors to be selected based on storage pool type.
Reviewed-by: Edison Su
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1355769696 -0700
2012-12-17 11:41:36 -07:00
de8aa86542
api: Work in progress code in ApiDispatcher to process annotations
...
- All id params are now uuids, basically for documentation
- Use injections and not component locator
- Remove resourceType field checking, it's now called entityType
- Fix indents
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-17 10:00:27 -08:00
0be6e2e02b
bug CS-14982: Make traffic sentinel metering zones configurable. Global config default will be used when no zones are listed while adding Traffic Sentinel Host
...
status CS-14982: resolved fixed
reviewed-by: Nitin
Conflicts:
api/src/com/cloud/api/ApiConstants.java
2012-12-17 15:18:31 +05:30
f8a483fc5a
api: Include cloudstack-version in both xml and json api response
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-16 21:37:03 -08:00
59fc89abe3
api: Fix ApiServer role base acl logic and response type value
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-16 18:13:29 -08:00
c167ad45e3
Move view based VO and Dao classes to cloud-server module to hide the
...
details from API client, also extract query related methods into
QueryService interface.
2012-12-14 10:47:58 -08:00
2235776aed
Unittests for NiciraNvpGuestNetworkGuru
...
These unittests do not depend on the componentlocator but instead are
completely dependent on mock objects. This ensures that they can be run
standalone without any requirements on the environment.
Includes some fixes to NiciraNvpGuestNetworkGuru and GuestNetworkGuru
2012-12-14 10:41:36 +01:00
b70c1a5a84
Backs NFS-based secondary storage with an S3-compatible object store. Periodically, a reaper thread synchronizes templates and ISOs stored on a NFS secondary storage mount with a configured S3 object store. It also pushes snapshots to the object store when they are created and downloads them in other zones on-demand. In addition to permitting the use of commodity or IaaS storage solutions for static assets, it provides a means of automatically synchronizing template and ISO assets across multiple zones.
2012-12-13 23:18:37 -08:00
0ba355fbc2
CLOUDSTACK-284: listVirtualMachines when zoneid passed
...
When zoneid is passed an no state is specified listVIrtualMachines does
not return the destroyed vms. This patch fixes the issue.
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2012-12-13 23:06:07 -08:00
8ced7da733
CLOUDSTACK-333: When Datacenter name in VCenter has spaces Primary Storage (VMFS) discovery will fail
...
Description:
Missed encoding of URI when discovering ESX cluster in vCenter.
Signed-off-by: Vijayendra Bhamidipati <vijayendra.bhamidipati@citrix.com>
2012-12-13 22:43:59 -08:00
82a17a413b
CLOUDSTACK-505: Removed logging of deployVirtualMachine and resetPasswordForVirtualMachine commands.
...
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2012-12-13 16:00:30 -05:00
88b7af18e6
api: Revert "Move all the DB view DAOs from cloud-server to cloud-api for future api-server package."
...
Reverting commit as we don't want the daos to move to cloud-api.
We'll eventually breakout cloud-server and create cloud-api-server for the standalone
api server.
This reverts commit 7597a38f7a
2012-12-13 09:42:28 -08:00
7597a38f7a
Move all the DB view DAOs from cloud-server to cloud-api for future api-server package.
...
BUG-ID: CLOUDSTACK-527
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-13 09:28:42 -08:00
7dbdf786cc
api: FIXME for api access checker adapter
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-12 14:21:38 -08:00
472f4f91b9
Refactor ListProjectInvitationsCmd and ProjectInvitationResponse.
2012-12-12 09:04:43 -08:00
3661f7f992
Fix several bugs of new refactored list apis.
2012-12-11 17:37:16 -08:00
9c93fee0dc
Refactor ListProjectAccountCmd and ProjectAccountResponse.
2012-12-11 15:49:15 -08:00
c455cf9271
api: refactor common code to get classname for an api in ApiServer
...
- Refactor common code to get classname from apiname
- Fix search mechanism within api access checker adapter to:
* check permissions
* get class name for an apiname
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-11 14:17:47 -08:00
79b54e6ac1
api: Fix obj injections in ApiServer
...
- Inject classes using Inject annotation
- Don't misuse component locator
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-11 14:16:25 -08:00
6ce68b93cc
api: Fix APIAccessChecker and StaticRoleBasedAPIAccessChecker
...
- Add getCmd api interface in APIAccessChecker adapter to get cmd properties
- Add mechanism in StaticRoleBasedAPIAccessChecker to get config properties
- Add public interface to get the cmd properties for the adapter impl
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-11 14:10:36 -08:00
f4892fbb84
api: remove those evil extra newlines
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-11 13:38:32 -08:00
8735716ba0
Refactor ListProjectsCmd and ProjectResponse.
2012-12-11 12:51:08 -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
c83323fea7
api: Refactoring ListUsersCmd and UserResponse.
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-10 17:45:40 -08:00
8c4096dc59
api: Have apiserver injected by component locator
...
- Instantiate apiserver by injection, so all its entities are also created and injected
- Make the constructor protected
Thanks to Alex for helping out on this one.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-10 17:38:44 -08:00
2146687112
api: initialize vars in constructor of StaticRoleBasedAPIAccessChecker
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-10 17:28:06 -08:00
151a7643ce
api: Don't silently fail apiserver instance initialization
...
- ApiServer instance assumes cloudstartup servlet will initialize it
- Check and log if initialization fails
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-10 16:27:33 -08:00
8fbbc76466
api: minor fixes in ApiServlet
...
- Reusing local variable for string splitting/processing
- Fix comments
- Fix indentations
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-10 16:19:40 -08:00
293665fafb
api: Add license headers for APIAccessChecker and StaticRoleBasedAPIAccessChecker
...
- Fix license headers
- Fix tabs, trailing whitespaces
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-10 15:29:33 -08:00
1cf8b86ce5
api: Load InstanceGroupJoinDao to component Library
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-10 15:17:07 -08:00
bba96254f5
Refactoring ListVMGroupsCmd and InstanceGroupResponse.
2012-12-10 13:59:20 -08:00
238c55fb6e
CLOUDSTACK-596 : DeployVM command takes a lot of time to return job id Issue happens while deploying VM in advanced zone and 'networkids' parameter is not passed to deployVM command. In this case CS tries to identify a default guest network to be used for deploying VM. This logic is not optimized and latency increases with increase in user accounts and guest networks. Optimized logic for getting default network.
...
Signed-off-by: Koushik Das <koushik.das@citrix.com>
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2012-12-10 15:02:53 +05:30
e398b1e47a
api: Refactor command and response classes to org.apache.cloudstack.api.*
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-07 19:23:24 -08:00
af28c06998
api: move and group all under command, org.apache.cloudstack.command.*
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-07 18:30:54 -08:00
30941c2d31
api: Refactoring ListEventsCmd and EventResponse, and create Event db view.
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-07 16:54:45 -08:00
57c9b4c6b1
Figured out how to add annotations to jackson
2012-12-07 15:21:22 -08:00
41268d1237
api: Fix test failure in cloud-server
...
Added newly added dao class as part of list api optimizations to be picked up
by the locator.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-07 15:06:51 -08:00
acf7afd7f5
api: Refactor ResourceTagResponse and ListTagsCmd, add db view for ResourceTag.
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-07 09:57:52 -08:00
8a313d7f84
api: SecurityGroupResponse and SecurityGroupRuleResponse refactoring
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 16:04:48 -08:00
eba353099e
api_refactoring: Fix build issue with api_refactoring branch.
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 15:00:48 -08:00
da6e81aa21
api_refactoring: Fix build issues and incorrect imports
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 13:48:20 -08:00
089db9c631
api_refactor: capacity, hypvsr, alert and cert apis
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 11:25:56 -08:00
780eb95830
api_refactor: swift, ldap and vlan apis to admin pkg
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 11:13:46 -08:00
28305904e8
api_refactor: move cluster apis to admin package
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 11:04:24 -08:00
6c2ed5cb66
api_refactor: move pod apis to admin pkg
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 11:02:57 -08:00
e763fd7d36
api_refactor: move userkeys api to admin pkg
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 10:59:26 -08:00
1f1ac79a6c
api_refactor: move disk and service offering to admin pkg
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 10:53:42 -08:00
ecc8249365
api_refactor: move cfg admin apis
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 10:50:26 -08:00
ab4fac54e5
api_refactor: move admin level domain apis to admin pkg
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 10:44:40 -08:00
c3853677c5
api_refactor: move zone apis to admin pkg
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 10:41:10 -08:00
7f61d29c37
api_refactor: move zone and hypervisor user level apis to appropriate pkg names
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 10:36:26 -08:00
cc386b791b
api_refactor: move storagepool api to admin pkg
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 10:32:58 -08:00
163fe7b8c3
api_refactor: move systevm apis to admin pkg
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 10:28:37 -08:00
1b1d91dc4f
api_refactor: move admin level account apis to admin pkg
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 10:25:20 -08:00
2a7fa674c7
api_refactor: Move host apis to admin pkg
...
- Moved host related apis to admin pkg
- Change namespace to org.a.cs.api, fix mappings in commands-prop.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 10:21:10 -08:00
7fcfcdf91e
Summary: check-in for L4-L7 network services in the shared network in
...
the advanced zone
Details:
1). Added validation to check the Vlan Id specified in the createNetwork()
does not overlap with any of the vlan's used by isolated networks or
shared networks in the zone.
2). state change for shared network with services to go to 'Setup' state
on network shutdown instead of 'Allocated'
Bug ID:CLOUDSTACK-312 enable L4-L7 network services in the shared network in the advanced zone
2012-12-06 13:06:18 +05:30
d4c604cfd8
Summary: partical check-in for L4-L7 network services in the shared
...
network in the advanced zone
Details : ensure that CIDR specified for shared network does not overlap with any
CloudStack generated CIDR's for isaolated guest networks when using
external networking devices
Bug ID:CLOUDSTACK-312 enable L4-L7 network services in the shared network in the advanced zone
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
2012-12-06 12:29:38 +05:30
0de5a145e4
Summary: partical check-in for L4-L7 network services in the shared
...
network in the advanced zone
Summary: change 'shared network' in advanced zone with L4-L7 services to go through network
implement phase. Add ACL checks to associate IP to shared network in the
advanced zone
Bug ID:CLOUDSTACK-312 enable L4-L7 network services in the shared network in the advanced zone
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
2012-12-06 11:55:19 +05:30
28bbf6c527
Summary: partical check-in for L4-L7 network services in the shared network in the advanced zone
...
Details:
- changed associateIPAddr API to accept shared network Id and account Id. Ip will be owned by tuple (account Id, network Id)
- chaged createNetwork API to accpet CIDR when network offering has external networking device providers
Bug ID:CLOUDSTACK-312 enable L4-L7 network services in the shared
network in the advanced zone
2012-12-06 11:55:19 +05:30
b0ce8fd4ff
api: Optimize and improve api, db call perfomance
...
This is part 1 of list API refactoring. Commands covered:
listVmsCmd, listRoutersCmd Response covered:
UserVmResponse, DomainRouterResponse. DB views created:
user_vm_view, domain_router_view.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-05 20:06:20 -08:00
c59de6cbde
api_refactor: router apis for admin pkg
...
- Fix missing api mapping in commands.prop
- Refactor package namespace
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-05 15:23:31 -08:00
ceddaf122c
api_refactor: refactor user apis
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-05 14:55:58 -08:00
ba8e61bfb5
api_refactoring: for network api refactoring move interfaces so it works
...
Move ExternalNetworkDeviceManager to cloud-api, as server depends on cloud-api
The api refactoring of one of the api required this interface
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-05 14:53:16 -08:00
e07106db0b
api_refactor: usage apis to admin.usage pkg
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-05 14:31:31 -08:00
55364478e5
api_refactor: move vpn related apis to user.vpn
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-05 14:24:26 -08:00
c24118e7e8
api_refactor: move network api for admin pkg from cloud-server to cloud-api
...
- Remove a lot of junk
- Fix commands.prop.
- Move apis from cloud-server to cloud-api
- Rename with org.apache.cloudstack namespace
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-05 14:06:13 -08:00
678181ac35
api_refactor: move network api for admin pkg
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-05 13:59:54 -08:00
dd5a36fcd2
api_refactor: refactor for autoscale apis
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 11:42:07 -08:00
2121fbd469
api_refactor: refactor network apis for admin pkg
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 11:38:40 -08:00
feb342ad23
api_refactor: refactor autoscale apis
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 11:30:37 -08:00
456b852c0c
api_refactor: refactor loadbalancer apis
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 11:25:20 -08:00
8773fc2a55
api_refactor: refactor volume apis
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 11:20:48 -08:00
25b5aadb4e
api_refactor: refactor firewall apis
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 11:17:06 -08:00
5cd1f4b6c2
api_refactor: ip address apis refactoring
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 11:14:06 -08:00
46ed598894
api_refactor: resource (limit) apis, move capability and cloud identifier
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 11:11:16 -08:00
7f9c490b5a
api_refactor: move listzones and listcapabilities to dc
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 11:06:34 -08:00
a34fc1f1a7
api_refactor: move listcapabilites to dc
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 10:44:17 -08:00
658cf56120
api_refactor: move diskoffering to offering
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 10:38:53 -08:00
6fe1b5f9b0
api_refactor: move diskoffering to offering
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 10:37:14 -08:00
1b8dc65f3a
api_refactor: refactor user (vpn) apis
...
- Fix refactored apis, mappings in commands*.in
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 10:27:47 -08:00
cabbc7bd7d
api_refactor: refactor disk api (only user)
...
- Fix refactored apis, mappings in commands*.in
- Fix comments etc.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 00:31:03 -08:00
ea79162615
api_refactor: refactor configuration api for normal user
...
- Fix refactored apis, mappings in commands*.in
- Fix comments etc.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 00:29:17 -08:00
28df57ec75
api_refactor: refactor serviceoffering apis
...
- Fix refactored apis, mappings in commands*.in
- Fix comments etc.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 00:27:19 -08:00
73d1099c76
api_refactor: rename sg to securitygroup
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 00:25:22 -08:00
1e51d6c1ab
api_refactor: refactor guest os (guest) apis
...
- Fix refactored apis, mappings in commands*.in
- Fix comments etc.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 00:19:39 -08:00
b673c21174
api_refactor: refactor job (async jobs) apis
...
- Fix refactored apis, mappings in commands*.in
- Fix comments etc.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 00:12:17 -08:00
7ac48798b4
api_refactor: refactor event apis
...
- Fix refactored apis, mappings in commands*.in
- Fix comments etc.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 00:05:54 -08:00
add1b9b055
api_refactor: refactor register apis
...
- Split register apis across template, iso and ssh pkgs
- Fix refactored apis, mappings in commands*.in
- Fix comments etc.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-03 23:54:19 -08:00
316e7f226a
api_refactor: refactor tag apis
...
- Fix refactored apis, mappings in commands*.in
- Fix comments etc.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-03 23:48:48 -08:00
37cd76ee81
api_refactor: refactor ssh apis
...
- Fix refactored apis, mappings in commands*.in
- Fix comments etc.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-03 23:44:14 -08:00
9a0df30766
api_refactor: refactor account apis
...
- Fix refactored apis, fix mappings in commands*.in
- Fix comments etc.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-03 23:42:13 -08:00
46353e0916
api_refactor: refactor vmgroup apis
...
- Fix refactored apis, fix mappings in commands*.in
- Fix comments etc.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-03 23:35:30 -08:00
a033cf1bfc
api_refactor: refactor snapshot apis
...
- Fix refactored apis, fix mappings in commands*.in
- Fix comments etc.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-03 23:19:12 -08:00
0df9538fb7
api_refactor: refactor security group (sg) apis
...
- Fix refactored apis, fix mapping in commands*.in
- Fix comments etc.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-03 23:11:17 -08:00
3e0b2164be
api_refactor: refactor template apis
...
- Fix refactored apis, fix mapping in commands*.in
- Fix comments etc.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-03 23:05:44 -08:00
e0b4430070
api_refactor: refactor iso apis
...
- Fix refactored apis, fix mapping in commands*.in
- Fix comments etc.
- Note: copyIso uses copyTemplate, refactor copyTemplate
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-03 23:01:29 -08:00
47ae62e44a
api_refactor: refactor network apis
...
- Fix refactored apis in commands*.in
- Fix comments etc.
- Expand tabs, remove trailing whitespace
- Fix trailing whitespaces for all *.java
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-03 22:47:07 -08:00
ac1ea7616a
api_refactor: refactor vpc apis
...
- Fix refactored apis in commands*.in
- Fix comments etc.
- Expand tabs, remove trailing whitespace
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-03 21:44:40 -08:00
6fc3bc3760
api_refactor: refactor vpn and vm apis
...
- Refactor VPN and VM APIs to admin and user pkgs
- Names space, org.apache.cloudstack
- Fix refactored apis in commands*.in
- Fix comments etc.
- Expand tabs, remove trailing whitespace
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-03 21:27:02 -08:00
5edfc2760a
refactor: remove redundant imports, fix trailing chars
2012-12-03 13:54:37 -08:00
7857b1f62a
CLOUDSTACK-573: check if external provider enabled, only when finalize the service/provider list for the network
2012-11-30 13:07:01 -08:00
1aa4ad6a3c
CLOUDSTACK-572: Advance SG enabled zone - allow deploying vm in SG disabled Account specific networks
...
Conflicts:
server/src/com/cloud/vm/UserVmManagerImpl.java
2012-11-30 12:47:37 -08:00
a2306f4917
some more poc work
2012-11-29 16:10:09 -08:00
073863249a
Some ACL POC work
...
Conflicts:
server/src/com/cloud/api/ApiDispatcher.java
2012-11-29 16:09:47 -08:00
6036f73725
Removed that darn exceptions when cloudstack is running in windows. It's a simple or check that was written as an and check
2012-11-29 13:35:23 -08:00
a28f4cac3c
HttpClient needs releaseConnection method call
...
reviewboard: https://reviews.apache.org/r/8186/
Signed-off-by: Hugo Trippaers <trippie@gmail.com>
2012-11-29 20:23:30 +01:00
e4a5173199
CLOUDSTACK-505: Do not log the command response object for the createSSHKeyPair command.
...
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2012-11-29 12:24:42 -05:00
5724f1ca96
fix build
2012-11-26 11:49:51 -08:00
e436d4327f
create volume from template unit test is passed
2012-11-26 11:42:34 -08:00
55447c2572
CLOUDSTACK-424: Fix NPE while updating user data
...
Replace newlines in userdata only when it's not null.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-11-21 18:27:11 +05:30
550f4fbcdc
create template/primary data store is done
2012-11-20 18:57:19 -08:00
573d13dd7c
starting unit test
2012-11-20 18:57:19 -08:00
2a0d0104bd
maven : declare mysql-connector-java dependency into dependencyManagement section of cloudstack pom and use the version 5.1.21 only
...
Signed-off-by: Hugo Trippaers <trippie@gmail.com>
2012-11-20 09:27:07 +01:00
c8832cd4b6
Commit https://reviews.apache.org/r/8075/
...
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
2012-11-19 12:02:26 +01:00
88180fc139
Summary: Direct template imaging for CLVM, bypass copy template to primary
...
Detail: Because of the way most other primary storage types work with cloudstack
(i.e. backing stores) CLVM actually copies the template to a local logical
volume on primary storage, then uses that. This causes all of your primary
storage to be littered with a copy of every template used. Since we're not
using these, dump the template direct to the newly created logical volume.
This is faster as well since the template is sparse; we're not creating a fat
template on primary storage and then copying that to a logical volume when we
deploy from template.
BUG-ID: CLOUDSTACK-508
Bugfix-for: 4.1
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1353221260 -0700
2012-11-17 23:47:39 -07: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
264f777a2d
Remove AutoScale entities while deleting autoscaled loadbalancer.
2012-11-16 12:56:32 +05:30
aea87da410
Autoscale:Sending the Counter params as list
...
Conflicts:
server/src/com/cloud/api/ApiResponseHelper.java
2012-11-16 11:07:24 +05:30
affc162556
AutoScale: Fixing issues that occurred during rebase with master
2012-11-16 11:04:37 +05:30
527b5c8ee2
Autoscale: Supporting network element independent counter parameters Reviewed-By:Devdeep
2012-11-16 10:57:00 +05:30
35b0e086d4
enable Autoscale VMs to be named as Autoscale-LB-<lbname>
2012-11-16 10:56:59 +05:30
57416188a2
Enabling aUtoscale VMs to be provisioned in a loadbalancer's network
2012-11-16 10:56:59 +05:30
bf1e6ed991
CS-15644-Autoscale: Implemented UUIDs for templateId-serviceOff Reviewed-By:Vijay
2012-11-16 10:56:58 +05:30
3e32a29048
Autoscale:Changes for addressing AutoScale bugs CS-15930, CS-15931, CS-15934, CS-15935
2012-11-16 10:56:58 +05:30
c1b4bc448c
AutoScale. Check vm group's interval during update with existing policiy's duration
2012-11-16 10:56:58 +05:30
d2155890cc
CS-16168:AutoScale- Deletion of Account doesn't delete the AutoScale LB rule
2012-11-16 10:56:57 +05:30
58db4d0d88
CS-15729:AutoScale. Aligning the NetScaler response time counter, and correcting duration check against interval
2012-11-16 10:56:57 +05:30
68fc64cfe9
CS-16159-Fixing the license headers
2012-11-16 10:56:56 +05:30
6daff57fdd
CS-15744:Incorrect error message with disable autoscaleVmgroup operation- patch sent by Deepak Garg (deepakgarg.iitg@gmail.com)
2012-11-16 10:56:45 +05:30
e9a4a7b1e6
CS-15745:Incorrect error message with update autoscaleVMgroup :patch-sent by Deepak Garg (deepakgarg.iitg@gmail.com)
2012-11-16 10:56:45 +05:30
f96810b9ae
AutoScale. Adding default counters
...
Conflicts:
server/src/com/cloud/server/ConfigurationServerImpl.java
setup/db/create-schema.sql
setup/db/db/schema-304to305.sql
2012-11-16 10:56:44 +05:30
dda4d39b55
AutoScale changes in Apache master
2012-11-16 10:56:44 +05:30
7a3ffb47e6
Add pipeline concept to RPC facility, fix javelin build issue
2012-11-15 16:15:24 -08:00
4c86b1545d
CLOUDSTACK-424: Update userdata should propagate to VR
...
The code that would propage userdata to router, when updateVirtualMachine api
is called, was missing. As per the docs [0], userdata should be a base64 encoded
string upto 2KB which is put on domr's html directory adn using HTTP GET the
userdata information can be obtained from the domr.
The updateVirtualMachine api [0] would accept a base64 encoded string
and decoded and put into the domr's /var/www/html/userdata/<uservm ip>/user-data
file. The operation does not require the VM to be in stopped state, though it is
advised to stop and call this api in case the user vm has a script which gets
the userdata information from domr while starting.
For example, this script can be used to fetch the data:
server_ip=$(grep dhcp-server-identifier /var/lib/dhclient-eth0.leases | tail -1 | awk '{print $NF}' | tr '\;' ' ')
wget http://${server_ip}/latest/user-data
This feature can be useful, for example to use into puppet facts [1], or to do
automation and horizontal scaling etc. based on userdata.
[0] http://incubator.apache.org/cloudstack/docs/api/apidocs-4.0.0/domain_admin/updateVirtualMachine.html
[1] http://geek.jasonhancock.com/2011/11/09/cloudstack-userdata-into-puppet-facts/
BUG-ID : CLOUDSTACK-424
Reviewed-by: Rohit Yadav <bhaisaab@apache.org>
Reported-by: Nick Wales
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-11-15 18:43:51 +05:30
fe460fac43
Upgrading a network that has Network offering SRX/F5 inline mode to a network offering that has all service provided by VR does not give proper error message: Hence correcting the error message
2012-11-15 13:52:54 +05:30
2cae511464
Connnect event bus to messaging layer
2012-11-14 19:28:59 -08:00
2914985837
Fixed json response to return "size" parameter (resources count in the system) when pageSize=0 is specified
2012-11-14 15:01:48 -08:00
6d9cafbf35
DeployVm: when SG enabled network is passed to the command, but no SG list is defined in the request, add the vm to SG enabled network automatically
...
Conflicts:
server/src/com/cloud/vm/UserVmManagerImpl.java
2012-11-14 15:01:35 -08:00
74622a4dc3
Fixed listNetworks for the case when a) caller is an admin 2) projectId=-1 is specified - admin wasn't able to list networks belonging to regular users' projects
2012-11-14 14:59:51 -08:00
499a28cb43
Removed redundant imports from VolumeHostDao
...
Signed-off-by: Laszlo Hornyak <lhornyak@redhat.com>
Signed-off-by: Prasanna Santhanam <tsp@apache.org> 1352883689 +0530
2012-11-14 14:31:29 +05:30
b38d9b82b6
CloudStack messaging refactoring skeleton
2012-11-13 17:59:39 -08:00
67490f75e6
Display the reason which failed certificate generation fails
...
within cloud.server.ConfigurationServerImpl.generateDefaultKeystore
Description:
The reason which failed in generation of the certificate is not displayed now.
At that time, IOException which does not include the reason is raised.
In order to solve the problem quickly, the reason should be included in the message.
(Now)
WARN [cloud.server.ConfigurationServerImpl] (main:) Would use fail-safe keystore to continue.
java.io.IOException: Fail to generate certificate!
at com.cloud.server.ConfigurationServerImpl.generateDefaultKeystore(ConfigurationServerImpl.java:490)
(Fix)
WARN [cloud.server.ConfigurationServerImpl] (main:) Would use fail-safe keystore to continue.
java.io.IOException: Fail to generate certificate!: sudo: sorry, you must have a tty to run sudo
at com.cloud.server.ConfigurationServerImpl.generateDefaultKeystore(ConfigurationServerImpl.java:490)
Testing Completed:
mvn clean install
mvn -pl :cloud-client-ui jetty:run
And generation of the certificate was made to fail, checked it.
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2012-11-09 14:25:44 -05:00
f365426b99
temp changes
2012-11-08 23:37:30 +05:30
d118a3d764
Fixed the bug in xml response serializing (introduced while resolving merge conflict)
2012-11-07 17:17:17 -08:00
d79f1f6fdc
Replace Adapters and PluggableServices, use Spring to load them
2012-11-07 15:03:24 -08:00
453b31f3f4
Refactor ComponentLocator to be based on Spring so that legacy way of loading component can coexist with Spring
2012-11-07 15:03:23 -08:00
cea8f3bf37
Switch inject annotation to javax and let ComponentLocator to recognize both the new and original inject annotation
2012-11-07 15:03:22 -08:00
aab02e2743
Add Spring annotation to major components
2012-11-07 14:53:39 -08:00
476e771c1c
SSH key changes
2012-11-05 11:24:33 -08:00
b101dc7279
KVM agent connet:
...
* send StartupAnswer right after StartupCommand is recieved
* if post processor going wrong, send out readycommand with error message to agent, then agent will exit
2012-11-05 10:00:16 -08:00
91e68b5f2c
A bunch of .project changes again
2012-11-04 19:25:03 -08:00
d8fbb0dd13
maven: enable jvm heap size for forked surefire test processes
...
Any forked process that runs from maven surefire plugin gets it own separate
heap which may cause build issues. Patch fixes the issue by explicity args to
the surefire plugin for cloud-server.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-11-03 18:42:51 +05:30
1f458983af
CS-16310: don't process Disconnect when:
...
* attache is not forForward()
* and the Disconnect came through cluster notification event
The fix will prevent delayed AgentDisconnect cluster notification processing.
2012-11-02 10:51:39 -07:00
013102c028
CS-16611: when expunge Async job, expunge corresponding sync queue items
...
Conflicts:
server/src/com/cloud/async/AsyncJobManagerImpl.java
server/src/com/cloud/async/dao/SyncQueueItemDao.java
2012-11-02 10:51:29 -07:00
fe41325e96
ApiResponseSerializer - replaced all occurrences of string concatenation with StringBuffer.append
...
Conflicts:
server/src/com/cloud/api/response/ApiResponseSerializer.java
2012-11-02 10:50:04 -07:00
04a3c4ffdc
Removed unneeded if statement from VpcVirtualNetworkApplianceManagerImpl
2012-11-02 10:47:34 -07:00
efb5f85aad
CS-16594: when request is cancelled by the remote peer, in addition to cancelling the request, unblock the agent queue if the request is the current request
2012-11-02 10:47:24 -07:00
a5077968db
CS-16592: process handleConnectedAgent in a separate thread pool
2012-11-02 10:47:14 -07:00
3948d7d7c5
CS-16213: skip agent rebalancing when the management server doesn't own the host any more
2012-11-02 09:59:37 -07:00
62607c9a75
HandleDisconnect - don't update the DB when the disconnect event is happening as a part of MS Cluster notification
...
Reviewed-by: Frank Zhang
2012-11-02 09:59:37 -07:00
36babbfcac
CS-16213: agent LB - don't process Disconnect event from other management server in cluster, if the recipient is the future owner of the host. The disconnect will be handled during the rebalance host connection process itself.
...
Reviewed-by: Kelven Yang
2012-11-02 09:59:37 -07:00
705130e42c
CS-16499: removed useless txn.commit statement. Used to call it to ensure that the lock() on nic object will get removed even in case when we don't do the DB update. But our Transaction code does it automatic
2012-11-02 09:59:37 -07:00
597bc8c66c
CS-16499: forgot to add @DB to releaseNic() call
2012-11-02 09:59:36 -07:00
7bd7884f57
CS-16499: releaseNic - lock the nic row in the DB before checking its state. Hold the lock till the nics attributes + nicCount is updated
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
2012-11-02 09:59:36 -07: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
db6c8f0176
CLOUDSTACK-439: Fixed typos and changed direct attached to shared network IPs
2012-11-01 14:12:49 -05:00
3423c5d74f
add volume service skeleton
2012-10-30 17:34:46 -07:00
f65b268a2e
Active the testrun by default in maven
...
Exclude the tests that need a database, these should move to the
integration test phase or use an in memory database maybe.
2012-10-30 14:15:07 +01:00
bd58ceccd8
Summary: Make the authenticator responsible for encoding the password and add a SHA256 salted authenticator
...
The authenticators now have an encode function that cloudstack will use to encode the user supplied password before storing it in the database. This makes it easier to add other authenticators with other hashing algorithms. The requires a two step approach to creating the admin account at first start as the authenticators are only present in the management-server component locator.
The SHA256 salted authenticator make use of this new system and adds a hashing algorithm based on SHA256 with a salt. This type of hash is far less susceptible to rainbow table attacks.
To make use of these new features the users password will be sent over the wire just as he typed it and it will be transformed into a hash on the server and compared with the stored password. This means that the hash will not go over the wire anymore.
The default authenticator in components.xml is still set to md5 for backwards compatibility. For new installations the sha256 could be enabled.
2012-10-30 12:56:56 +01:00
d70154609a
Wire up injection for dynamically constructed objects
2012-10-29 16:16:07 -07:00
a2d50c7e43
fix build
2012-10-29 12:55:15 -07:00
ce60cfee85
CS-16585: cloudstack 3.0 API - listProjects API - throw an API error if account is specified but domain is not.
2012-10-29 11:19:29 -07:00
e24456f487
[CLOUDSTACK-415] Workaround this problem for now
2012-10-29 09:26:14 +01:00
e59726ad95
[CLOUDSTACK-359] Hook up the other side of the event propagation
2012-10-26 14:25:14 +02:00
a388a748d0
Added a database creator class. not working yet. Edison will look at it
2012-10-25 17:34:54 -07:00
7b7f4cd1fd
CLOUDSTACK-409: ThreadLocal Transaction and its db connection got reset for user managed db connnection, causing ClusterHeartBeat thread frequently trying to get db connection. Add unit test to test user managed transaction.
2012-10-25 13:06:50 -07:00
f92ce72639
Correct dependency errors
2012-10-24 11:12:40 -07:00
059f605ace
add more interfaces
2012-10-22 17:50:51 -07:00
b57be3389e
add apidocs/devcloud projects
2012-10-21 00:01:47 -07:00
8e59b3acfb
Architecture refactoring - Stateless management server - Spring Framework initiatives, add missing files
2012-10-19 15:32:24 -07:00
214bbf3ebd
CLOUDSTACK-279: fixed deleteProject when executed by the regular user. Always pass System account as a caller when do account cleanup
...
Conflicts:
api/src/com/cloud/api/commands/DeleteRemoteAccessVpnCmd.java
server/src/com/cloud/network/element/CiscoNexusVSMElement.java
server/src/com/cloud/network/element/ElasticLoadBalancerElement.java
server/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java
server/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java
server/src/com/cloud/network/element/NetscalerElement.java
server/src/com/cloud/network/element/OvsElement.java
server/src/com/cloud/network/element/VpcJuniperSRXExternalFirewallElement.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/network/vpc/VpcManagerImpl.java
server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
server/src/com/cloud/storage/StorageManager.java
2012-10-17 17:26:19 -07:00
c40aac0add
Add Mock managers for Regio API server
2012-10-17 17:02:13 +05:30
f0f33bf4da
Added Mock ApiServer, Regions API calls with api keys
2012-10-17 14:16:36 +05:30
a9fab0526b
CLOUDSTACK-348: decrement resource count when the network gets removed
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
2012-10-16 16:18:36 -07:00
9d07ad8ecb
CLOUDSTACK-304: default number of concurrent snapshots is NULL (unlimited) - to provide backwards compatibility for existing customers.
...
Conflicts:
setup/db/db/schema-305to306.sql
2012-10-16 11:25:05 -07:00
3f5733cea7
CS-16412: fixed count for following commands:
...
listVlanIpRanges
listOsCategories
listOsTypes
listSystemVms
listPhysicalNetworks
listCounters
listConditions
listAutoScalePolicies
listAutoScaleVmProfiles
listAutoScaleVmGroups
listConfigurations
listStoragePools
listClusters
listPods
listInstanceGroups
listSSHKeyPairs
listHypervisorCapabilities
listNetworkServiceProviders
listVpnCustomerGateways
listVpnGateways
listVpnConnections
listProjects
listProjectAccounts
listProjectInvitations
listTrafficTypes
Conflicts:
api/src/com/cloud/api/commands/ListAutoScalePoliciesCmd.java
api/src/com/cloud/api/commands/ListAutoScaleVmGroupsCmd.java
api/src/com/cloud/api/commands/ListAutoScaleVmProfilesCmd.java
api/src/com/cloud/api/commands/ListConditionsCmd.java
api/src/com/cloud/api/commands/ListCountersCmd.java
api/src/com/cloud/api/commands/ListVpnConnectionsCmd.java
api/src/com/cloud/api/commands/ListVpnCustomerGatewaysCmd.java
api/src/com/cloud/api/commands/ListVpnGatewaysCmd.java
api/src/com/cloud/network/as/AutoScaleService.java
server/src/com/cloud/network/as/AutoScaleManagerImpl.java
server/src/com/cloud/network/as/dao/CounterDao.java
server/src/com/cloud/network/as/dao/CounterDaoImpl.java
server/src/com/cloud/projects/ProjectManagerImpl.java
server/src/com/cloud/server/ManagementServerImpl.java
2012-10-15 18:16:59 -07:00
0a7d03c90b
javelin is revived
2012-10-15 15:42:59 -07:00
112143def6
add templateprofile
2012-10-15 14:10:49 -07:00
1d458c7a2d
CLOUDSTACK-347: ipAddressResponse/NetworkResponse API - return vlan info only when the caller is ROOT admin
2012-10-15 11:39:38 -07:00
8f2d9a09e5
CLOUDSTACK-332: intermediate checkin fixing count parameter in listCommands
...
Fixes the count in commands:
listVolumes
listVirtualMachines
listSnapshots
listRouters
listFirewallRules
listPortForwardingRules
listLoadBalancerRules
listIpForwardingRules
listAccounts
listUsers
listDomains
listDomainChildren
listPublicIpAddresses
listAlerts
listAsyncJobs
listRemoteAccessVpns
listVpnUsers
listTags
listPrivateGateways
listNetworkACLs
listStaticRoutes
Conflicts:
api/src/com/cloud/api/commands/ListVMsCmd.java
api/src/com/cloud/api/commands/ListVolumesCmd.java
api/src/com/cloud/network/lb/LoadBalancingRulesService.java
server/src/com/cloud/network/firewall/FirewallManagerImpl.java
server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
server/src/com/cloud/network/rules/RulesManagerImpl.java
server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
server/src/com/cloud/network/vpc/VpcManagerImpl.java
server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
server/src/com/cloud/tags/TaggedResourceManagerImpl.java
2012-10-12 13:58:59 -07:00
5d7509e964
Merge DB query builders from master
2012-10-11 18:24:33 -07:00
5fee891162
merge from master
2012-10-11 17:42:25 -07:00
513b680d96
CLOUDSTACK-316: if public network is not specified, set to guest network
2012-10-11 16:46:23 -07:00
6dd5c3fd42
CLOUDSTACK-70: Improve restart network behaviour for basic network
...
If cleanup=true, network elements and resources are shutdown and
reimplemented. Else, shutdown/reimplementation is skipped. Enabled
cleanup checkbox in CS UI.
For both cases, VRs are only deployed for Pods with no running
or starting VRs and Pods having running or starting user vms.
New DAO helpers introduced:
HostPodDao: listByDataCenterIdVMTypeAndStates
DomainRouterDao: listByPodId and listByPodIdAndStates
VMInstanceDao: listByPodId and corrected definition of listByTypeAndState
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-10-11 19:33:26 +05:30
339aa41442
CLOUDSTACK-304: Synchronization support for createSnapshot command - don't sent more than "concurrent.snapshots.threshold.perhost" createSnapshots commands to the backend host.
...
Conflicts:
core/src/com/cloud/async/AsyncJobVO.java
core/src/com/cloud/async/SyncQueueVO.java
server/src/com/cloud/api/ApiDispatcher.java
server/src/com/cloud/api/ApiServer.java
server/src/com/cloud/async/AsyncJobManagerImpl.java
server/src/com/cloud/async/SyncQueueManager.java
server/src/com/cloud/async/SyncQueueManagerImpl.java
server/src/com/cloud/async/dao/SyncQueueDao.java
server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java
server/test/com/cloud/async/TestSyncQueueManager.java
setup/db/create-schema.sql
2012-10-10 13:40:00 -07:00
c36744a18c
Fixed deployVR - used to fail in case when system.vm.default.hypervisor was set to not NULL value
2012-10-10 13:05:39 -07:00
839929b9b2
Fixed lineendings and trailing whitespaces in a bunch of files
...
Conflicts:
core/src/com/cloud/async/SyncQueueItemVO.java
core/src/com/cloud/async/SyncQueueVO.java
server/src/com/cloud/async/dao/SyncQueueDaoImpl.java
server/src/com/cloud/async/dao/SyncQueueItemDaoImpl.java
2012-10-09 17:17:36 -07:00
290e8954f7
Removed more unused imports in Snapshots code
...
Conflicts:
server/src/com/cloud/storage/dao/SnapshotScheduleDao.java
2012-10-09 17:07:03 -07:00
823f0c9669
Fixed ipAssoc and createNetworkACL (for vpc) commands - didn't work in Project scenario
...
Conflicts:
server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
2012-10-09 16:26:26 -07:00
43b406279a
listTemplates/listIsos - template filter "all" can be specified by admin only. Throw an error when user tries to use it
2012-10-09 16:23:05 -07:00
c9aa9a5557
CLOUDSTACK-287: don't allow API call against system account (adding users to system account is prohibited; can't delete/update System account)
...
Conflicts:
server/src/com/cloud/user/AccountManagerImpl.java
2012-10-09 09:37:27 -07:00
ffa5276222
Fixed CLOUDSTACK-287
...
1) Always fail to authenticate system user.
2) DB - always create system user with RANDOM not null password
3) Don't allow modifying (setting api/secretKeys, etc) system user via API
Conflicts:
server/src/com/cloud/user/AccountManagerImpl.java
setup/db/db/schema-305to306.sql
2012-10-09 09:37:27 -07:00
a5bca0999a
CLOUDSTACK-118 Status of host resorce stuck in ErrorInMaintenance
2012-10-08 14:05:05 +08:00
436960d2aa
Fixed unittest
2012-10-05 15:38:20 -07:00
fa81f27254
CLOUDSTACK-271: when check for vnet conflicts against existing physical networks, skip the networks with null vnet ranges
2012-10-05 15:10:31 -07:00
be2017849a
CLOUDSTACK-84: fixed NPE that used to happen on API layer when list resource of the project was called when project was going through removal process.
2012-10-05 15:10:31 -07:00
5cd7fb8408
CLOUDSTACK-121: Fixed "Incorrect username/domainId login causes NullPointerException "
2012-10-05 11:42:04 -07:00
15f6fbbee4
CLOUDSTACK-251 :
...
when host is reconnected, CS try to make sure the host can access primary storage,
CS only do this when primary storage is UP, and even host cannot access primary storage,
that is okay, do not throw exception, just print a warning message
2012-10-04 11:31:53 -07:00
4e1f3f9410
CS-16426 For network offerings with IP conserved mode off, LB/PF/StaticNAT rule creation fails if the first rule is firewall
...
fixes, accidental modification of network services map object corresponding to a public IP
2012-10-03 17:18:00 -07:00
89779cceb8
Merge branch 'master' into regions
...
Conflicts:
api/src/com/cloud/api/ApiConstants.java
api/src/com/cloud/api/ResponseGenerator.java
client/tomcatconf/commands.properties.in
core/src/com/cloud/user/UserVO.java
server/src/com/cloud/api/ApiResponseHelper.java
server/src/com/cloud/configuration/DefaultComponentLibrary.java
server/src/com/cloud/user/AccountManagerImpl.java
setup/db/create-schema.sql
2012-10-03 14:09:01 +05:30
78c08de467
Removed unused imports (that caused a dependency on xapi)
2012-10-02 10:30:26 -07:00
b7a93be47e
Added license header to Upgrade40to41.java
2012-10-02 13:06:59 -04:00
f16b5103d8
Merge some stuff from maven-waf branch into master
2012-10-01 15:04:08 -07:00
93aaa5f975
Provide an (for now) empty upgrade path so the server will start.
2012-10-01 14:07:24 -07:00
aa6355ffe6
Updated master to 4.1.0
...
mvn release:update-versions -DautoVersionSubmodules=true -Dnonoss -P
client,deps,developer -DdevelopmentVersion=4.1.0-SNAPSHOT
2012-10-01 11:00:55 -07:00
11fe086ada
Fixing CLOUDSTACK-226: don't allow physical networks with overlaping vnet ranges, belong to the same zone. Fixed create and update physical network code
2012-09-28 13:11:20 -07:00
dc64fcab93
Removed unused code that was commented out in SnapshotManagerImpl- you can alway retrieve it back from the history if needed
...
Conflicts:
server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
2012-09-27 11:13:37 -07:00
efab2f413b
Removed more unused imports in Snapshots code
...
Conflicts:
server/src/com/cloud/storage/dao/SnapshotScheduleDao.java
server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java
2012-09-27 11:12:53 -07:00
c27b44e7f7
Removed unused imports from snapshot manager
2012-09-27 10:50:48 -07:00
6875f48966
Validate port ranges in PF rule only when startPort != endPort in private or public range
2012-09-27 10:50:30 -07:00
bbbccc0a7b
Port ranges for PF rules: public port start should be equal to ending port start; the same applies to end ports
2012-09-27 10:50:04 -07:00
4fcf64dd74
updated regions branch with changes from master
2012-09-27 17:04:59 +05:30
39d394a8e8
Propogate Domain and User commands
2012-09-27 16:44:12 +05:30
daeac9ec57
CLOUDSTACK-215 CPVM load balance didn't work, VNC console sessions go to one CPVM and ignore other CPVMs
2012-09-27 13:03:09 +08:00
3c25d0ea67
CLOUDSTACK-202 Can't create VM from ISO, when in VPC
...
Signed-off-by: Mice Xia <mice_xia@tcloudcomputing.com>
2012-09-27 10:07:15 +08:00
6540ff8fa1
bug CLOUDSTACK-198: VPN user add, on failure remove user currently being added only, other users will remain in Add state
2012-09-26 13:54:49 +05:30
2da5b448a1
CLOUDSTACK-204 Setting global config 'consoleproxy.service.offering' causes mgmt failed to start (add exception handling)
2012-09-26 14:51:17 +08:00
7e75140537
CLOUDSTACK-204 Setting global config 'consoleproxy.service.offering' causes mgmt failed to start
2012-09-26 14:05:37 +08:00
51041e4f77
Fixed security problem in listAccounts call (regular user could see other accounts' info when domainId was passed in to listAccounts call)
2012-09-25 10:44:22 -07:00
a82ee7715e
CLOUDSTACK-191: Update checking for updateCustomerGateway
...
Reviewed-by: Anthony Xu
Conflicts:
server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
2012-09-24 17:47:09 -07:00
a01304e65b
CLOUDSTACK-123: fix NPE
2012-09-18 16:43:05 -07:00
955cbd97bc
CLOUDSTACK-10 Deleting a disconnected primary storage results in partial removed state
2012-09-18 11:18:44 +08:00
387c6fc135
Merge branch 'master' into javelin
2012-09-17 15:31:37 -07:00
16c1fd9288
CLOUDSTACK-116 Guest Network created in a Sub Domain which doesn't have a network domain suffix, is assigned the network domain suffix of the zone instead of that of the Parent domain of the Sub domain
2012-09-17 21:23:41 +08: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
db9cc97ab3
Brought over new changes from master
2012-09-13 11:43:22 -07:00
06b7d80fec
latest changes
2012-09-13 11:31:54 -07:00
cfc2b85651
Removing eclipse .classpath and .project files as they are configured to ant build and adding the entries into .gitignore to stop further comitting of the files
...
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2012-09-13 14:18:14 -04:00
a9559cbb67
When a VM is force deleted and the host is not available then CS simply marks the state in db as "Destroyed/Expunging". The VM is still running on the host and once it becomes available again there is a discrepancy in state of the VM. In this scenario the VM is removed from the host when the next full cluster sync happens.
2012-09-13 16:34:53 +05:30
5532f58bbc
remove cloud.com license headers
2012-09-13 12:34:32 +08:00
55bcfaf805
CLOUDSTACK-88 Cannot listVM by vpcId which is required by VPC UI
2012-09-13 11:21:11 +08:00
fe8a2992a2
Elimiate mystery guestIp in IpAddressTO
...
Nobody can explain why it's there...
Also fix wrong return result of several empty network element callbacks
2012-09-12 15:42:48 -07:00
a56631bc66
bug CS-15278: Added global setting login.attempts.allowed which defines the maximum incorrect password attempts allowed.
...
Also after the maximum attempts are reached the user account is disabled
2012-09-12 19:35:24 +05:30
cd77e42a71
Closing open transactions from SecurityGroupWorkDao
...
reviewed-by : Prachi Damle
2012-09-12 18:48:33 +05:30
2307117a24
Fixed unittest
2012-09-11 17:38:31 -07:00
9445c9e73b
CS-16187: don't allow vpc offering creation with unsupported services (Firewall, SecurityGroup)
...
Conflicts:
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-09-11 17:38:30 -07:00
331598243c
Replaced tabs with spaces in VirtualNetworkApplianceManagerImpl (tabs were used mostly in network stats related code)
2012-09-11 17:38:29 -07:00
63ab0c2728
Keep the instance-id and vm-id values prior to Acton, use UUID for VMs created poast Acton.
2012-09-11 17:38:28 -07:00
1c96ef41c1
CS-14796: Error out with InvalidParameterValueException in UserVmManagerImpl if userdata is not base64 encoded.
2012-09-11 17:38:27 -07:00
4a8ffe34e2
CS-16239: don't try to pull key information if the key was removed in the system
...
As a part of the commit, also checking deleteSshKeyPair name - admin was unable to delete the key on behalf of another user
Conflicts:
server/src/com/cloud/api/ApiDBUtils.java
2012-09-11 17:38:24 -07:00
2404d3493d
CS-14277
...
Support for local data disk. Currently enable/disable config is at zone level, in subsequent checkins it can be made more granular.
Following changes are made:
- Create disk offering API now takes an extra parameter to denote storage type (local or shared). This is similar to storage type in service offering.
- Create/delete of data volume on local storage
- Attach/detach for local data volumes. Re-attach is allowed as long as vm host and data volume storage pool host is same.
- Migration of VM instance is not supported if it uses local root or data volumes.
- Migrate is not supported for local volumes.
- Zone level config to enable/disable local storage usage for service and disk offerings.
- Local storage gets discovered when a host is added/reconnected if zone level config is enabled. When disabled existing local storages are not removed but any new local storage is not added.
- Deploy VM command validates service and disk offerings based on local storage config.
- Upgrade uses the global config 'use.local.storage' to set the zone level config for local storage.
(cherry picked from commit 62710aed37606168012a0ed255a876c8e7954010)
2012-09-11 17:38:15 -07:00
452e34908f
Fix the output of instance-id and vm-id to UUID
2012-09-11 17:38:06 -07:00
88f85b29c2
Replace db-id by UUID for user VM's vm-id.
2012-09-11 17:38:05 -07:00
b02551dcf6
Revert "CLOUDSTACK-70: Improve Network Restart Behaviour for Basic Zone: Restarting Network Fails"
...
This reverts commit ecd1ac214c
2012-09-11 17:38:02 -07:00
efd0905fbd
only check ISO which is downloaded status
2012-09-11 17:37:58 -07:00
e5a16f40cd
CLOUDSTACK-70: Improve Network Restart Behaviour for Basic Zone: Restarting Network Fails
...
If cleanup=true, removes all VRs and creates VR, implements network.
If cleanup=false, skips running VRs, implements network for stopped/deleted VRs.
Signed-off-by: Rohit Yadav <rohit.yadav@citrix.com>
2012-09-11 17:37:05 -07:00
3afc9cc630
Add KVM to hypervisor types allowed in VPC
...
RB: https://reviews.apache.org/r/6926/
Send-by: Marcus Sorensen
2012-09-11 17:33:24 -07:00
e1b3f0cf87
CS-16258: Load Test - 1 host stuck in "Rebalancing" state forever. "java.lang.NullPointerException" seen in "Cluster-Worker" thread that was handling this process.
...
- Using temp to not affect the return value for the method.
2012-09-11 17:33:00 -07:00
4e29e0d5c3
CS-16022: If host connection fails due to some DB error, host disconnect does not happen and mgmt_server_id is not removed.
...
Making sure host disconnect is called.
2012-09-11 17:32:59 -07:00
c876a66b3f
Fixed unittest
2012-09-11 17:26:20 -07:00
f5c9397327
CS-16187: don't allow vpc offering creation with unsupported services (Firewall, SecurityGroup)
...
Conflicts:
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-09-11 17:05:04 -07:00
d0c526fdcd
Replaced tabs with spaces in VirtualNetworkApplianceManagerImpl (tabs were used mostly in network stats related code)
2012-09-11 17:03:11 -07:00
6fd7da8f56
Keep the instance-id and vm-id values prior to Acton, use UUID for VMs created poast Acton.
2012-09-11 17:03:11 -07:00
cc80d09d77
CS-14796: Error out with InvalidParameterValueException in UserVmManagerImpl if userdata is not base64 encoded.
2012-09-11 16:58:09 -07:00
acd08e61e6
CS-16239: don't try to pull key information if the key was removed in the system
...
As a part of the commit, also checking deleteSshKeyPair name - admin was unable to delete the key on behalf of another user
Conflicts:
server/src/com/cloud/api/ApiDBUtils.java
2012-09-11 14:37:25 -07:00
65eeeaf071
CS-14277
...
Support for local data disk. Currently enable/disable config is at zone level, in subsequent checkins it can be made more granular.
Following changes are made:
- Create disk offering API now takes an extra parameter to denote storage type (local or shared). This is similar to storage type in service offering.
- Create/delete of data volume on local storage
- Attach/detach for local data volumes. Re-attach is allowed as long as vm host and data volume storage pool host is same.
- Migration of VM instance is not supported if it uses local root or data volumes.
- Migrate is not supported for local volumes.
- Zone level config to enable/disable local storage usage for service and disk offerings.
- Local storage gets discovered when a host is added/reconnected if zone level config is enabled. When disabled existing local storages are not removed but any new local storage is not added.
- Deploy VM command validates service and disk offerings based on local storage config.
- Upgrade uses the global config 'use.local.storage' to set the zone level config for local storage.
(cherry picked from commit 62710aed37606168012a0ed255a876c8e7954010)
2012-09-11 17:22:43 +05:30
4b8fb79ef6
Fix the output of instance-id and vm-id to UUID
2012-09-10 18:02:34 -07:00
663e250334
Replace db-id by UUID for user VM's vm-id.
2012-09-10 18:01:08 -07:00
d6b6529951
Revert "CLOUDSTACK-70: Improve Network Restart Behaviour for Basic Zone: Restarting Network Fails"
...
This reverts commit ecd1ac214c
2012-09-10 16:34:21 -07:00
0442917381
only check ISO which is downloaded status
2012-09-10 13:30:25 -07:00
ecd1ac214c
CLOUDSTACK-70: Improve Network Restart Behaviour for Basic Zone: Restarting Network Fails
...
If cleanup=true, removes all VRs and creates VR, implements network.
If cleanup=false, skips running VRs, implements network for stopped/deleted VRs.
Signed-off-by: Rohit Yadav <rohit.yadav@citrix.com>
2012-09-10 14:13:24 +05:30
24fa14845b
Add KVM to hypervisor types allowed in VPC
...
RB: https://reviews.apache.org/r/6926/
Send-by: Marcus Sorensen
2012-09-07 15:39:23 -07:00
60f130c509
CS-16258: Load Test - 1 host stuck in "Rebalancing" state forever. "java.lang.NullPointerException" seen in "Cluster-Worker" thread that was handling this process.
...
- Using temp to not affect the return value for the method.
2012-09-06 16:31:00 -07:00
61a19eb089
CS-16022: If host connection fails due to some DB error, host disconnect does not happen and mgmt_server_id is not removed.
...
Making sure host disconnect is called.
2012-09-06 16:30:50 -07:00
1d0a10c69e
Merged master over to javelin to get new poms and maven build
2012-09-05 14:31:24 -07:00
86427559cb
CS-16269: Fix savePassword on one stopped RvR
2012-09-05 13:46:44 -07:00
51cc301fef
CS-16222: send password reset command only to the element responsible for the userdata service in network
...
Reviewed-by: Sheng Yang
2012-09-04 13:41:10 -07:00
f509efe2d8
cloudstack 3.0 - API response serializer - change XML serialized string's encoding from ISO-8859-1 to UTF-8 to support more characters - fix "L10N: DE, ES, FR, JA, KO, SC: Garbage characters appear when using localized characters in Subscriptions page" (Reviewed-by: Brian)
2012-09-04 11:43:29 -07:00
dd07d1598f
Fix Bug CloudStack-9 can not change OS preference from OS to none
2012-09-04 20:51:03 +08:00
73cc474157
add secondary storage provider
2012-09-02 19:26:20 -07:00
083cef37f1
CS 16158: Load Test - Adding host takes much longer in 3.0.x compared to 2.2.14.
...
Reviewed-By: Alena
Changes:
- Removing unnecessary search over op_host_capacity table in StorageCapacitylistener.
2012-08-31 13:40:18 -07:00
3d0069bb56
CS-16158 : Load Test - Adding host takes much longer in 3.0.x compared to 2.2.14.
...
Changes:
There is an unnecessary search over capacity table that scans entire table.
2012-08-31 13:40:17 -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
2fd99fe955
Deleted files
2012-08-30 09:59:27 -07:00
6309253de1
Deleted some useless files
2012-08-30 09:59:25 -07:00
d3921139ed
Patch from Gavin Lee: Change license to ASL2.0 in server and tools
...
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2012-08-30 10:36:29 -04:00
f7acd8fed8
Create random version for StartupCommands in dev env setup
2012-08-30 08:47:02 +02:00
79ebffe4f3
CS-13594: Download template is unable to handle multiple SSVMs per zone
...
Reviewed-by: Kishan
2012-08-29 15:25:00 +05:30
eb4a3cf6c8
bug CS-15398: fix for basic zone dns issue in multiple pods
2012-08-29 14:33:27 +05:30
2300310243
Messaging facility initials for new architecture
2012-08-28 17:58:45 -07:00
f6f1be62b9
configuring tomcat maven plugin too
2012-08-28 23:58:06 +02:00
f218003607
Merge branch 'maven-final' of git://github.com/ibuildthecloud/incubator-cloudstack
2012-08-28 23:30:57 +02:00
8c3450b503
CS-14770. ec2-run-instances and ec2-describe-instances don't return keypair information. Component: AWSAPI.
2012-08-28 13:52:42 -07:00
ff7c964a66
Add ability to do jetty:run in eclipse
2012-08-28 09:16:44 -07:00
43e4de429e
Fix up some dependencies
2012-08-28 09:03:25 -07:00
5e0ede8bd9
bug 13946: reducing poll interval
2012-08-28 12:22:46 +05:30
38e26f8dbd
IpAssoc: when set ROUTER_GUEST_IP, get network id from associatedNetworkId field of the ip address instead of networkId as networkId is the id of the public network the ip belongs to
...
Reviewed-by: Sheng Yang
2012-08-27 16:26:32 -07:00
82cb1095dc
CS-16188: S2S VPN: Limit VPN customer gateway name duplicate checking within account
...
Reviewed-by: Anthony Xu
Conflicts:
server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
2012-08-27 16:11:36 -07:00
fbdc7fc59f
CS-16178 - when remove PF rule, in VPC setup make sure if the rule is the last one for the network, disassociate it from the network
...
Reviewed-by: Sheng Yang
2012-08-27 13:46:36 -07:00
48806fcc54
VPC: CS-16179 - only offerings in Enabled state can be used for VPC creation
...
Reviewed-by: Frank Zhang
Conflicts:
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-08-27 11:11:55 -07:00
3609e44b58
commit for https://reviews.apache.org/r/6608/
2012-08-27 10:39:49 -07:00
93ac01db0b
Fixed unittest
2012-08-27 09:46:56 -07:00
a06ed5728c
remove intermediate parent poms
2012-08-27 16:43:24 +02:00
3aa469da2a
groupdId is now org.apache.cloudstack
2012-08-25 09:20:21 +02:00
0d9b81aac6
that was an unused import not a missing dependency
2012-08-25 00:44:14 +02:00
e7b4e15b42
add missing dependency
2012-08-25 00:37:25 +02:00
5ef60aceb1
%s/tab/ws/
2012-08-25 00:03:23 +02:00
4a4007e652
Add license
2012-08-24 11:18:54 -07:00
ebc0fa458a
* Maven 3 support
...
* Pretty Format POM's
* AWS API compiles now
2012-08-24 11:18:54 -07:00
490e87a617
Fix small compilation issue encountered when building with maven
2012-08-24 11:18:53 -07:00
f826971fea
Maven config, initial commit
2012-08-24 11:18:52 -07:00
e3f2cf908a
Only use the PremiumSecondaryStorageResource if VmWare is the hypervisor
2012-08-24 15:57:18 +02:00
4ea36b82e9
propogate account changes to other Regions
2012-08-24 15:59:59 +05:30
a08ae8e42c
[ASFCS40]CS-15586: Public Vlan for an account fails in case of multiple Physical networks
...
Changes:
- Since Now a zone can have multiple physical networks, we need to find the physical network Id from the networkOffering's tag and zoneId and trafficType when we create a guest network
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
2012-08-23 18:18:12 -07:00
d06d6dae72
add maven eclipse project files from Darren
2012-08-23 17:55:20 -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
9a51ff3bfc
Maven worksplace fixes/patches from Darren
2012-08-23 14:26:27 -07:00
2f6cc4b0cb
Add license
2012-08-23 14:26:26 -07:00
ad54ed1790
* Maven 3 support
...
* Pretty Format POM's
* AWS API compiles now
2012-08-23 14:26:26 -07:00
f78aa9d98a
Fix small compilation issue encountered when building with maven
2012-08-23 14:26:25 -07:00
b8e95e435f
Maven config, initial commit
2012-08-23 14:26:25 -07:00
3298a481a8
For assignVM, marking older snapshots removed in db
2012-08-23 12:22:02 +05:30
6f26894eaf
Fix for a corner case during fullsync where it tolerates a VM to exist on two clusters by virtue of it’s current host id and last host id (being on two diff clusters).
2012-08-23 12:13:53 +05:30
3ada5e4a46
VPC: CS-16100 - 1) when start VPC router, never pick up any other hypervisor besides vmWare and Xen 2) When start user vm in vpc network, throw an error when deploy from the tempalate of not supported hypervisor
...
Reviewed-by: Frank Zhang
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
2012-08-22 11:53:59 -07:00
4a2796d7c7
CS-16123: applied the patch from https://reviews.apache.org/r/6723/
...
original committer: Mice Xia
2012-08-22 09:39:19 -07:00
a5248f1cfc
Fix for dns issue in multiple pods
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2012-08-22 16:48:41 +05:30
b42a813ff1
bug CS-16112: During unplug nic iptables rules are cleaned up in both cloud_nic.sh and vpc_netusage.sh. Consolidated this code in cloud_nic.sh
...
status CS-16112: resolved fixed
Conflicts:
patches/systemvm/debian/config/opt/cloud/bin/vpc_netusage.sh
2012-08-22 12:00:02 +05:30
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
e252de4999
PublicIpAddress api response: new parameter "associatednetworkname" - the name of the guest network associated with the ip address
...
Reviewed-by: Frank Zhang
Conflicts:
api/src/com/cloud/api/ApiConstants.java
server/src/com/cloud/api/ApiResponseHelper.java
2012-08-21 15:35:40 -07:00
2bf5c99bc6
CS-15304: VR deployment - release the lock for the network once the router entry is allocated (2.2.x behavior) as opposed to releasing it when the router start is completed
...
Reviewed-by: Frank Zhang
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2012-08-21 15:31:07 -07:00
7d0ad98c93
More logging to lock operations on the network
2012-08-21 15:25:17 -07:00
14dd3f07d7
Fixed line endings in VirtualNetworkApplianceManagerImpl
2012-08-21 15:24:44 -07:00
7aa7d6e39f
CS-16089: Create Template after upgrade from snapshot taken in 2.2.14 was failing since the swift_id was not null but 0 instead. Put a check in the code to check for not null and not 0 swift_id to go and download the snapshot from the swift.
...
Reviewed-by: Kishan
2012-08-21 13:46:18 +05:30
481aae1ebc
add recreate.systemvm.enabled parameter to control recreating systemvm
2012-08-20 11:19:26 -07:00
ac9dee94ac
fix from Pradeep Soundararajan for removing build dependency on mysql-connector-java https://reviews.apache.org/r/6180
2012-08-20 13:38:19 -04:00
86d49e7aa0
CS-16060: Firewall service should be excluded from conserve mode checking
2012-08-17 17:05:04 -07:00
a8efbcda58
S2S VPN: Fix license headers
2012-08-17 16:52:06 -07:00
1cfcefd2fb
CS-16043: Using network based router rather than account for RVR detection
2012-08-17 16:52:06 -07:00
ea6f3eb6f9
CS-14253: Apply IP when firewall rule is in place
2012-08-17 16:52:06 -07:00
4cb7a100c6
Revert "bug 14484: Apply existed firewall rules when associating IP"
...
This reverts commit b409615a32
2012-08-17 16:52:06 -07:00
9059740dc1
HA worker thread needs to have its own worker thread configuration
2012-08-17 12:59:52 -07:00
f8bd05a1e3
Fixed regression in GuestNetworkGuru - get networkId from the network object passed to the method call instead of retrieving it from tne NicProfile when it wasn't set yet
2012-08-17 09:43:34 -07:00
691be5c60e
bug CS-15577: Added per gateway network usage for VPC and VPN usage. VPN usage uses 525 mark for outgoing traffic and 524 mark for incoming traffic
...
status CS-15577: resolved fixed
2012-08-17 17:07:13 +05:30
98ae204972
giving diff ip to VR
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2012-08-17 13:49:39 +05:30
48521e74e6
ElbVmMapDaoTest requires active DB backend for tests, hence jenkins test fails.
...
Also, ELB feature using virtual router does not work and is deprecated currently.
2012-08-16 12:59:00 -07:00
ae5d22b4ab
bug CS-16036 ResourceManagerTest does not test what is says it tests
...
also fixes unit test failures
2012-08-16 12:11:41 -07:00
5b85edb961
bug CS-16034 getRandomIp can return -1 unexpectedly
...
also fixes unit test failures
2012-08-16 11:42:25 -07:00
335730dc65
CS-15999: added nics to domain router api response
...
Conflicts:
server/src/com/cloud/api/ApiResponseHelper.java
2012-08-16 10:50:09 -07:00
0bf6de3eb2
CS-16030: set UUID when persist public ip address
2012-08-16 10:13:39 -07:00
72f896044d
bug CS-15278: Download Volume fails in case of Multiple Secondary Storages. Correcting it to use the same secondary storage to copy the volume and creating the soft link
...
Reviewed-by: Kishan
2012-08-16 15:53:00 +05:30
7e093a949d
CS-15823 Failed snapshot should be marked as Error and cleanup asynchronously
2012-08-15 11:06:25 +08:00
fe3786341f
Fixed unittest for VPC - added missing implementation for some methods in Mock classes used by the test
2012-08-14 13:47:04 -07:00
65c90227ae
bug CS-15648: For volumes created from snapshot, create usage event after successful volume
...
status CS-15648: resolved fixed
reviewed-by: Nitin
2012-08-14 11:58:07 +05:30
5060f98268
CS-15922 : to avoid race condition when expunge vm, expunge interval and expunge deplay should be larger than 600 second
2012-08-13 17:45:38 -07:00
04bf1a33c6
apply patch https://reviews.apache.org/r/6572/
2012-08-13 17:28:41 -07:00
b3760350fe
VPC: CS-15805 - guest cidr should be RFC1918 complient
2012-08-13 17:17:06 -07:00
7120ce0717
Fixed version number in upgrade script comment (replaced 3.0.3 with 3.0.2)
2012-08-13 16:50:06 -07:00
62526a715a
Fixed unitest
2012-08-13 16:20:09 -07:00
4433c5a51a
Database upgrade from 302 to 40
2012-08-13 16:20:09 -07:00
71ead9ef4e
VPC: CS-15925 - when vpc provider is speficied for a new network offering, no other providers can be used
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/vpc/VpcManagerImpl.java
server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-08-13 14:03:39 -07:00
e74969fdec
VPC: CS-15968 - don't send ips in Releasing state to the router when the nic is already unplugged for this Vlan
...
Conflicts:
server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
server/src/com/cloud/network/rules/RulesManagerImpl.java
2012-08-13 11:55:34 -07:00
ce12d0d70d
Submit Midokura SDN controller stubs
2012-08-13 18:55:11 +05:30
a50cf618ec
bug CS-15278: For removing clusters crossing threshold find out the list of cluster through db instead of iteratting cluster one by one in the java code.
2012-08-13 16:20:57 +05:30
42fbf24f86
Remove @author tag from non third-party source files in server folder
2012-08-13 15:17:31 +08:00
822cf3c9ee
VPC : typo in FirewallRuleVO
2012-08-12 10:55:21 -07:00
32f55f3e3c
Merge branch 'master' into vpc
2012-08-12 10:22:54 -07:00
ff773a8122
CS-15621: Using migrateVolumes method which does not perform input validation. Some input validation in the migrateVolume method prevented migration of volume in READY state. Also using volume disk offering to check if it is a local or shared one.
...
Verified on XS 6.0.2
Test scenario
- Created 2 shared primary storage pools
- Created data volume using shared disk offering
- Attached it to a running VM (created in one storage pool)
- Detached it (now it is in READY state)
- Created a new VM in stopped state (using deployVirtualMachine API with startVm=false)
- Attached the data volume to this new VM
- Started new VM (migrated volume scenario got hit when the planner assigned the other shared pool)
2012-08-12 17:05:28 +05:30
b61468d65c
Merge branch 'master' into vpc
...
Conflicts:
plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
2012-08-11 18:27:18 -07:00
d93c5d0531
VPC: CS-15950 - throw networkConflictException when try to create network rule for the ip address that is already in use for another service
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/rules/RulesManagerImpl.java
2012-08-10 16:37:33 -07:00
327b4833ce
S2S VPN: CS-15947: Add global config for S2S VPN VPN connection counts limitation
...
And subnets limitation for each customer gateway
Conflicts:
server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
2012-08-10 16:24:35 -07:00
302c9048e8
S2S VPN: CS-15932: Allow user to update customer gateway when connection state is ERROR
...
Conflicts:
server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
2012-08-10 16:20:52 -07:00
830aec3562
S2S VPN: CS-15936: Prevent user from connecting to different customer gateway with overlapped subnets
...
Conflicts:
server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
2012-08-10 16:20:52 -07:00
a4431b5740
S2S VPN: Use coma instead of semicolon for separating cidr list
2012-08-10 16:20:52 -07:00
263216caa5
Adds CLVM as an option for primary storage. It copies most of the RBD bits, in most cases simply adding an 'else if' or similar. In the managesnapshot.sh we add the ability to manipulate snapshots for the CLVM volumes, as well as a few minor fixes like adjusting the usage for the -b option to reflect that it accepts four arguments (note that it already accepted four args, it just wasn't reflected in the usage).
...
RB: https://reviews.apache.org/r/6470/
Send-by: shadowsor@gmail.com
2012-08-10 13:33:06 -07:00
ccac505944
Merge branch 'master' into vpc
2012-08-10 10:47:49 -07:00
5c349dd5e5
Fixed NetworkManagerImpl - tabs weren't replaced with spaces in some places
2012-08-10 10:45:38 -07:00
a74687128e
Fix bug CS-15679 Max guest limit of hypervisor capabilities does not work properly
2012-08-10 16:50:47 +08:00
bd2a130251
fix unittest SecurityGroupManagerImpl2Test
2012-08-10 16:01:43 +08:00
6cddd1e767
Removed trailing whitespaces and fixed line endings in some files
2012-08-09 23:30:33 -07:00
3cf13c8b7c
Fixed unittest
...
Conflicts:
server/test/com/cloud/vpc/VpcApiUnitTest.java
2012-08-08 19:00:08 -07:00
c5e3493792
Merge branch 'master' into vpc
2012-08-08 18:38:35 -07:00
a1f361904e
Reverted "Initialize user context from AccountManager" committed to master branch by mistake
...
This reverts commit da26302049
2012-08-08 15:26:45 -07:00
057d6ccbb8
Name change for vpc/Dao package (dao is lowercased now)
2012-08-08 14:51:51 -07:00
457f3b3dc9
Removed all javax source code from utils package
2012-08-08 12:58:22 -07:00
a5f99a2ca0
VPC: set event details in the method called by API
2012-08-08 11:52:46 -07:00
048c5e50cf
Merge branch 'master' into vpc
...
Conflicts:
utils/test/com/cloud/utils/component/MockComponentLocator.java
2012-08-08 11:50:39 -07:00
da26302049
Initialize user context from AccountManager
...
Conflicts:
server/src/com/cloud/configuration/DefaultComponentLibrary.java
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-08-08 11:17:01 -07:00
a74c6e3104
fix CS-15814 Description of global configuration 'encode.api.response' is incorrect
2012-08-08 16:29:53 +08:00
2641b5d6b8
S2S VPN: Fix multiply remote side guest networks
2012-08-07 18:39:45 -07:00
c1c952b42b
should have used non url safe
2012-08-07 16:58:16 -07:00
5e0eb93fe6
S2S VPN: CS-15882: Only allow VPN connection between same account's gateways
2012-08-07 16:27:04 -07:00
a6a864a1a8
Removed Base64 file and use the apache version
2012-08-07 15:41:54 -07:00
46a12b378c
CS-15243: Add service combination check at create network offering
2012-08-07 13:17:48 -07:00
95449da4be
Merge branch 'master' into vpc
2012-08-07 11:37:45 -07:00
bda1e2d08d
VPC: more unittests for VpcService
...
Conflicts:
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-08-07 11:37:36 -07:00
d38e9eebed
VPC: CS-15850 - don't unplug the nic for public network when there are existing ips in the same vlan having network rules
...
Conflicts:
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-08-07 11:25:02 -07:00
a83c753354
VPC: CS-15850 - don't unplug the nic for public network when there are existing ips in the same vlan having network rules
2012-08-07 11:24:04 -07:00
cf64fda5d5
VPC: unittest preparation
...
Conflicts:
server/src/com/cloud/network/vpc/VpcManagerImpl.java
server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-08-07 11:23:52 -07:00
972fe01aec
VPC: more validation for static route rules: 1) Can't belong to guest cidr defined on Vpc 2) Can't belong to link local cidr
...
Conflicts:
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-08-07 11:21:53 -07:00
81ff7a09fd
CS-15875 resolved via patch from Andy Gross.
2012-08-07 14:10:11 -04:00
0a2b6436dd
bug CS-15859: put a check on volume limit
...
Author: Abhinandan Prateek <aprateek@apache.org>
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2012-08-07 10:47:54 +05:30
6e7b4bc07b
S2S VPN: CS-15642: Re-initiate the VPN connections after router reboot
...
Conflicts:
server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
2012-08-06 15:32:18 -07:00
a8cbba9e82
S2S VPN: CS-15820: Remove account information of vpn gateway and vpn connection
...
The owner would be always same as VPC owner.
Conflicts:
api/src/com/cloud/api/commands/CreateVpnConnectionCmd.java
server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
setup/db/db/schema-304to305.sql
2012-08-06 15:21:54 -07:00
70d704c786
S2S VPN: Allow name to be modified in updateCustomerGateway
...
Conflicts:
server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
2012-08-06 15:20:33 -07:00
1b5103c501
S2S VPN: CS-15472: Separate IKE lifetime and ESP lifetime
2012-08-06 15:19:26 -07:00
5a72044dc7
Merge branch 'master' into vpc
2012-08-03 14:30:54 -07:00
237d91d4c9
Removed @author tags in some classes
2012-08-03 14:25:17 -07:00
3496a73878
VPC: CS-15812 - fixed listVPCs by projectId
2012-08-03 14:23:56 -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
6eba8a818a
VPC: applyStaticRoutes - don't exclude static routes in Revoke state
2012-08-03 14:15:50 -07:00
78764c8b6e
License header updates for the server folder.
2012-08-03 09:41:27 -04:00
3c68f1f8e8
bug CS-15200: Introducing state transition when volume is getting copied from secondary storage and it is put into Creating state
...
Reviewed-by: Kishan
2012-08-03 17:18:13 +05:30
0e0b75a041
Merge branch 'master' into vpc
...
Conflicts:
api/src/com/cloud/api/ApiConstants.java
2012-08-02 18:45:37 -07:00
befd6dd0c6
listVirtualMachines: implemented search by templateId/isoId
...
Conflicts:
api/src/com/cloud/api/ApiConstants.java
api/src/com/cloud/api/commands/ListVMsCmd.java
2012-08-02 18:15:13 -07:00
d6df2fdc64
VPC: createPrivateGateway - added cleanup part happening in case when the gateway fails to be applied on the backend
...
Conflicts:
api/src/com/cloud/api/commands/CreatePrivateGatewayCmd.java
api/src/com/cloud/api/response/AsyncJobResponse.java
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-08-02 18:12:19 -07:00
0588c9748c
VPC: CS-15818 - don't allow having ICMP networkACLs with the same cidr and icmpType=-1 for rule1 and icmpType!=-1 for rule 2 as the rule1 covers rule2 in this case
...
Conflicts:
server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
utils/src/com/cloud/utils/net/NetUtils.java
2012-08-02 18:09:10 -07:00
39485a4a56
VPC: CS-15821 - corrected mac address format for vpc private network
2012-08-02 18:07:15 -07:00
3996094e55
Fix bug: can not deploy VM on ESXi due to incorrect
...
secondaryStorageResource used for SSVM
Issue:
For deploying VMware VMs, cloud service on SSVM needs to be started with
PremiumSecondaryStorageResource, a bunch of VMware related commands rely
on it.
Changes:
1)include cloud-vmware.jar in systemvm.zip
2)start cloud service in SSVM with PremiumSecondaryStorageResource
RB: https://reviews.apache.org/r/6320/
Send-by: mice_xia@tcloudcomputing.com
2012-08-02 11:20:35 -07:00
e116c24989
Removed obsolete file SearchCriteria2Test.java which caused ant unittest
...
to fail.
cleanup.sql cleans up CLOUD and CLOUD_USAGE databases which are required
by many unit-testcases.
RB: https://reviews.apache.org/r/6283/diff/3/
Send-by: saksham.srivastava@citrix.com
2012-08-02 10:33:06 -07:00
895b6a3e4b
CS-15780 Global configuration 'account.cleanup.interval' is used by event purge thread
...
changes:
add a new global configuration event.purge.interval for event purge thread
leave account.cleanup.interval only for account cleanup thread.
2012-08-02 21:50:44 +05:30
8f797afd42
VPC: CS-15813 - ICMP type and code validation
...
Conflicts:
server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
utils/src/com/cloud/utils/net/NetUtils.java
2012-08-01 19:55:51 -07:00
ce9f1afa78
Merge branch 'master' into vpc
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
2012-08-01 19:04:28 -07:00
21e8fb372b
VPC: CS-15805 - verify vpc guest network cidr only against networks in the same vpc
...
Conflicts:
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-08-01 19:02:43 -07:00
a4c52d41e8
VPC: CS-15811 - removed Netscaler from the list of supported providers in VPC
2012-08-01 18:57:52 -07:00
b92d2336ad
VPC: CS-15798 - added vpc resource limit. Check vpc functional spec for more details:
...
http://wiki.cloudstack.org/display/RelOps/Inter-VLAN+Routing+functional+spec
Conflicts:
server/src/com/cloud/api/ApiResponseHelper.java
server/src/com/cloud/network/vpc/VpcManagerImpl.java
server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
2012-08-01 18:57:33 -07:00
5cbe3d9722
ResourceTags: resourcetags support for Project/Vpc/NetworkACL/StaticRoute
...
Conflicts:
api/src/com/cloud/api/commands/ListVPCsCmd.java
server/src/com/cloud/api/ApiResponseHelper.java
server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
server/src/com/cloud/network/vpc/VpcManagerImpl.java
server/src/com/cloud/projects/dao/ProjectDaoImpl.java
server/src/com/cloud/uuididentity/dao/IdentityDao.java
2012-08-01 18:54:08 -07:00
d2df3e0102
VPC: CS-15791 - allow having the same NetworkACL for 2 different protocols
2012-08-01 18:48:21 -07:00
48102871e9
VPC: add account/domain info to the API vpc response
...
Conflicts:
server/src/com/cloud/api/ApiResponseHelper.java
2012-08-01 18:48:09 -07:00
1168747128
Fixed numerous bugs in listNetworks call related to filtering by projectId/listAll/domainId/etc. All the rules below are followed now:
...
1) When account/domainId or projectId are passed in:
* list all account specific networks of the account/project
* list all domain level networks from the domainId + subdomains if the targeted network has allowSubdomainAccess = true
In other words, we use all the networks that can be used for vm deployment by account/domainId.
If listAll is not specified in the request, account/domainId are being defaulted to the account/domainId of the caller
listAll is ignored if the call is being done by the regular user.
2) listAll is passed in by the Root admin, we list:
* all Account specific networks in the system
* all domain specific networks in the system
3) listAll is passed by the Domain admin, we list:
* All Account specific networks belonging to domain/subdomains of the domain admin.
* All domain specific networks belonging to domain/subdomains of the domain admin
* All domain specific networks allowing subdomain access belonging to the parent domain.
4) domainId - can be passed either with or without listAll. We list:
* all account specific networks belonging to the domain
* all domain specific networks of the domain
* all domain specific networks of the subdomains if isRecursive = true is passed in
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
2012-08-01 18:46:36 -07:00
7cceaae912
VPC: moved vpc related code from NetworkManager to VpcManager
...
Conflicts:
api/src/com/cloud/api/commands/AssociateIPAddrCmd.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
server/src/com/cloud/network/rules/RulesManagerImpl.java
server/src/com/cloud/network/vpc/VpcManagerImpl.java
server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-08-01 18:45:06 -07:00
ebe53a91d7
VPC: reduced visability for some vpc related methods
...
Conflicts:
server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-08-01 18:33:12 -07:00
70713043cf
VPC: CS-15774 - VPC and guest networks of VPC should belong to the same zone
2012-08-01 18:20:43 -07:00
9be0a5525d
VPC: CS-15725 - don't allow regular offering upgrade to the offering that can be used inside vpc only
2012-08-01 18:19:20 -07:00
e0c85c0d41
VPC: replaced vmTo object with vmName parameter in plug/unplugNic commands
2012-08-01 18:19:03 -07:00
904ef73398
Build fix.
2012-08-01 16:41:38 -07:00
96ac18d8ed
S2S VPN: CS-15810: Add check for customer gateway subnets / VPC CIDR overlap
2012-08-01 15:31:17 -07:00
3f571684aa
CS-15631 : Support for up to 16 VDIs per VM on XS 6.0 and above
...
Support for up to 16 VDIs per VM on XS 6.0 and above (16 VDIs => root + cd + 14 data volumes). Currently in CS number of data disk that can be attached to VM is hard-coded to 6. Made this setting configurable by moving it to hypervisor capabilities. Although XS 6.0 and above supports upto 16 VDIs but while testing on XS 6.0.2 found that only 13 data volumes can be attached to a VM. So for XS 6.0 and 6.0.2 max_data_volumes_limit is set to 13 currently.
Signed-off-by: Koushik Das <Koushik.Das@citrix.com>
2012-08-01 19:39:30 +05:30
85398bb2e0
bug CS-13935: correcting description for create.volume.from.snapshot.wait global setting
...
Reviewed-by: Kishan
2012-08-01 18:16:01 +05:30
7706a9c32f
Merge branch 'master' into vpc
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/rules/RulesManagerImpl.java
2012-07-31 13:37:28 -07:00
9a9c96df64
Patch fixes file names and imports wherever used, in files introduced in
...
73be77a4c1https://reviews.apache.org/r/6239/
Send-by: rohit.yadav@citrix.com
2012-07-31 10:38:11 -07:00
721d3ef3dc
Fixed listNetworks to return domain level networks when listAll is passed to the request
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
2012-07-31 10:24:09 -07:00
73be77a4c1
add missing files
2012-07-30 16:00:45 -07:00
67941f818d
S2S VPN: CS-15724: Show more parameter for listVpnCustomerGateways API
2012-07-30 15:52:23 -07:00
d90be0d9bc
S2S VPN: CS-15748: Deleting customer vpn gateway when delete account
...
Conflicts:
server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
2012-07-30 15:34:41 -07:00
7a0a9231c3
Move KVM related code into plugins/hypervisor/kvm, a new jar file is
...
created: cloud-kvm.jar
2012-07-30 14:55:47 -07:00
36fc2bd9b5
CS-15044:API changes and UI changes to provide option to view the name of the guestnetwork a virtual machine belongs
2012-07-31 02:57:46 +05:30
9ec89b9240
Allow EIP/ELB network creation only in Basic zone
2012-07-30 13:39:42 -07:00
372568cb9a
CS-15743: disable static nat as a part of network resources cleanup
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/rules/RulesManagerImpl.java
2012-07-30 11:08:33 -07:00
236f63fd34
When cleaning up or setting ip associations the NiciraNvpElement should be ignored.
...
Implemented a generic ConnectivyProvider interface work around the dependency from server to nicira-plugin.
2012-07-30 15:17:35 +02:00
7026822e20
Fixed unittest build failure
2012-07-30 15:15:47 +05:30
e87147de2e
fixed build failure
2012-07-30 13:55:12 +05:30
3313cc4a86
rrq 5834: fix for broken attachVolume command
2012-07-30 08:38:50 +02:00
2943dc22d7
CS-15717: fail to delete the network when corresponding network elements fail to be destroyed
2012-07-27 23:37:46 -04:00
9611a017e9
bug CS-15389: Added prepareStop to Virtualmachine manager and moved network usage collection into prepareStop of VR manager
2012-07-27 23:37:46 -04:00
c894555924
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 23:37:46 -04:00
b410cbff5f
CS-15730: Prohibit create VPN connection from different gateway to same customer gateway
2012-07-27 17:41:47 -07:00
3c90fc842f
CS-15704: Fix wrong domain id setting of non-root domain
2012-07-27 16:28:06 -07:00
fd9ef34a0f
CS-15719: Fix state change when stopping
2012-07-27 16:28:06 -07:00
8eee8f342e
S2S VPN: CS-15650: Add connection status update to s2s vpn
2012-07-27 16:28:06 -07:00
786d5995df
S2S VPN: Add list function for normal users
2012-07-27 16:27:36 -07:00
736c4c1510
CS-15670: Allow normal users to configure S2S VPN
2012-07-27 16:27:36 -07:00
72a4b2f410
S2S VPN: Add name field for customer gateway
...
Easier for user to identify the correct gateway
2012-07-27 16:27:36 -07:00
fe2681fa10
VPC: CS-15725 - don't allow regular offering upgrade to the offering that can be used inside vpc only
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
2012-07-27 13:59:08 -07:00
807a9ed2c3
VPC: added global configuration for limiting number of networks per vpc (vpc.max.networks)
...
Conflicts:
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-07-27 13:56:25 -07:00
190329286c
VPC:
...
1) CS-15692 - ipAddress is always null for NetworkACL rule
2) CS-15699 - redundant router = true when provider is VirtualRouter
3) CS-15701 - fixed error message
Conflicts:
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-07-27 13:55:39 -07:00
110903a91a
VPC: added vif info to ipassoc command
...
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/vm/VirtualMachineManagerImpl.java
server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-07-27 13:53:41 -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
468f2720eb
bug CS-15389: Added prepareStop to Virtualmachine manager and moved network usage collection into prepareStop of VR manager
2012-07-27 23:13:18 +05:30
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
7d406bf3d1
Added missing action events for enable/disable static nat
2012-07-26 15:28:50 -07:00
406fd95d87
Add RBD support for primary storage
...
This patch adds RBD (RADOS Block Device) support for primary storage in combination with KVM.
To get this patch working you need:
- libvirt-java 0.4.8
- libvirt with RBD storage pool support (>0.9.13)
- Qemu with RBD support (>0.14)
The primary storage does not support all the functions of CloudStack yet, for example snapshotting is disabled
due to the fact that backupping up a RBD snapshot is not possible in the way CloudStack wants to do it.
Creating templates from RBD volumes goes well, creating a VM from a template however is still a hit-and-miss.
NFS primary storage is also still required, you are not able to run your System VM's from RBD, they will need
to run on NFS.
Other then these points you can run instances with RBD backed disks.
2012-07-26 22:22:26 +02:00
50ffa95f63
ifix CS-15609 Volumes can be created as a part of VM creation when
...
un-allocated space is insufficient on primary storage
check the availability of un-allocated primary storage space during
planning stage, for multiple-volume VM creation scenario
modification in StorageManagerImpl.java and StorageManager.java:
add a new method storagePoolHasEnoughSpace(List<Volumes>, StoragePool),
check if storagePool has enough space for all requested volumes
modification in FirstfitPlanner.findPotentialDeploymentResources:
handle multiple volume case, keep track of allocated volumes for pools
and call storagePoolHasEnoughSpace to check space availability
modification in AbstractStoragePoolAllocator.java:
extract capacity computation logic and make a new method in
StorageManagerImpl
RB: https://reviews.apache.org/r/6028/
Send-by: mice_xia@tcloudcomputing.com
2012-07-26 10:10:18 -07:00
522bdf8163
S2S VPN: Fix incorrect conn returned by resetVpnConnection cmd
2012-07-25 19:27:16 -07:00
58a9b94dfb
Fixed listNetworks by domainId/aclType=Domain
2012-07-25 14:50:56 -07:00
3fedd56adb
CS-12707: UI/API - templates> select view: ISOs filter by: featured or mine> provides unending pages of 2 ISO entries, DB contains only 19 ISO entrie- reviewed by Alena
2012-07-25 22:05:24 +05:30
6420ecbd6f
Merge branch 'master' into vpc
...
Conflicts:
server/src/com/cloud/server/ManagementServerImpl.java
2012-07-24 16:13:06 -07:00
119e4e7443
VPC: CS-15681 - execute VPC related methods only when router is a vpc router
...
Conflicts:
server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
2012-07-24 16:12:13 -07:00
7d0338bd82
listPublicIpAddresses: when do join with nics table, count only non-removed nics
...
Conflicts:
server/src/com/cloud/server/ManagementServerImpl.java
2012-07-24 12:42:46 -07:00
a00456bc57
CS-15676: Fix NPE when stop non-VPC router
2012-07-24 11:43:30 -07:00
c99b1d104a
Fixed broken unittest
2012-07-24 10:30:39 -07:00
1920c2a735
CS-15534: Mark VPN connection as Disconnected when rebootRouter
...
Conflicts:
server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
2012-07-23 21:14:49 -07:00
6cb10ce993
S2S VPN: Add check for router status before apply vpn
2012-07-23 19:53:39 -07:00
766b7a2706
Merge branch 'master' into vpc
...
Conflicts:
server/src/com/cloud/api/ApiResponseHelper.java
2012-07-23 16:38:58 -07:00
46cd99f01e
VPC: CS-15668 - IpAssoc: unplug the nics before pluggning new ones
2012-07-23 16:38:14 -07:00
88f7872b81
CS-15279
...
Issue happens when ROOT volume gets created and there is subsequent failure in starting the VM. During retry if allocator assigns a different storage pool the scenario was not handled. Now in case of local storage the volume get recreated on the newly assigned pool and old one gets cleaned up. In case of shared storage the existing volume is migrated to new storage pool.
2012-07-23 14:49:04 -07:00
b18d90af04
CS-15615: Fix Site2SiteVpnService injection
2012-07-23 14:46:17 -07:00
c357134330
CS-15574: Delete VPN gateway and connection when deleting VPC
...
Conflicts:
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-07-23 14:45:42 -07:00
7d68e33323
S2S VPN: Use source NAT ip address for VPN gateway
...
Conflicts:
api/src/com/cloud/api/commands/CreateVpnGatewayCmd.java
server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-07-23 14:44:05 -07:00
671475242c
S2S VPN: Add domain and account for VPN
...
Admin can add VPN connection for others
Conflicts:
api/src/com/cloud/api/commands/CreateVpnConnectionCmd.java
server/src/com/cloud/api/ApiResponseHelper.java
setup/db/create-schema.sql
2012-07-23 14:40:26 -07:00
230ce1dfee
S2S VPN: Add state for vpn connection response
2012-07-23 14:38:06 -07:00
df9315ff02
CS-15447: Don't enable s2s vpn when provider is disabled
...
Conflicts:
server/src/com/cloud/network/vpc/VpcManager.java
2012-07-23 14:37:40 -07:00
0dec6ea804
CS-15456: Prohibit creating more than one VPN gateway of VPC
2012-07-23 14:35:52 -07:00
830901d7cc
cloudstack 3.0 API - listVpnConnections API - add gatewayIp, guestCidrList,ipsecPsk, ikePolicy, espPolicy, lifetime property (get it from customerGateway object).
2012-07-23 14:21:10 -07:00
196885e378
cloudstack 3.0 API - listVpnConnections API - add publicip property (get it from vpnGateway object).
2012-07-23 14:20:43 -07:00
8fad593ac5
cloudstack 3.0 API: CreateVpnCustomerGateway API, ListVpnCustomerGateways API: set object name for API response.
2012-07-23 12:14:59 -07:00
aac0a808c1
cloudstack 3.0 API - CreateVpnConnection API, ListVpnConnections API: set object name for API response.
2012-07-23 12:10:29 -07:00
9e5fb17e3d
CS-15077: fixed listPublicIpAddresses in basic zone
...
Conflicts:
server/src/com/cloud/api/ApiResponseHelper.java
server/src/com/cloud/server/ManagementServerImpl.java
2012-07-23 11:21:28 -07:00
7cf7002571
Merge branch 'master' into vpc
2012-07-23 10:57:55 -07:00
7bef9a961d
Resource tags: CS-15661 - don't accept NULL or empty key value when create resource tag
2012-07-23 10:51:20 -07:00
c8f72c9198
Merge branch 'master' into vpc
...
Conflicts:
ui/scripts/network.js
2012-07-23 10:36:25 -07:00
65551cff82
Resource tags: CS-15647 - delete resource tags when SG is expunged
2012-07-23 10:33:59 -07:00
394f55d9e3
More logging to the VirtualRouter manager
2012-07-20 17:12:34 -07:00
966c1b0ad8
VPC: when VPC router gets destroyed and recreated, plug public nic for each Vlan where VPC public ips belong to
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
2012-07-20 17:12:34 -07:00
cf895d34d2
CS-15622: always get router info from the DB
2012-07-20 17:12:34 -07:00
2b7ec3f4a8
VPC: one more fix for multiple public nic case for the VPC VR
...
Conflicts:
server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-07-20 17:12:34 -07:00
5a64d4fbb1
VPC: CS-15638: Plug nic for the public ip address if the ip address from the diff vlan range than sourceNat ip
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/firewall/FirewallManagerImpl.java
server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/network/rules/RulesManagerImpl.java
server/src/com/cloud/network/vpc/VpcManagerImpl.java
server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-07-20 17:12:34 -07:00
8712812ca7
cloudstack 3.0 API: CreateVpnGateway API, ListVpnGateways API: set object name for API response.
2012-07-20 16:49:17 -07:00
9b4c578e0d
More logging on nic release
2012-07-20 16:44:24 -07:00
308cb36066
Unnecessary INFO log cluttering up the logs. Also make logs more informative
2012-07-19 16:35:45 -07:00
8e648e4a98
Fixed update endpointe.url global config var
2012-07-18 15:47:37 -07:00
281b23c2cd
Fixed license headers
2012-07-18 14:52:13 -07:00
f2bbf62d9d
Added getUser API to get user details using API key. Services like S3 can user this API to authenticate. API is admin only.
2012-07-18 14:20:04 -07:00
6ad2388c72
VPC: added one more default network offering for VPC - the one not having LB service
2012-07-17 17:46:17 -07:00
519c4929bf
VPC: fixed listPublicIpAddresses for the addresses with NULL network_id
2012-07-17 17:12:00 -07:00
d51719ddc3
Fixed unittest
2012-07-17 15:50:56 -07:00
7c2b123d94
Merge branch 'master' into vpc
2012-07-16 15:43:16 -07:00
097c260690
Resource tags: CS-15591 - delete tags for template/iso when corresponding vo object is removed
2012-07-16 15:43:06 -07:00
47615a26b6
VPC: CS-15583 - hostName for the vm should be unique inside the network domain
2012-07-16 15:42:47 -07:00
a3d4ee3d87
VPC: CS-15598 - update ipVO object after getting system ip as a part of elastic LB
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
2012-07-16 15:42:36 -07:00
4a7149e6b5
VPC: CS-15580 - don't allow gateway for VPC guest network to be equal to the cidr subnet
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-07-13 17:09:16 -07:00
829acf6e27
CS-15551 : if 'xen.check.hvm' is false, don't check template hvm in allocator
2012-07-13 16:45:57 -07:00
7a5efcc2e8
CS-15579 - perform check when account/domainId is passed to list call by the regular user
2012-07-13 15:59:15 -07:00
a1acfd3bfa
Merge branch 'master' into vpc
...
Conflicts:
api/src/com/cloud/api/ApiConstants.java
api/src/com/cloud/network/Network.java
client/tomcatconf/components.xml.in
plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java
server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/guru/GuestNetworkGuru.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
setup/db/create-schema.sql
2012-07-13 13:52:58 -07:00
4dd71cb635
VPC: CS-15562 - get info about VR's guest networks from nics table
2012-07-13 13:35:18 -07:00
534e6d4d80
VPC: CS-15564 - when send the rules to the backend, form the list of rules after the rules were marked with Revoke state
...
Conflicts:
server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
2012-07-13 13:35:06 -07:00
d48d4c24e7
VPC: CS-15569/CS-15568 - release ip address from VPC when fail to enable static nat
...
Conflicts:
server/src/com/cloud/network/rules/RulesManagerImpl.java
2012-07-13 13:34:19 -07:00
ad80f426a0
VPC: CS-15553 and CS-15549 - more checks during automatic ip assoc to VPC network
...
Conflicts:
api/src/com/cloud/api/commands/CreateLoadBalancerRuleCmd.java
server/src/com/cloud/network/firewall/FirewallManagerImpl.java
server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
server/src/com/cloud/network/rules/RulesManagerImpl.java
2012-07-13 13:32:14 -07:00
1781f706f9
VPC: added forVpc parameter to listNetworks api call. If true, list networks not belonging to any vpc
2012-07-13 13:27:10 -07:00
b475396438
VPC: CS-15550 - fixed listVPCs by cidr
...
Conflicts:
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-07-13 13:26:59 -07:00
eb52f4a610
VPC: mark gateway with Deleting state when all static routes are gone
2012-07-13 13:26:04 -07:00
5923659dba
VPC: CS-15548 - don't plug the nic for guest network to router when network not in Implemented state
2012-07-13 13:25:56 -07:00
b15c2576a7
VPC: fixed listStaticRoutes when search by gatewayId
2012-07-13 13:25:47 -07:00
a848ecae8b
VPC: fixed logging
2012-07-13 13:25:39 -07:00
3d7f6a35ad
CS-15560 : Improve HVM logging of hosts
...
When a host is not considered for deployment because it has disabled HVM, then call that out in the logs for debugging.
Signed-off-by: Nitin Mehta<nitin.mehta@citrix.com>
2012-07-13 10:51:56 -07:00
79c7da07ab
Phase 1 of Nicira integration
2012-07-11 17:16:06 -07:00
8b7b838c8a
CS-15544: recreate router if router filesystem is crashed
2012-07-11 16:14:28 -07:00
ef8208af00
Merge branch 'master' into vpc
2012-07-11 13:18:51 -07:00
ab2669b01d
CS-15459: fixed listTags by resourceType
2012-07-11 12:08:34 -07:00
7cb4ab5e60
VPC: added State to vpc_gateways
2012-07-11 12:05:42 -07:00
d2e491a377
VPC: don't send staticRoutes in Revoke state to the VPC VR
2012-07-11 12:05:33 -07:00
b407b3beaa
VPC: add vm to network - no need to prepare nic when add vm in Stopped state to the network; the nic will be prepared once the vm starts up
2012-07-10 18:07:45 -07:00
697aa4589b
VPC: unplugNic - release the nic in the DB only after the command is executed succesfully on the backend
...
Conflicts:
api/src/com/cloud/agent/api/routing/SetStaticRouteCommand.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-07-10 18:07:09 -07:00
f59b935da5
VPC: CS-15519 - fixed ipAssoc when only zoneId parameter is passed in to the API call
...
Conflicts:
api/src/com/cloud/api/commands/AssociateIPAddrCmd.java
server/src/com/cloud/network/ExternalLoadBalancerUsageManagerImpl.java
2012-07-10 15:20:39 -07:00
ade3ae4e3c
CS-15512: Fix delete vpn connection
2012-07-10 14:47:50 -07:00
c2f9417de4
VPC: CS-15345 - fixed regression in ipRelease happening as a part of cleanupNetworkResources method
2012-07-10 14:35:50 -07:00
94c62f2127
CS-15513: Fix group 5 of s2s vpn
...
Conflicts:
utils/test/com/cloud/utils/net/NetUtilsTest.java
2012-07-10 10:38:17 -07:00
911ed25fbc
Merge branch 'master' into vpc
2012-07-09 18:31:28 -07:00
c2134b431f
VPC: CS-15505 - allocate guest nics when new VR starts in VPC
2012-07-09 18:30:58 -07:00
525ba472e8
VPC: CS-15481: don't allow creating networkACLs for overlapping cidrs/ports
2012-07-09 18:23:58 -07:00
55db112990
CS-15503: don't send Ips in Releasing state as a part of VPC VR start
2012-07-09 18:23:50 -07:00
21519070fc
VPC: added vpc_id to private_ip_address table to indicate which vpc the ip belongs to
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/vpc/VpcManager.java
server/src/com/cloud/vm/VirtualMachineManagerImpl.java
server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-07-09 18:23:35 -07:00
d52c6e2313
listPublicIpAddresses api: don't set associatedWithNetworkId if corresponding field is null in the DB
2012-07-09 18:13:32 -07:00
10dcc117c3
VPC: CS-15486 - prepare public nic as a part of VR deployment
2012-07-09 18:12:54 -07:00
29e90f8358
CS-15429: When an instance is created with data volume, account limit for this data volume was not checked against. Adding a check for that.
...
Signed-off-by: Nitin Mehta<nitin.mehta@citrix.com>
2012-07-10 06:02:30 +05:30
84cdf2c28d
CS-15459: fixed listTags by resourceType
2012-07-09 14:59:58 -07:00
a6086dc806
Removed @author tag from bunch of resources
2012-07-06 17:25:36 -07:00
63d6941bdc
ResourceTags: respect tag parameter in listTemplates/listIsos commands
...
Conflicts:
server/src/com/cloud/storage/dao/VMTemplateDao.java
server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java
2012-07-06 16:59:14 -07:00
5be0a3eeb1
VPC: fixed listNetworkACLs by networkId
...
Conflicts:
api/src/com/cloud/api/commands/ListNetworkACLsCmd.java
2012-07-06 16:43:39 -07:00
c9eb0c59bf
VPC: allow adding private gateway to the VPC when the VR is in Stopped state
2012-07-06 15:28:07 -07:00
818a3c72ac
VPC: CS-15485 - dont' create a record for VPC VR private gateway nic in router_network_ref; do it for regular guest networks only
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/vm/dao/DomainRouterDaoImpl.java
2012-07-06 14:57:26 -07:00
353423acec
Merge branch 'master' into vpc
...
Conflicts:
api/src/com/cloud/api/commands/ListFirewallRulesCmd.java
api/src/com/cloud/api/response/FirewallResponse.java
api/src/com/cloud/api/response/IPAddressResponse.java
server/src/com/cloud/api/ApiDBUtils.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
server/src/com/cloud/network/dao/NetworkDaoImpl.java
server/src/com/cloud/server/ManagementServerImpl.java
2012-07-06 12:04:10 -07:00
85677b71fe
Resource tags: CS-15473 - fixed delete/list by resourceId when UUID is specified as a value
...
Conflicts:
server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
server/src/com/cloud/network/vpc/Dao/StaticRouteDaoImpl.java
server/src/com/cloud/network/vpc/Dao/VpcDaoImpl.java
server/src/com/cloud/projects/dao/ProjectDaoImpl.java
2012-07-06 11:43:31 -07:00
ec26e836fc
CS-15459: fixed listTags for userVms
2012-07-06 11:43:31 -07:00
7acf8585b1
Resource tags: 1) Remove tag records when correspdonding cloudStack object gets removed
...
2) added "tags" request parameter to the banch of list* Api commands (listVirtualMachines, listSnapshots - all commands are listed in the resource tags functional spec)
Conflicts:
api/src/com/cloud/api/commands/ListFirewallRulesCmd.java
api/src/com/cloud/api/commands/ListPortForwardingRulesCmd.java
api/src/com/cloud/api/commands/ListPublicIpAddressesCmd.java
api/src/com/cloud/api/commands/ListSecurityGroupsCmd.java
api/src/com/cloud/api/commands/ListSnapshotsCmd.java
api/src/com/cloud/api/commands/ListVolumesCmd.java
api/src/com/cloud/api/response/FirewallResponse.java
api/src/com/cloud/api/response/IPAddressResponse.java
api/src/com/cloud/api/response/VolumeResponse.java
server/src/com/cloud/api/ApiDBUtils.java
server/src/com/cloud/api/ApiResponseHelper.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
server/src/com/cloud/network/security/dao/SecurityGroupDaoImpl.java
server/src/com/cloud/server/ManagementServerImpl.java
server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java
server/src/com/cloud/vm/dao/UserVmDaoImpl.java
2012-07-06 11:43:31 -07:00
7044fa695d
VPC: CS-15469: createNetworkACL - startPort is not accepted if protocol is ICMP
2012-07-06 11:11:36 -07:00
e1fe1616d7
VPC: fixed CS-15465 - lb creation for ip not associated with any networks
2012-07-06 11:09:56 -07:00
e19e26ec4e
VPC: don't fail when create/remove static route when VPC VR is in Stopped state
2012-07-06 11:09:15 -07:00
b13acc6459
VPC: don't allow vm to be a part of more than one VPC
2012-07-06 11:09:06 -07:00
d6774e6a86
VPC: don't allow vpcs for the same account with overlapping cidrs
2012-07-06 11:08:58 -07:00
83f566cfe7
VPC: added "forVpc" (boolean) parameter to listRouters call - filter by the fact if router belongs to VPC or not
2012-07-06 11:08:48 -07:00
234ae447ee
VPC: added field networkacl_service_provided to physical_network_service_providers table
2012-07-06 11:08:39 -07:00
07eb6e3cf7
VPC: CS-15447 - fail vpc creation when vpc provider is not enabled at least in one physical network in the target zone
2012-07-06 11:08:28 -07:00
b4fec75ff7
VPC: added dns1/dns2 + networkDomain to the list of bootload args passed on VPC VR start
2012-07-06 11:08:17 -07:00
540ea34f57
VPC: removed NetworkACL interface; added getTrafficType() to Firewall
...
Conflicts:
server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
2012-07-06 11:08:00 -07:00
0dfe603d48
VPC: createLB rule - removed duplicated check for ip services when createLB rule
...
Conflicts:
server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
2012-07-06 11:07:26 -07:00
470cd120d1
Added ASF license
2012-07-05 12:28:15 -07:00
27e9cdbece
add console proxy support for devcloud
2012-07-03 23:38:39 -07:00
31f9d718fb
Merge branch 'master' into vpc
...
Conflicts:
server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
2012-07-03 17:32:50 -07:00
f2078afbd8
VPC: added zoneName to the VPC api response
2012-07-03 17:28:20 -07:00
07d478d836
VPC: CS-15426 - In Basic zone always pass control nic when prepare nics for the VR
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2012-07-03 17:27:46 -07:00
023c2e4f59
Encrypting password values that are stored in the cluster_details table
2012-07-03 17:27:21 -07:00
5afa83abb6
VPC: CS-15355 - fixed router when deployVm in Basic zone
...
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2012-07-03 17:25:07 -07:00
21d87f3fa5
VPC: fixed response tag for VpcRespnse
2012-07-03 17:23:50 -07:00
da6d876cd4
VPC: added "forVpc" parameter to listNetworkOfferings command. If true, the offeirng can be used for vpc networks only
...
Conflicts:
api/src/com/cloud/api/ApiConstants.java
server/src/com/cloud/api/ApiDBUtils.java
2012-07-03 17:23:40 -07:00
2b799aa9ac
VPC: added missing FirewallService to the VR provider
2012-07-03 17:22:41 -07:00
b5563e832e
Add Region APIs
2012-07-03 13:06:21 -07:00
6a1b0f3ecf
Add Region APIs
2012-07-03 13:05:19 -07:00
580261119c
VPC: corrected the name for PublicIp interface (mistakenly renamed it as a part of previous checkin)
...
Conflicts:
server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-07-02 17:44:54 -07:00
5d5b584a8e
VPC: remove network ACLs from VPC VR when shutdown guest network
2012-07-02 17:44:54 -07:00
40a3482f13
VPC: multiple fixes:
...
* Separate service for NetworkACL - "NetworkACL" service
* allow having just one network supporting LB in the VPC
* perform check against VPC when upgrade network to the new network offering (the same set of checks when you add new network to the VPC)
2012-07-02 17:44:54 -07:00
183633cf70
VPC: createPrivateGateway - consists of plug nic + ipassoc (no setsource nat is needed)
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-07-02 17:44:54 -07:00
b565f63e42
VPC: listPrivateGateways command is available for regular user too (he needs to know the gatewayId for the static route creation)
...
Conflicts:
api/src/com/cloud/api/ResponseGenerator.java
server/src/com/cloud/api/ApiResponseHelper.java
2012-07-02 17:44:28 -07:00
1ee0c30935
VPC: added vpccidr to the list of VPC router bootload args
2012-07-02 17:44:27 -07:00
2dc1a286f6
VPC: set networkId to be null for IP address when the last PF/LB rule is removed for it and the IP belongs to VPC
...
Conflicts:
server/src/com/cloud/network/rules/RulesManagerImpl.java
2012-07-02 17:44:27 -07:00
8d16d7f94f
Fix build after merge site to site vpn
2012-07-02 16:39:41 -07:00
5ee4b79688
CS-6840: Fix 0 id returned by createVpnConnection
2012-07-02 16:29:34 -07:00
1d97af3abf
CS-6840: Add status checking for site 2 site VPN
2012-07-02 16:29:23 -07:00
d9688f74ba
CS-6840: List all objects without require parameter
2012-07-02 16:29:10 -07:00
8d4079d477
CS-6840: Add hypervisor commands for site-to-site vpn
...
Conflicts:
plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
2012-07-02 16:28:44 -07:00
0ce1e78364
CS-6840: Add Site2SiteVpnServiceProvider
2012-07-02 16:27:09 -07:00
24c480f9e6
CS-6840: Add commands for site-to-site vpn
...
Conflicts:
api/src/com/cloud/api/BaseCmd.java
api/src/com/cloud/api/ResponseGenerator.java
client/tomcatconf/commands.properties.in
server/src/com/cloud/api/ApiResponseHelper.java
server/src/com/cloud/configuration/DefaultComponentLibrary.java
utils/test/com/cloud/utils/net/NetUtilsTest.java
2012-07-02 16:26:34 -07:00
9bb65b1126
CS-6840: Add data structure for site-to-site vpn tables
2012-07-02 16:20:58 -07:00
c8bbf04c81
CS-15300: Domain Admin accounts now respect the limits imposed on the domain just as a regular account.
...
Signed-off-by: Nitin Mehta<nitin.mehta@citrix.com>
2012-07-03 04:35:53 +05:30
0449ae37f1
CS-15274: Fix NPE on CreateVlanIpRangeCmd()
...
Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
2012-07-02 15:05:57 -07:00
9876d34ea4
moving out ELB network element to plugins/network-elements/elastic-loadbalancer
2012-07-02 15:05:58 -07:00
8aa2b55dd6
moving out NetApp code to plugins/file-systems/netapp
2012-07-02 08:34:02 -07:00
e87558256c
Patch from Chip Childers
...
https://reviews.apache.org/r/5704/
License header updates for the server folder
2012-07-02 09:51:21 -04:00
ae4b66283a
cleaning up some line endings
2012-07-02 09:50:28 -04:00
1a2f354f4d
Remove message about contacting Cloud support.
...
CloudStack has gone Apache now.
2012-07-01 15:12:43 +02:00
1f01d923ca
Merge branch 'master' into vpc
2012-06-28 17:44:08 -07:00
634cd78baa
Merge branch 'master' into vpc
...
Conflicts:
api/src/com/cloud/api/ApiConstants.java
api/src/com/cloud/api/BaseCmd.java
api/src/com/cloud/api/ResponseGenerator.java
api/src/com/cloud/api/commands/ListNetworksCmd.java
api/src/com/cloud/api/response/NetworkResponse.java
api/src/com/cloud/event/EventTypes.java
api/src/com/cloud/network/NetworkService.java
client/tomcatconf/commands.properties.in
scripts/network/domr/getDomRVersion.sh
scripts/network/domr/ipassoc.sh
scripts/network/domr/l2tp_vpn.sh
scripts/network/domr/networkUsage.sh
scripts/network/domr/router_proxy.sh
server/src/com/cloud/api/ApiDBUtils.java
server/src/com/cloud/api/ApiResponseHelper.java
server/src/com/cloud/configuration/DefaultComponentLibrary.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/dao/IPAddressDao.java
server/src/com/cloud/network/dao/IPAddressDaoImpl.java
setup/apidoc/gen_toc.py
setup/db/create-schema.sql
wscript
2012-06-28 17:41:40 -07:00
c41094154d
moving out OVS code to plugins/network-elements/ovs
2012-06-28 17:23:41 -07:00
377b03acde
VPC: when add guest network to VPC, verify that the list of network services is within the list of services supported by VPC offering
2012-06-28 17:18:27 -07:00
24772bcb4e
VPC: createPF/createLBrule: 1) don't allow to pass openFirewall=true 2) when no openFirewall is passed in, defaulted to false if the public ip belongs to VPC
2012-06-28 17:18:15 -07:00
c19639e4a2
Static route can be created for generic VpcGateway now, not just Private gateway
2012-06-28 17:17:44 -07:00
46b97cbf7d
VPC: update public IP info in domain_router table once the VR gets the public nic
2012-06-28 10:25:24 -07:00
308fd39a73
VPC: delete network ACLs as a part of network cleanup
2012-06-28 10:18:23 -07:00
b03265bc76
VPC: implemented vpc cleanup thread that cleans up Inactive VPCs (that were failed to delete)
2012-06-28 10:18:14 -07:00
cec5012d5a
VPC: fixed ip addres assignment in createLB rule
2012-06-28 10:18:03 -07:00
c8ec262dea
VPC: as there is no support for FirewallRules/remoteAccessVPN in the VPC, removed the networkId from the list of parameters for corresponding api calls
2012-06-28 10:17:53 -07:00
5ecdad7399
VPC: don't generate empty SetStaticRoute command during VR start when there are no static routes for the VPC
...
Conflicts:
server/src/com/cloud/user/AccountManagerImpl.java
2012-06-28 10:17:34 -07:00
09bd4e1725
VPC: fixed list public ips by vpcId
2012-06-28 10:16:22 -07:00
42dac79e08
VPC: 1) Don't allow to delete private gateway when it has static routes assigned. Routes have to be removed first.
...
2) Re-apply static routes as a part of VPC VR start
2012-06-28 10:13:48 -07:00
1140f081df
VPC: fixed getEntityOwnerId() in AssociateIpAddress command to return vpc owner if vpcId is passed in. Added action events for create/delete privateGateway/staticRoutes
2012-06-28 10:13:36 -07:00
a78fcedb5e
VPC: added vpcId to SetStaticNatRule and CreateLoadBalancerConfig commands
...
Conflicts:
server/src/com/cloud/network/element/NetscalerElement.java
2012-06-28 10:13:19 -07:00
1a232171eb
VPC: implementation for Add/delete/list StaticRoute. Agent implementation is yet to be done
2012-06-28 10:11:41 -07:00
5f6387e113
add clouddev
2012-06-27 23:28:34 -07:00
3938c24b45
CS-15356: cloudstack 3.0 API - updateZone API - when internaldns2 parameter is not being passed to updateZone API, leave it as is (i.e. remain original value of internaldns2).
2012-06-27 16:57:03 -07:00
8197f1f07c
moving out VMWAre and Nexus VSM support code into plugins/hypervisors/vmware
2012-06-26 19:48:55 -07:00
550b22576f
Moving out XenServer support code into plugins/hypervisors/xen
2012-06-26 16:42:31 -07:00
cefbbb3850
moving random storage allocator to plugins/storage-allocators
2012-06-26 15:17:25 -07:00
3ceb8d5667
moving out plaintext authenticator to plugins/user-authenticators
2012-06-26 14:33:27 -07:00
eb5e02e4e1
moving out MD5 authenticator to plugins/user-authenticators
2012-06-26 14:18:42 -07:00
66e14e2627
Applied patch https://reviews.apache.org/r/5522/diff/
2012-06-25 21:19:48 -07:00
ce876e24de
VPC: intermidiate checkin to Static Routes
...
Conflicts:
api/src/com/cloud/api/ApiConstants.java
2012-06-25 21:00:57 -07:00
8be74c033f
VPC: update ip address object after the ip is associated with the network
2012-06-25 21:00:12 -07:00
96c273ad55
VPC: finilize start for the VR - send ip assoc commands only after plug nic is done for all public nics
2012-06-25 21:00:00 -07:00
d35eb73c9b
VPC: initial checkin for Static Routes
...
Conflicts:
api/src/com/cloud/api/ApiConstants.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2012-06-25 20:59:33 -07:00
83ed35f06b
VPC: Don't allow to do ip assoc to the network in the VPC. The ip should be assigned to the VPC itself
2012-06-25 20:58:00 -07:00
b770c8b979
VPC: moved NetworkACL manager to the vpc folder
2012-06-25 20:57:50 -07:00
4e7b65ef71
VPC: CS-15354 - fixed updateNetworkServiceProvider for VpcVirtualRouter
2012-06-25 20:57:37 -07:00
dc04e0b2e5
VPC: listPrivateGateways API implementation
2012-06-25 20:57:09 -07:00
d3ccc3a7de
VPC: fixed NPE in network ACL delete (ip address is null for the rule of this type_
2012-06-25 20:55:37 -07:00
030458a37b
VPC: implemented add/delete Private gateway
...
Conflicts:
client/tomcatconf/commands.properties.in
server/src/com/cloud/api/ApiResponseHelper.java
server/src/com/cloud/dc/DataCenterVO.java
server/src/com/cloud/network/NetworkManagerImpl.java
2012-06-25 20:54:14 -07:00
300110931c
VPC: apply dhcp entries only after all guest nics are plugged
...
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2012-06-25 20:51:09 -07:00
1b1e52ddb0
VPC: apply firewall ACLs as a part of VPC router start/restart and VPC network implement
...
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
2012-06-25 20:47:29 -07:00
1a6102be1e
moving LDAP authenticator to plugins/user-authenticators/ldap
2012-06-25 19:30:00 -07:00
974ad65b01
moving out random host allocator to plugins/host-allocators/random/
2012-06-25 18:47:47 -07:00
621f2447bb
Moved out user concentrated pod deployment planner to plugins/deployment-planners/user-concentrated-pod
2012-06-25 17:58:45 -07:00
392ae5cb13
moving out Srx code into Plugins/network-elements
2012-06-25 16:55:53 -07:00
422c4ce513
moving out F5 code from server into plugins/network-elements/f5/
2012-06-23 14:16:59 -07:00
361ca9643d
CS-15173: Additional Cluster is allowed to add with the same VSM IPaddress as the previous cluster
...
Description:
Restricting association of a Cisco Nexus VSM to a single
cluster.
2012-06-22 13:31:56 -07:00
49b88472a5
moving out NetScaler network element code from CloudStack core into plugins/network-elements/netscaler
2012-06-21 18:57:18 -07:00
ae32736151
Fix compile-tests
2012-06-21 12:25:06 -07:00
887970690b
Added NicTO to SetSourceNat command, CreateLoadBalancerConfigCommand, SetNetworkACLCommand
2012-06-21 10:02:33 -07:00
85fc31ec7f
Make the update proces of the SystemVM SSH keys more reliable.
...
On systems where sudo is used "echo ~" might return the homedirectory from the user who executed the sudo command.
By specifically using "echo ~username" we make sure we get back the correct homedirectory.
The same story goes for when updating the key on disk.
2012-06-21 11:56:54 +02:00
ccec9192a2
VPC: implemented delete and list Network ACL(s)
2012-06-20 17:20:04 -07:00
374a600746
VPC: initial checkin for network ACLs
...
Conflicts:
client/tomcatconf/commands.properties.in
2012-06-20 17:19:49 -07:00
7fda6306b8
VPC: fixed user vm start in case when Implemented network existed w/o VR (it was expunged with DestroyRouter command)
2012-06-20 17:19:17 -07:00
d2abc0e275
canUseForDeploy is always false for system networks
2012-06-20 15:45:14 -07:00
55a12582b4
Completed API / Management server code for Resource tags feature. UI is yet to be done
2012-06-20 15:45:08 -07:00
62d45b9670
Initial checkin for resource tags feature
...
Conflicts:
api/src/com/cloud/api/ApiConstants.java
client/tomcatconf/commands.properties.in
server/src/com/cloud/api/ApiDBUtils.java
server/src/com/cloud/uuididentity/dao/IdentityDao.java
server/src/com/cloud/uuididentity/dao/IdentityDaoImpl.java
setup/db/create-schema.sql
2012-06-20 15:45:08 -07:00
bc94948e06
agent: Set the listen addr of a VM specificly to the private IP of a host
...
Now users have to modify their /etc/libvirt/qemu.conf vnc_listen, this is not needed anymore
2012-06-20 15:29:26 +02:00
e2a32ab4f7
Introduced plugins directory.
...
Moved ovm into plugins.
Introduced build.xml for ovm.
2012-06-19 18:27:09 -07:00
e0860d5a48
CS-14345 Fixing for Login API also.
...
Signed-off-by: Deepti Dohare <deepti.dohare@citrix.com>
2012-06-19 23:07:31 +05:30
19f648f1aa
VPC: plug guest nic on guest network implement, and unplug on shutdown
...
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2012-06-19 10:09:46 -07:00
89d7e54732
Network usage for VPC implementation
...
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2012-06-19 10:08:03 -07:00
214782cc8c
Don't send public/guest nic info when start VR in VPC
...
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2012-06-19 10:05:06 -07:00
fc9a656b97
CS-14345 Logout API is not returning XML header
...
Signed-off-by: Deepti Dohare <deepti.dohare@citrix.com>
2012-06-19 14:26:18 +05:30
817595daf8
Fix bug CS-15261 In case IP address is passed to deployVirtualMachine API, the default property on NIC was not getting set and as a result there was a failure down the line and VM creation was failing.
...
Signed-off-by: U-CITRITE\koushikd <koushikd@banlkoushikd01.citrite.net>
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2012-06-19 06:53:43 +01:00
590b2332de
Don't need to check guest cidr overlap
...
It's not external devices, so guest network with different vlan can be the same.
2012-06-18 16:06:14 -07:00
f6d16d0ab5
CS-15018: Event USER.LOGIN should contain the client IP address. Changes made in accordance with the coding convention.
...
Reviewed-by: Alena Prokharchyk
2012-06-18 10:18:30 -07:00
810151586b
1) Allow having multiple shared networks with the same vlan
...
2) Added new parameter to listNetworks command - canUseForDeploy(boolean). When true, list only networks that can be used for vm deployment (networks have enough ip addresses to allocate from for the vm)
Conflicts:
api/src/com/cloud/api/ApiConstants.java
server/src/com/cloud/api/ApiDBUtils.java
server/src/com/cloud/api/ApiResponseHelper.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/dao/IPAddressDao.java
2012-06-15 16:47:13 -07:00
38215583ea
Fixed lock problem when add vm to guest network
2012-06-15 14:33:32 -07:00
9ae62d32cd
Isolated non-vpc networks: start router with 3 nics from the very beginning
2012-06-15 14:33:14 -07:00
b3985a3b48
Added new capabilities to VPN and Firewall services defining if VPN is S2S or Remote access, and if the Firewall rules should be created per cidr or per public ip address
2012-06-15 14:33:06 -07:00
e69561b857
VPC : revert some change
2012-06-15 14:32:47 -07:00
3e5f391c85
VPC: more changes to ipAssoc
2012-06-15 14:32:39 -07:00
982562b9fb
VPC: ipAssoc consists of 3 parts: plug nic (if needed), associateIp, enableSourceNat(if ip is source nat ip)
...
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2012-06-15 14:31:58 -07:00
c82885021b
More logging to plug nic code
2012-06-15 14:27:49 -07:00
aa2b7d2d8c
VPC: fixed guest network shutdown
2012-06-15 14:27:42 -07:00
39422a3138
Release acquired lock for VPC
2012-06-15 14:27:33 -07:00
7e119e4c94
Fixed addDhcpEntry/userdata/password in VPC setup
2012-06-15 14:27:24 -07:00
aa84256542
1) Added VpcVirtualNetworkApplianceService interface
...
2) Pass dns1/dns2 to setupGuestNetworkCommand
3) Network implement - don't get source nat ip address for Vpc if it already has one
2012-06-15 14:27:00 -07:00
d70d2f82d4
StartRouter: set only control nic during the initial router start; plug exising public and guest nics after the router is started with control nic
2012-06-15 14:25:31 -07:00
973ccdaf4b
VPC : pass netmask once for secondary storage VM
2012-06-15 14:23:51 -07:00
31b8f07bb5
Added NicTO to setupGuestNetworkCommand constructor - we need this info for guest network configuraiton
2012-06-15 14:22:40 -07:00
72974831a0
Modified virtual router startup procedure - initial start happens with control nic only; then we plug Public and then Guest nic to it
2012-06-15 14:22:19 -07:00
0a7faa9838
Support for adding private network
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/upgrade/dao/Upgrade2214to30.java
2012-06-15 14:20:34 -07:00
396fa72ee3
1. move control network to eth0 on domr
...
2. if it is basic mode, use guest NIC as Control NIC
2012-06-15 14:18:38 -07:00
929997f54e
AssociateIpAddress to VPC - the ip gets associated to the network only when the first rule for the ip gets created.
...
When the last rule is removed for vpc ip, networkId is set to null
Conflicts:
api/src/com/cloud/api/commands/AssociateIPAddrCmd.java
api/src/com/cloud/api/commands/EnableStaticNatCmd.java
api/src/com/cloud/network/NetworkService.java
api/src/com/cloud/network/rules/RulesService.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
server/src/com/cloud/network/rules/RulesManagerImpl.java
server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-06-15 14:18:24 -07:00
c56998e876
Support for IPAssoc inside VPC
2012-06-15 14:10:33 -07:00
1189e92708
Destroy VPC if it fails to start during the deployment
2012-06-15 14:10:22 -07:00
9ec8526281
1) Added VPC restart support - new api command RestartVPC. The purpose of the call is to shutdown and start VPC including VPCVirtualRouter restart, rules re-implement, etc
...
2) Only networks created from offerings with conserveMode=false, can participate in VPC
2012-06-15 14:10:09 -07:00
b9a4e79277
1) Added search by vpcId to listRouters/listNetworks Apis
...
2) Don't allow to add new networks/implement existing ones for VPC in Disabled state. Disabled state indicates that there was unsuccessful attempt to remove the VPC, and the further cleanup will be taken care of by cleanup thread.
Conflicts:
server/src/com/cloud/network/dao/IPAddressDao.java
server/src/com/cloud/server/ManagementServerImpl.java
2012-06-15 14:09:37 -07:00
d5507e1379
Support for delete VPC
2012-06-15 14:08:26 -07:00
f28cefc4c3
Added support for network shutdown in VPC guest networks
2012-06-15 14:07:59 -07:00
d9fd7e02a5
Plug nic support
...
Conflicts:
server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java
server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
2012-06-15 14:07:46 -07:00
f4060c3c1d
1) Added new element - VpcVirtualRouterElement. Extends VirtualRouter + has plug/unplug nics support
...
2) Added services api support for plugging/unplugging the nics to VpcElement
Conflicts:
api/src/com/cloud/network/NetworkService.java
core/src/com/cloud/vm/VMInstanceVO.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-06-15 14:04:09 -07:00
c12ba9c86d
Add type and rpcfilter to the virtual router bootload arguments even when there is no guest network is being configured.
2012-06-15 13:57:27 -07:00
bdfd484444
Deploy VR as a part of VPC: set elementId to the VR element id of the first physical network in the zone by now. TODO - add logic for handling the case when VR has 1 to many element ids relationship
2012-06-15 13:57:11 -07:00
ab680bc30c
Start Virtual Router as a part of VPC start
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
2012-06-15 13:57:00 -07:00
9debd3a5df
1) Added start logic to the VPC
...
2) VirtualRouterManagerImpl - refactored deployVirtualRouter method
3) Added vpcId to domain_router/user_ip_address tables and corresponding vo objects
Conflicts:
server/src/com/cloud/network/IPAddressVO.java
2012-06-15 13:56:05 -07:00
afd2d0331f
Set networkId as a join parameter in DomainRouterDaoImpl as networkId was moved to the helper table
2012-06-15 13:55:01 -07:00
998cf66e6c
Removed network_id reference from domain_router table as now VirtualRouter can be associated with multiple networks (VPC case). Code modifications were done accordingly to the places where this field was used.
...
Router->Networks (one to many) are held in router_network_ref table now
2012-06-15 13:54:48 -07:00
60b52f90dd
Initial checkin for VPC feature:
...
1) Added API frameworks for the feature. New commands:
* CreateVPCCmd
* ListVPCsCmd
* DeleteVPCCmd
* UpdateVPCCmd
* CreateVPCOfferingCmd
* UpdateVPCOfferingCmd
* DeleteVPCOfferingCmd
* ListVPCOfferingsCmd
2) New db tables:
* `cloud`.`vpc`
* `cloud`.`vpc_offerings`
* `cloud`.`vpc_offering_service_map`
and corresponding VO/Dao objects.
Added vpc_id field to `cloud.`networks` table - not null when network belongs to VPC
3) New Manager and Service interfaces- VpcManager/VpcService
4) Automatically create new VpcOffering (if doesn't exist) on system start
5) New Action events:
* VPC.CREATE
* VPC.UPDATE
* VPC.DELETE
* VPC.OFFERING.CREATE
* VPC.OFFERING.UPDATE
* VPC.OFFERING.DELETE
Conflicts:
api/src/com/cloud/api/ApiConstants.java
client/tomcatconf/commands.properties.in
server/src/com/cloud/api/ApiDBUtils.java
server/src/com/cloud/network/NetworkManagerImpl.java
setup/db/create-schema.sql
2012-06-15 13:53:59 -07:00
d0bdab98ae
bug CS-15191: remove a sanity check that prevent us from getting traffic lable under VMware
...
Reviewed-by: anthony
2012-06-06 16:57:49 -07:00
8b6936bde6
CS-15080: VMware control network is CloudStack management network, correct the way to send down a correct traffic label to VMware resource
...
Reviewed-by: Anthony
2012-06-06 16:57:27 -07:00
9298e5d25d
bug 15080: check traffic type in host discovery stage - cluster level checks
2012-06-06 16:54:16 -07:00
d8d4232a7b
bug : CS-15080 - check traffic label at host discovery stage also
2012-06-06 16:53:53 -07:00
7092532ae8
CS-15220: fixed db upgrade for networks using external devices
...
Reviewed-by: Sheng Yang
Conflicts:
server/test/com/cloud/network/MockNetworkManagerImpl.java
Conflicts:
server/src/com/cloud/upgrade/dao/Upgrade2214to30.java
2012-06-05 15:10:49 -07:00
Edison Su
Edison Su
Harikrishna Patnala
Prachi Damle
Rohit Yadav
Sheng Yang
Abhinandan Prateek
Kishan Kavala
Prasanna Santhanam
Likitha Shetty
Min Chen
Koushik Das
Alex Huang
Marcus Sorensen
Mice Xia
Wei Zhou
Sanjay Tripathi
Murali Reddy
anthony
Anthony Xu
Anthony Xu
Hugo Trippaers
Hugo Trippaers
Kelven Yang
Saksham Srivastava
joesan
Jayapal
Wido den Hollander
frank
Andrew Bayer
Chiradeep Vittal
Noa Resare
John Burwell
Isaac Chiang
Chip Childers
Simon Waterhouse
Vijayendra Bhamidipati
Alena Prokharchyk
Hiroaki Kawai
adefanti
Vijay Venkatachalam
Deepak Garg
Pranav Saxena
Laszlo Hornyak
Satoshi Kobayashi
Dave Cahill
Edison Xu
Joe Brockmeier
Jessica Wang
Kelven Yang
Rohit Yadav
Marcus Sorensen
Manikanta Kattamuri
Fang Wang
Gavin Lee
Darren Shepherd
Nitin Mehta
olivier lamy
Darren Shepherd
Darren Shepherd
David Nalley
Mice Xia
tomoe@midokura.jp
Edison Su
Sheng Yang
bfederle
Prasanna Santhanam
Deepti Dohare
Jason Bausewein
unknown
U-CITRITE\\koushikd
Kelven Yang