7bd8bec68a
Sync javelin with master up to 894cb8f7d9
2013-01-31 17:20:19 -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
1b2b369ecb
Merge latest master into javelin
2013-01-31 11:34:49 -08:00
b6727e5646
CLOUDSTACK-299: Egress firewall rules feature for guest network on VR
2013-01-31 11:20:47 +05:30
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
176523254e
Improve component lifecycle management with system run-level concept
2013-01-30 15:21:02 -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
2cbca372bf
IPv6: Add support for IPv6 on DeployVMCmd
2013-01-28 18:54:34 -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
df5c4c3048
Fixing VPC unit test to use Spring
2013-01-24 23:05:31 -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
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
1567a112fa
unit test works again
2013-01-24 14:36:44 -08:00
c3f1a9d324
CLOUDSTACK-355: fix count for listSwiftsCmd.
2013-01-22 17:14:44 -08:00
e6cd47ddc0
More changes for deployVM flow.
2013-01-22 12:54:07 -08:00
ee39ec82d3
Making unit tests work
2013-01-22 11:18:51 -08:00
4fbecf15ec
add unit test back, primary storage life cycle is tested
2013-01-21 17:01:00 -08:00
fe6f0457d5
fixed unit tests from merge
2013-01-18 15:58:55 -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
2fd1d476b4
Merge branch 'master' into api_limit
2013-01-17 21:23:50 -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
86ada92ffa
Fix some bugs and add java integration test for api rate limit plugin.
2013-01-17 15:13:51 -08:00
cbb7ff1c32
added missing files
2013-01-17 06:50:59 -08:00
9759ad57f2
Commit the current changes to unit tests
2013-01-17 06:50:11 -08:00
06fa338d42
Add some tests for api rate limit plugin.
2013-01-16 21:56:25 -08:00
d9e36ac37b
network-refactor: fix license issues
...
Fix build after merge of network-refactor
2013-01-16 19:25:23 -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
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
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
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
4d0c850dc8
Fix plugin component configuration.
2013-01-14 17:13:18 -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
8cdb40a416
NetworkManagerImpl: Add method to getNetwork by uuid
...
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
1294cdc701
pulled from master
2013-01-10 16:01: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
56e5fbdee2
removed import of componentlocator and inject from all files
2013-01-10 11:44:47 -08:00
f40e7b7511
removed componentlocator and inject
2013-01-10 11:05:20 -08:00
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
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
Kelven Yang
Sheng Yang
joesan
Jayapal
Rohit Yadav
Harikrishna Patnala
Marcus Sorensen
Prachi Damle
Min Chen
Alex Huang
Edison Su
Chiradeep Vittal
Murali Reddy