16216720c6
CLOUDSTACK-1276, CLOUDSTACK-1729: Remove autoscanning, ensure adpater execution order in runtime
2013-03-29 11:11:20 -07:00
ee3fd18435
BigSwitch networking plugin update
...
Update BigSwitch Plugin:
. UI support for adding BigSwitch controller as a network service provider
. Correct the message format between the plugin and the controller
. Add Health check API
Test to add a BigSwitch controller as a network service provider and view.
Test to implementation of guest network on the controller
Test to associate VM to its guest network
2013-03-29 18:54:48 +05:30
b585fa11c1
removing @Autowired, which is not JSR complaint.
...
initializing the bean 'GlobalLoadBalancingRulesServiceImpl' through the componentContext.xml
2013-03-29 15:53:59 +05:30
6a7156ad9a
CLOUDSTACK-712: Feature Syslog Enhancements
...
Signed-off-by: Anshul Gangwar <anshul.gangwar@citrix.com>
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-03-29 09:53:05 +05:30
3e4430d811
CLOUDSTACK-658 - Scaleup vm support for Xenserver
...
Added the framweork so that it can be extended for vmware and kvm as well.
Added unitests and marvin tests.
2013-03-28 16:43:37 +05:30
c5fb8349bf
CLOUDSTACK-653 : High Availability: implement GSLB (Global Server Load
...
Balancing) capability for ELB service
merging GSLB feature
2013-03-27 17:54:07 +05:30
359b931993
CLOUDSTACK-1788: remember, changing componentcontext.xml also needs to
...
change nooss, they are not in inheritance relationship any more.
2013-03-26 17:51:21 -07:00
3ed6200ef8
move default primary storage plugin into its own pom
2013-03-20 17:21:40 -07:00
873ec27135
simulator: by default don't start the simulator discoverers
...
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-03-20 14:52:32 +05:30
792db8b5cc
simulator: removing cyclic dependency from simulator
...
The database creator caused a cyclic dependecny in the simulator which
is removed with this commit. Additionally the simulator profile is now
merged with developer profile and a test for server health is included
Steps to run:
$ mvn -Pdeveloper clean install
$ mvn -Pdeveloper -pl developer -Ddeploydb
$ mvn -Pdeveloper -pl developer -Ddeploydb-simulator
$ mvn -pl client jetty:run
To deploy an adv. zone and test the server health:
$ mvn -Pdeveloper,marvin -Dmarvin.config=`find . -name simulator.cfg` -pl :cloud-marvin test
Conflicts:
pom.xml
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-03-20 10:36:43 +05:30
4faad73d6c
CLOUDSTACK-1729: a partical resolution for user authenticators to unblock developers who are currently working on, for non-oss version
2013-03-19 18:54:16 -07:00
2bebb124cc
CLOUDSTACK-1729: a partical resolution for user authenticators to unblock developers who are currently working on and relying on the fix
2013-03-19 15:47:22 -07:00
61754cd987
CLOUDSTACK-680: Feature SNMP Alerts support in CloudStack
...
Signed-off-by: Anshul Gangwar <anshul.gangwar@citrix.com>
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-03-18 11:36:19 +05:30
183b989d30
CLOUDSTACK-664:AWS-Health Check feature: Patch applied cleanly , RAT build is successful
2013-03-18 14:01:15 +05:30
0f8c4d0ac0
baremetal: Remove old templateadapter in cloud-server, fix spring xmls
...
The BareMetalTemplateAdapter in cloud-server is old and was introduced by recent
branch merges, Frank had separated and moved code to the baremetal plugin so
we will use that.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-03-13 11:50:54 +05:30
162de5b17f
CLOUDSTACK-1323: retire some of no-longer used files
...
Conflicts:
client/tomcatconf/components.xml.in
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-03-12 14:44:58 +05:30
f539f40e35
CLOUDSTACK-874: Ability to delete Events and Alerts
...
This feature will provide the functionality to delete or archive
the Alerts/Events.
Delete or archive alerts APIs are available only for root-admin,
delete or archive events are available for regular users.
2013-03-08 11:59:53 -08:00
bd4508589b
Revert "CLOUDSTACK-874 Ability to delete Events and Alerts"
...
This reverts commit 5e4c2c8a9e
2013-03-08 14:28:23 -05:00
5e4c2c8a9e
CLOUDSTACK-874 Ability to delete Events and Alerts
...
Signed-off-by: Min Chen <min.chen@citrix.com>
2013-03-08 10:52:40 -08:00
333dd810d2
CLOUDSTACK-1339: Using Sping interface injection pattern to avoid using CGLIB proxying mode. Spring with CGLIB proxying will concflict with CGLIB usage in CloudStack DB code, CloudStack CGLIB usage can cause Spring to lose tack of its proxied object and therefore creates a massive amount of objects in memory
2013-03-05 19:03:30 -05:00
b683c34d3f
Fix the typo in componentContext.xml.in
...
HypervisorTemplateAdapter was mispelt causing server to not startup.
Reported-by: Dave Cahill <dcahill@midokura.net.jp>
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-03-05 13:51:06 +05:30
613a061977
Merge branch 'master' into vim51_win8
...
Conflicts:
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
2013-03-04 17:32:52 -08:00
7a54458e17
CLOUDSTACK-1502 Fixed the api-doc build component caused by new API commands:
...
addIpToNic
removeIpFromNic
listNics
1) Removed trailing whitespaces from commands.properties file for the commands above
2) Created a new category "Nic" in gen_toc.py for the new commands
2013-03-04 16:19:08 -08:00
b12aebefee
Revert "CLOUDSTACK-658 - Adding Scalevm command and XS related changes"
...
This reverts commit e0019eccd9
2013-03-04 23:32:52 +05:30
e0019eccd9
CLOUDSTACK-658 - Adding Scalevm command and XS related changes
2013-03-04 14:47:55 +05:30
aedb8c478e
CLOUDSTACK-24: mipn feature for isolated and vpc networks
...
https://cwiki.apache.org/confluence/display/CLOUDSTACK/Multiple+IP+address+per+NIC
https://issues.apache.org/jira/browse/CLOUDSTACK-24
2013-03-04 11:02:09 +05:30
8b9c45b96d
Merge branch 'master' into vim51_win8
...
Conflicts:
setup/db/db/schema-40to410.sql
2013-03-01 16:46:58 -08:00
14791a9d8f
Revert "CLOUDSTACK-24: multiple ip address per vm nic changes for isolated and vpc networks changes."
...
This reverts commit f9d96c9169
2013-03-01 22:29:47 +05:30
f9d96c9169
CLOUDSTACK-24: multiple ip address per vm nic changes for isolated and vpc networks changes.
2013-03-01 16:40:26 +05:30
f1249b353e
CLOUDSTACK-1450. AWSAPI server fails to start.
...
Missing annotation @Component in CloudStackUserDao implementation
2013-03-01 15:23:39 +05:30
bd0fc2f354
CloudStack CLOUDSTACK-723
...
Enhanced baremetal servers support on Cisco UCS
change UcsXxxDao to Spring xml loading
change ListxxxCmd to inherit ListCmd
change API response in line with current API architecture
adding missing db schema to db upgrade schemaOh
Conflicts:
client/pom.xml
plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsBladeDaoImpl.java
plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsManagerDaoImpl.java
2013-02-28 15:42:48 -08:00
801e5269ea
Merge branch 'master' into vim51_win8
2013-02-28 14:25:26 -08:00
6f19895191
Remove unused RandomlyIncreasingVMInstanceDaoImpl to avoid confusion.
...
Confirmed with Kishan about this.
2013-02-28 14:17:58 -08:00
9801667199
Revert classpath.conf.in to before .deb packaing merge
...
This change is apparently incompatible with the centos packaging,
temporarily reverting until we have discussed a proper fix
CLOUDSTACK-1436: 4.1 management server fails to start from RPM...
CLOUDSTACK-1423: Unable to launch UI [HTTP Status 404 - ]
Signed-off-by: David Nalley <david@gnsa.us>
2013-02-28 19:45:46 +00:00
e5bf4a8fc4
CLOUDSTACK-1434 BeanCreationException: Error creating bean with name 'apiRateLimitServiceImpl' when starting up mgmt server
2013-02-28 11:49:12 +08:00
93f14e7c65
Merge branch 'master' into vim51_win8
...
Conflicts:
client/tomcatconf/componentContext.xml.in
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java
vmware-base/test/com/cloud/vmware/TestVMWare.java
2013-02-27 17:47:10 -08:00
36f4b44c36
Fix CLOUDSTACK-1425 and CLOUDSTACK-1399: Failed to load UserVmDaoImpl in
...
new Spring framework and register it into internal dao map.
2013-02-27 15:47:07 -08:00
2f135be15f
CLOUDSTACK-1415: Debian & Ubuntu packaging work
...
Some concepts included:
* the replace.properties location used by maven is parameterized to allow
for a build that does not modify the currently git tracked files
* package naming is updated along the lines of what was discussed on the
-dev mailing list and between committers at the Build a Cloud Day in Belgi
* package version pattern is updated (since we redo all package names,
we might as well drop the epoch)
2013-02-27 15:44:46 +00:00
ddd507bccc
Missed commenting the missing allocator.
2013-02-27 20:03:33 +05:30
d68b6c3e54
temporary fix: autowriring failing for missing storage allocator
...
The storage allocator beans were given with the wrong package namespace
of com.cloud and not org.apache.cloudstack. Removed and correctedt the
namespace. Server coems up successfully.
Edison to revisit and complete the fix.
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-02-27 20:01:16 +05:30
8e360f342d
CLOUDSTACK-724: add basic zone wide storage support, refactor storage allocator, need ui support
2013-02-26 18:39:23 -08:00
8aba25f18d
Merge branch 'master' into vim51_win8
...
Conflicts:
setup/db/db/schema-410to420.sql
2013-02-26 14:12:36 -08:00
c1d513ef12
CloudStack CLOUDSTACK-1382
...
vm deploy fails with Error "cannot find DeployPlannerSelector for vm"
adding configuration of DeployPlanSelector to nonossComponentContext.xml.in
fixed resolved
2013-02-25 16:07:50 -08:00
fbfc5c6894
Merge from master and fix conflicts
2013-02-25 11:53:24 -08:00
79fee523bd
CloudStack CLOUDSTACK-774 add baremetal related class declaration in nonossComponentContext.xml
2013-02-22 15:56:54 +08:00
15ead099a1
CloudStack CLOUDSTACK-774
...
Supporting kickstart in CloudStack baremetal
able to start vm
Conflicts:
client/tomcatconf/componentContext.xml.in
server/src/com/cloud/baremetal/BareMetalTemplateAdapter.java
server/src/com/cloud/baremetal/BareMetalVmManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
2013-02-21 15:48:08 -08:00
55b77c7c8f
CloudStack CLOUDSTACK-774
...
Supporting kickstart in CloudStack baremetal
adding missing scripts back
Conflicts:
client/pom.xml
client/tomcatconf/commands.properties.in
server/src/com/cloud/server/ManagementServerImpl.java
2013-02-21 15:46:11 -08:00
1f15c1e9e7
CloudStack CLOUDSTACK-774
...
Supporting kickstart in CloudStack baremetal
fixing bugs to align to new code base
Conflicts:
client/tomcatconf/componentContext.xml.in
2013-02-21 15:42:38 -08:00
11d5eadc72
Summary: Re-adjusting tomcat memory settings per Rohit's emails
...
Detail: adjusting MaxPerm to 800, Perm to 512.
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1361312885 -0700
2013-02-19 15:30:42 -07:00
5b94646d5e
Summary: Increase tomcat servers memory size per dev list discussion
...
Detail: Per Kelven Yang when Javelin was merged into master/4.1, the memory
settings for management server should be a heap of 2g and a max perm size of
512m, due to increased footprint introduced by spring framework/Javelin.
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1361311099 -0700
2013-02-19 15:00:34 -07:00
edac894f31
spring changes for simulator component
...
allow spring to do DI for simulator plugin. componentContext.xml will
have simulator components disabled by default.
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-02-19 16:40:57 +05:30
9a12756ae4
CLOUDSTACK-684 support vm snapshot
2013-02-14 01:26:30 +08:00
7401b06cb1
CLOUDSTACK-1070: Don't create HyervisorTemplateAdapter bean, it's already a @Component
...
The issue was completely different than a spring injection issue
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-13 15:54:42 +05:30
c0442e2556
Fix a bug in register template, cannot find template adapter.
2013-02-12 16:56:02 -08:00
1896685d83
Slightly upgraded memory requirements, with 128M the server will crash
...
after 30 minuted with an OOM on PermGen
2013-02-11 17:47:35 +01:00
12cbaad691
Remove duplicate bean for ApiRateLimitServiceImpl to make sure that only
...
one ApiChecker instance is injected in ApiServer.
2013-02-07 21:50:07 -08:00
9d134f0f19
Summary: We need the integrity checkers to run
...
The EncryptionSecretKeyChecker is required to load db.properties with
encrypted passwords.
Make usre the integrity checkers are run before anything else during
start-up
2013-02-05 23:50:01 +01:00
e5866cf2ef
CLOUDSTACK-1165, fix nonoss build startup issue
2013-02-05 14:27:57 -08:00
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
43dc31bcf2
NiciraNvpElement is loaded twice, but no idea where. This makes it work
...
however
2013-02-04 15:08:58 +01:00
e74f72be34
Fix the merge conflicts
2013-02-01 15:22:58 -08: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
736b236eaf
bigswitch controller support
...
Reviewed-by: Chiradeep Vittal <chiradeepv@gmail.com>
Signed-off-by: Murali Reddy <murali.reddy@citrix.com>
2013-02-01 12:42:04 +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
7bd8bec68a
Sync javelin with master up to 894cb8f7d9
2013-01-31 17:20:19 -08:00
64d794ea36
Restore old caching policy on DAOs under Spring configuration
2013-01-31 16:00:13 -08:00
5cb9df91a1
Merge branch 'ipv6'
...
Conflicts:
api/src/com/cloud/network/NetworkProfile.java
2013-01-31 15:07:33 -08:00
1b2b369ecb
Merge latest master into javelin
2013-01-31 11:34:49 -08:00
c607e03f0e
Merge branch 'master' into regions
2013-01-31 22:31:25 +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
b6727e5646
CLOUDSTACK-299: Egress firewall rules feature for guest network on VR
2013-01-31 11:20:47 +05:30
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
c5b2a65598
Removing the merge conflict statements from git.
2013-01-30 17:04:57 -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
397b5b5829
Removing the merge conflict statements from git.
2013-01-30 16:30:57 -08:00
8887f01b37
CLOUDSTACK-1070: HypervisorTemplateAdapter needs to be configured with proper name
2013-01-28 17:12:41 -08:00
ea660cd06d
removed MockAPI server
2013-01-28 17:50:38 +05:30
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
767f54cc9a
Make nonoss build work under Spring
2013-01-25 17:18:36 -08:00
2b67fc8441
Add nonossComponentContext.xml.in for nooss composition of CloudStack
2013-01-25 15:48:25 -08:00
1f57d925eb
Apply API refactoring changes. Make changes to Regions API to work with new code
2013-01-25 18:41:59 +05:30
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
1cb0ce44df
Removing BareMetalService referrences. We will load UserVMService by default.
2013-01-22 12:54:20 -08:00
2c5859dbd4
Bring javelin back to the status of being able to start System VMs after another round of master branch merge
2013-01-18 19:15:32 -08:00
d056cd5cab
Add configurable components to Spring XML context file to allow configuration of componets not hard-coded in code
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
6214b1d4bd
db.properties: adding other key value info for dbcreator to work in a generic way
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-18 17:19:55 -08:00
10d9c019a9
All merge conflicts resolved
2013-01-18 12:14:57 -08:00
2fd1d476b4
Merge branch 'master' into api_limit
2013-01-17 21:23:50 -08:00
86ada92ffa
Fix some bugs and add java integration test for api rate limit plugin.
2013-01-17 15:13:51 -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
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
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
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
af67d87662
Fix issues with @DB support in Spring environment
2013-01-15 12:35:03 -08:00
0a1e4b8cf9
tomcatconf: Move apiname:mask rules in commands.properties.in, delete others
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-14 19:01:25 -08:00
f304df44df
Add ActionEventIntercepter to implement origianl ActionEventCallback in Spring AOP
2013-01-14 17:44:31 -08:00
ec3dd71adf
Configure ApiRateLimit adapter.
2013-01-14 17:19:35 -08:00
4d0c850dc8
Fix plugin component configuration.
2013-01-14 17:13:18 -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
9faf00bdc8
Fix license on xml.in, jsp and ucls files on javelin
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-12 06:34:34 -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
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
74bb043c37
APIChecker: Rename refactor and add interface checkExistence
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-10 18:51:30 -08:00
d900345a20
Ehcache implementation of APi Rate limit plugin.
2013-01-10 17:47:48 -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
345c179e77
plugins: Check access based on roleType, remove unnecessary properties.in file
...
- Fix StaticRoleBasedAPIAccessChecker to check api access based on roletype
- Remove properties file which is not needed now for api discovery plugin
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-10 15:55:02 -08:00
0bcebd33b6
Fix problems after merge
2013-01-09 17:36:53 -08:00
d13cc7e7e4
ApiDiscoveryService: Use only as pluggable service
...
Remove usage and impl as adapter.
We have duplicate code that generates apiname:cmd class maps which is
unavoidable right now as:
- Plugin should not depend on ApiServer or any other component
- cloud-utils cannot depend on cloud-api for the APICommand annotation
- Use java reflect to create a static method in cloud-utils that does the job
would be unsafe.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-09 17:25:29 -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
cf5d935d81
Seperate configurable components out and let them be loaded from Spring configuration file
2013-01-09 14:39:16 -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
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
cc23a23324
Fix startup sequence for classes that have due Manager/Adapter interfaces
2013-01-08 18:42:12 -08:00
30f2565d98
Merge branch 'api_refactoring' into javelin
2013-01-08 12:36:04 -08:00
af1abe4056
Forgot some element adapters + dont add JuniperSRX by default
2013-01-07 15:21:57 -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
0df94a8be1
Remove old syntax for commands.properties, apiname=rolemask is enough
...
While the syntax is being fixed, the static role based acl plugin is backward
compatible while processing the commands.properties files in either syntax...
As per new syntax, you do:
apiname=rolemask
apiname and cmd class info is couple in the cmd class itself which apiserver
creates a mapping of when it starts.
Fix old syntax for role based acl:
for i in `find . | grep commands.properties.in`;
do
echo $i;
sed 's/[ ]*=[a-zA-Z 0-9\.]*;/=/g' $i > $i-temp;
rm $i;
mv $i-temp $i;
done
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-06 13:56:56 -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
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
85e73a640e
Merge branch 'master' into api_refactoring
...
Conflicts:
client/tomcatconf/commands.properties.in
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-03 23:27:42 -08:00
107fccdf69
Add AsyncCallFuture
2013-01-03 17:24:26 -08:00
25d14418b9
Replace Adapters<T> with standard List<T> to work with Spring injection
2013-01-03 13:33:52 -08:00
6ce01c46fc
UI: add generate key button to appropriate roles
2013-01-03 10:58:13 -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
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
1f1a13448f
simulator: resurrect simulator hypervisor as plugin
...
Multiple fixes:
1. changes to the mvn configuration
a. include simulator to client.war
b. activate simulator by profile
2. templates for simulator
3. developer prefill for simulator
a. Use deplydb-simulator to setup simulator db
4. Inherit components-simulator.xml from components.xml
5. ListVolumesCommand missed for MockStorageManager
6. Include simulator properties into utils/db.properties
TODO:
Secondary storage VMs don't come up because ComponentLocator doesn't
retain a unique set of adapaters by name. Fix this in subsequent
checkin.
2012-12-23 19:28:57 -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
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
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
877e16029c
Fix a few Spring issues to Bootstrap javaline server
2012-12-21 16:49:27 -08:00
6b04f326f0
api: Enable UTF-8 URI encoding for tomcat
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-17 20:43:37 -08: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
988ccfc45d
removed some unused database connection properties
...
Signed-off-by: Laszlo Hornyak <lhornyak@redhat.com>
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2012-12-13 22:46:29 -08:00
503082a49e
api: Add ACL adapter for components.xml
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-10 17:27:11 -08:00
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
947ac982bc
api: fix apidocs build bug
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 17:38:12 -08:00
5d998a616b
api_refactor: move forgotten apis, uncomment and fix mappings
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 11:32:10 -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
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
55f2bd810a
api_refactor: move template api preparetemplate to admin pkg
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-05 15:15:26 -08:00
ceddaf122c
api_refactor: refactor user apis
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-05 14:55:58 -08:00
0799052d70
commands-ext.properties.in: remove duplication, same in commands.properties.in
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-05 14:40:45 -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
0bbe82e8e1
api_refactor: move usage apis in parts to admin.usage
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-05 14:29: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
8d8285a8d4
api_refactor: vpc admin apis
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-05 14:13:09 -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
99875a165f
api_refactor: admin apis for vpc
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 11:44:27 -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
d3261e5bb3
api_refactor: move listhyperisor to datacenter
...
will use this for all organizational units
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 10:41:22 -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
91d199b8d8
api_refactor: refactor list hypervisor api
...
- Fix refactored apis, mappings in commands*.in
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 00:34:26 -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
13aa4d8530
api_refactor: refactor nat apis
...
- Fix refactored apis, fix mappings in commands*.in
- Fix comments etc.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-03 23:30:54 -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
5e0501d116
api_refactor: refactor project 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:10:32 -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
dda4d39b55
AutoScale changes in Apache master
2012-11-16 10:56:44 +05:30
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
4572bc0685
Summary: Sample packaging scripts
...
This is a manual merge of the maven-to-rpm branch. This commits show how an RPM
package can be built without waf. The current version only builds the management
server rpm and some related rpms like setup. The main missing items are agent rpm and
the awsapi rpm. But it should at least show how to use maven and packaging.
Several small tweaks are put into the client/pom.xml to make sure that the war
has all items required to run as a standalone war.
2012-10-30 16:31:36 +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
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
f0f33bf4da
Added Mock ApiServer, Regions API calls with api keys
2012-10-17 14:16:36 +05:30
c07d6d28ee
Merge branch 'nicira-l3support'
...
This commit merges the nicira-l3support branch with master. This
effectively adds nicira nvp l3 support to master. The NiciraNVP Provider
can support the following services with this modification: Connectivity,
SourceNat, StaticNat and PortForwarding
Testing done:
Create, Delete network offerings with Nicira Element
Use Gui to add, modify, remove Nicira Element and Provider
Provision, deprovision SourceNat networks
Provision, deprovision Portforwarding and StaticNat rules
Tested with Nicira NVP release 2.1.0, 2.2.0 and 2.2.1 (2.2.x recommended)
2012-10-12 14:15:17 +02:00
2c2afda062
jetty:run should use ${project.build.directory}/${project.build.finalName} directory
2012-10-11 12:08:28 -07:00
ac97d67528
add nonoss maven build
2012-10-11 01:15:52 -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
dd68a00338
Persist the uuid of the logical router once created
2012-09-27 22:16:11 -07:00
4fcf64dd74
updated regions branch with changes from master
2012-09-27 17:04:59 +05:30
6e9d7aa45b
property files and build file fixes for simulator db changes
2012-09-17 17:33:26 +05:30
7eaf537d95
Rename cloud-agent-scripts to cloud-scripts
...
The management server also depends on a couple of these scripts, so renaming
to cloud-scripts makes more sence then installing cloud-agent-scripts.
In the future we might want to split this up in two packages.
2012-09-13 16:29:01 +02:00
0ae1d58c19
CLOUDSTACK-50 build-apidocs ClassNotFoundException: com.cloud.api.commands.DeleteCiscoNexusVSMCmd
2012-09-08 10:56:32 +08:00
5ae15f8bbf
first OSS build
2012-09-05 17:45:25 -07:00
39aa7d86af
Moved Awsapi (EC2/S3) from Hibernate framework to CloudStack Generic Dao Framework
...
Created/Modified new VO's and Dao Impl classes to use Generic Dao Framework
2012-08-31 11:44:58 -07:00
511e3cb235
[ASFCS40]CS-15373: Awsapi port change to 7080.
...
Reviewed-By: Frank
Changes:
- Changes to deploy awsapi in separate webapps folder and listeining on 7080 port
- Revert changes which were done to open 7080 on CloudStack
Conflicts:
awsapi/conf/cloud-bridge.properties
client/tomcatconf/server-ssl.xml.in
2012-08-21 16:27:55 -07:00
cf06317671
Probably a left-over of a merge conflict
2012-08-02 09:33:48 +02:00
ce9f1afa78
Merge branch 'master' into vpc
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
2012-08-01 19:04:28 -07:00
99b0ea7b10
License header update for the client folder
2012-08-01 13:49:10 -04:00
736c4c1510
CS-15670: Allow normal users to configure S2S VPN
2012-07-27 16:27:36 -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
7b18b72eca
CS-15664 There is a typo in component.xml relating to Nicira NVP Integration
2012-07-25 15:14:40 +05:30
6420ecbd6f
Merge branch 'master' into vpc
...
Conflicts:
server/src/com/cloud/server/ManagementServerImpl.java
2012-07-24 16:13:06 -07:00
766a17b3ef
Typo in components.xml.in
2012-07-24 15:47:40 -04:00
c8f72c9198
Merge branch 'master' into vpc
...
Conflicts:
ui/scripts/network.js
2012-07-23 10:36:25 -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
14fa5279e2
Merge branch 'master' into vpc
2012-07-17 17:12:17 -07:00
88205a7a83
Added ant target deploy-server-encrypt to enable encryption in dev setup
2012-07-16 16:11:44 -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
79c7da07ab
Phase 1 of Nicira integration
2012-07-11 17:16:06 -07:00
37ab2dd49b
S2S VPN: Add privilege for normal users on list commands
2012-07-10 18:58:33 -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
6a1b0f3ecf
Add Region APIs
2012-07-03 13:05:19 -07:00
5bcf73080a
Merge branch 'master' into vpc
2012-07-02 17:47:01 -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
Kelven Yang
Kanzhe Jiang
Murali Reddy
Anshul Gangwar
Nitin Mehta
Edison Su
Prasanna Santhanam
Rajesh Battala
Rohit Yadav
Sanjay Tripathi
Chip Childers
Min Chen
Alena Prokharchyk
Jayapal Uradi
Abhinandan Prateek
Likitha Shetty
frank
Noa Resare
Mice Xia
Edison Su
frank
Marcus Sorensen
Hugo Trippaers
Hugo Trippaers
Kishan Kavala
Sheng Yang
Harikrishna Patnala
Prachi Damle
Alex Huang
Chiradeep Vittal
Isaac Chiang
Laszlo Hornyak
Vijay
Kelven Yang
Wido den Hollander
Salvatore Orlando
bfederle