Commit Graph

65 Commits

Author SHA1 Message Date
Chip Childers 2e2dd684d2 Updating pom.xml version numbers for release 4.1.2-SNAPSHOT
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-07-31 11:06:29 -04:00
ilya musayev cf2babe7a7 Revert "Updating pom.xml version numbers for release 4.1.1"
This reverts commit d2c646f0a4.
2013-07-25 13:55:33 -04:00
ilya musayev d2c646f0a4 Updating pom.xml version numbers for release 4.1.1
Signed-off-by: ilya musayev <ilya@apache.org>
2013-07-25 13:52:58 -04:00
ilya musayev 8794bb6346 Revert "Updating pom.xml version numbers for release 4.1.1"
This reverts commit 8fe3505cba.
2013-07-24 13:13:09 -04:00
ilya musayev 8fe3505cba Updating pom.xml version numbers for release 4.1.1
Signed-off-by: ilya musayev <ilya@apache.org>
2013-07-24 13:11:48 -04:00
Chip Childers 707f95dfa0 Updating pom.xml version numbers for release 4.1.1-SNAPSHOT
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-06-15 13:14:40 -04:00
Chip Childers 780439e3bb Revert "Updating pom.xml version numbers for release 4.1.0"
This reverts commit a5214bee99.
2013-05-28 09:22:01 -04:00
Chip Childers a5214bee99 Updating pom.xml version numbers for release 4.1.0
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-05-28 09:16:12 -04:00
Chip Childers aa29234ee0 Revert "Updating pom.xml version numbers for release 4.1.0"
This reverts commit d0da9f7f46.
2013-05-28 09:09:22 -04:00
Chip Childers d0da9f7f46 Updating pom.xml version numbers for release 4.1.0
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-05-28 09:03:41 -04:00
Chip Childers 8a99d19b34 Revert "Updating pom.xml version numbers for release 4.1.0"
This reverts commit db007da152.
2013-05-26 10:36:16 -04:00
Chip Childers db007da152 Updating pom.xml version numbers for release 4.1.0
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-05-26 10:32:45 -04:00
Chip Childers 2229727236 Revert "Updating pom.xml version numbers for release 4.1.0"
This reverts commit 873c1972c7.
2013-05-24 12:37:59 -04:00
Chip Childers 873c1972c7 Updating pom.xml version numbers for release 4.1.0
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-05-24 12:31:24 -04:00
Chip Childers 29be94f3ba Revert "Updating pom.xml version numbers for release 4.1.0"
This reverts commit 9d8c8f2042.
2013-04-26 15:14:00 -04:00
Chip Childers 9d8c8f2042 Updating pom.xml version numbers for release 4.1.0
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-04-26 15:09:47 -04:00
Chip Childers 3be1754626 Revert "Updating pom.xml version numbers for release 4.1.0"
This reverts commit ba7ba61671.
2013-04-23 15:22:01 -04:00
Chip Childers ba7ba61671 Updating pom.xml version numbers for release 4.1.0
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-04-23 15:18:19 -04:00
Chip Childers e3af51bfc5 Revert "Updating pom.xml version numbers for release 4.1.0"
This reverts commit 88098e0c81.
2013-04-23 14:58:55 -04:00
Chip Childers 88098e0c81 Updating pom.xml version numbers for release 4.1.0
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-04-23 14:55:22 -04:00
Chip Childers a5a7105b36 Updating pom.xml version numbers for release 4.1.0-SNAPSHOT
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-04-22 19:51:20 -04:00
Chip Childers 7048baaa44 Updating pom.xml version numbers for release 4.1.0
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-04-22 19:45:20 -04:00
Chip Childers 818a2c86d8 Revert "Updating pom.xml version numbers for release 4.1.0"
Backing out versions to 4.1.0-SNAPSHOT
This reverts commit b7abc3ca1e.
2013-04-22 22:22:32 +01:00
Chip Childers a3c6ab58a1 Revert "Updating pom.xml version numbers for release 4.1.1-SNAPSHOT"
Backing out versions to 4.1.0-SNAPSHOT
This reverts commit 8fe99e6453.
2013-04-22 22:22:06 +01:00
Chip Childers 8fe99e6453 Updating pom.xml version numbers for release 4.1.1-SNAPSHOT
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-04-22 12:46:11 -04:00
Chip Childers b7abc3ca1e Updating pom.xml version numbers for release 4.1.0
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-04-22 09:42:23 -04:00
Chip Childers d168119a89 Revert "Updating pom.xml version numbers for release 4.1.0"
Reverting for yet another attempted RC

This reverts commit b654578bd5.
2013-04-22 09:35:21 -04:00
Chip Childers ca3b515bad Revert "Updating pom.xml version numbers for release 4.1.1-SNAPSHOT"
Reverting for yet another attempted RC.
This reverts commit 5a923ca44d.
2013-04-22 09:35:06 -04:00
Chip Childers 5a923ca44d Updating pom.xml version numbers for release 4.1.1-SNAPSHOT
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-04-22 09:20:20 -04:00
Chip Childers b654578bd5 Updating pom.xml version numbers for release 4.1.0
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-04-22 08:55:21 -04:00
Chip Childers e119a53bfd Revert "Updating pom.xml version numbers for release 4.1.0"
Reverting to re-spin 4.1.0 RC

This reverts commit b25d27d80b.
2013-04-22 08:52:17 -04:00
Chip Childers 5755f6e3e8 Revert "Updating pom.xml version numbers for release 4.1.1-SNAPSHOT"
Reverting so that I can re-spin the 4.1.0 RC

This reverts commit c8c77f6b1c.
2013-04-22 08:51:58 -04:00
Chip Childers c8c77f6b1c Updating pom.xml version numbers for release 4.1.1-SNAPSHOT
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-04-21 16:26:50 -04:00
Chip Childers b25d27d80b Updating pom.xml version numbers for release 4.1.0
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-04-21 16:18:04 -04:00
Vijayendra Bhamidipati c25d60f175 CLOUDSTACK-1773:Temporarily disabling baremetal functionality in CS 4.1
Signed-off-by: Min Chen <min.chen@citrix.com>
2013-03-25 11:34:53 -07:00
Kelven Yang 296c20332d Merge javelin into master 2013-02-01 14:40:45 -08:00
Kelven Yang 7b75f0d990 Sync master to javelin one more time 2013-02-01 11:37:33 -08:00
Kanzhe Jiang 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
frank 8416d81b99 Merge branch 'ucs' into javelin
Conflicts:
	api/src/org/apache/cloudstack/api/ApiConstants.java
	plugins/pom.xml
	utils/src/com/cloud/utils/exception/CloudRuntimeException.java
	utils/src/com/cloud/utils/exception/RuntimeCloudException.java
2013-01-31 14:44:07 -08:00
Murali Reddy 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
Kelven Yang 1b2b369ecb Merge latest master into javelin 2013-01-31 11:34:49 -08:00
frank 1f7eaf3d61 CloudStack CLOUDSTACK-774
Supporting kickstart in CloudStack baremetal

merge baremetal feature to master
2013-01-29 17:19:57 -08:00
frank 301b0b9090 CloudStack CLOUDSTACK-723
Enhanced baremetal servers support on Cisco UCS

init
2013-01-25 15:00:09 -08:00
Rohit Yadav 356866c72b Merge branch 'master' into javelin
- Fixed new join dao impls as spring components
- Fixed component context xml to load api rate limit checker
- Fixed root pom.xml for duplicate plugin
- Fixed list data centers method
- Fixed following conflicts:
	api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java
	api/src/org/apache/cloudstack/api/command/user/offering/ListServiceOfferingsCmd.java
	api/src/org/apache/cloudstack/api/command/user/template/DeleteTemplateCmd.java
	api/src/org/apache/cloudstack/api/command/user/template/ExtractTemplateCmd.java
	plugins/api/discovery/src/org/apache/cloudstack/discovery/ApiDiscoveryServiceImpl.java
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/api/query/QueryManagerImpl.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/swift/SwiftManagerImpl.java

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-24 19:18:53 -08:00
Edison Su 8af85b04d0 refactor api, based on suggestion from community 2013-01-14 18:52:39 -08:00
Rohit Yadav 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
Min Chen d900345a20 Ehcache implementation of APi Rate limit plugin. 2013-01-10 17:47:48 -08:00
Rohit Yadav 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
Rohit Yadav 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
Prasanna Santhanam 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