Commit Graph

458 Commits

Author SHA1 Message Date
Chip Childers 865c2cbce6 Adding springsource artifacts to package legal docs.
Signed-off-by: Chip Childers <chip.childers@gmail.com>

Conflicts:

	tools/whisker/LICENSE
	tools/whisker/descriptor-for-packaging.xml

Also fixed the ordering for where we put java-ipv6.jar.
2013-02-19 13:29:36 -05:00
Chip Childers 12630b4f09 Adding legal documentation for the Java IPv6 library
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-02-19 12:39:05 -05:00
Rohit Yadav 0364a4a34e maven: don't use process-test-resources lifecycles, target are skipped if test are
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
(cherry picked from commit 733ec50d46)

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-12 12:18:54 +05:30
Chip Childers 86f5b424b5 CLOUDSTACK-1233: Fixed veewee config file legal documentation
The veewee configuration files used for the devcloud base-box build, as
well as the newly introduced files used to create a system vm, were
inappropriately identified as ASLv2 licensed and copyrighted by the ASF.

The fixes:
- The ASF headers stripped to match the source.
- The files are now excluded from RAT checks in the root pom.
- The tools/whisker/descriptor.xml file updated
- The root LICENSE and NOTICE were re-generated

Changes in the Apache Whisker templates for LICENSE and NOTICE files
caused a good bit of whitespace oddness in this commit for those 2
files.

Signed-off-by: Chip Childers <chip.childers@gmail.com>

Conflicts:

	tools/appliance/definitions/systemvmtemplate/base.sh
	tools/appliance/definitions/systemvmtemplate/cleanup.sh
	tools/appliance/definitions/systemvmtemplate/zerodisk.sh
2013-02-11 21:54:49 -05:00
Rohit Yadav 91e284b173 CLOUDSTACK-1066: Fix only one postinstall script, install packages etc.
- Remove different scripts, just use postinstall.sh that runs after basic appliance
  is built using veewee
- Port package installation method from old script
- Time the installation/build process

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
(cherry picked from commit 04d51c9e4d)

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-07 17:47:07 +05:30
Rohit Yadav f315a9a6ea CLOUDSTACK-1066: Add definitions for building systemvm template appliance
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
(cherry picked from commit f97e2a6297)

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-07 17:46:37 +05:30
Rohit Yadav 72291ef97f CLOUDSTACK-1037: Implement fuzzy parameter completion
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
(cherry picked from commit 1fd0563137)

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-07 16:01:51 +05:30
Marcus Sorensen d3ffceb25e Summary: Add default newline after summary in prepare-commit-msg
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1360171397 -0700
2013-02-06 10:24:22 -07:00
Marcus Sorensen dc0ef3cef7 Summary: Make prepare-commit-msg hook more compatible with operating systems
Detail: Was using sed -i, which breaks on Mac

Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1360170672 -0700
2013-02-06 10:24:10 -07:00
Rohit Yadav 2ce6b80a24 cli: Fix attribute error and fix helpdoc
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-06 16:57:29 +05:30
Rohit Yadav 5840a4b1ed cli: Use metaprogramming to generate code during runtime when new apis sync
- Fixes metaprogramming to inject methods during shell class object's runtime
- This enable new apis that are synced to come up with new verbs, docs etc.
- Fixes printing issue
- Fixes null bitfield parsing issue

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
(cherry picked from commit a2e89c4200)

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-04 17:58:03 +05:30
Rohit Yadav 0b31e28901 CLOUDSTACK-1037: Fix cloudmonkey's caching, autocompletion and printing
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
(cherry picked from commit b5a2e99809)

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-02 08:44:08 -08:00
David Nalley bb3a1ce42e updating the version to 4.1.0 for API Docs 2013-02-02 05:40:09 -05:00
Kelven Yang e74f72be34 Fix the merge conflicts 2013-02-01 15:22:58 -08:00
Kelven Yang 296c20332d Merge javelin into master 2013-02-01 14:40:45 -08:00
Rohit Yadav 631b6fd46a CLOUDSTACK-1037: Make cloudmonkey awesome-er
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-01 14:34:49 -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
Kishan Kavala 2491ff1cff apidoc: Added Region category 2013-02-01 12:34:56 +05:30
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
Prasanna Santhanam e06a8569a2 propagate storagetype fix from commit e49b3b to diskOffering
Author: Prasanna Santhanam <tsp@apache.org>
Date:   Sun Dec 9 23:13:24 2012 -0800

    marvin: storagetype reference only when attr present

    reference the storagetype only when present. storagetype is reqd
    only for devcloud style tests

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-01-31 16:03:43 +05:30
Marcus Sorensen 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
Chip Childers 1906f480d1 Corrected MPL 1.1 license name from 1.0 to 1.1 (this was a mistake I made when initially adding that license to the descriptor)
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-01-30 09:32:02 -05:00
Chip Childers 3bd53b45e3 Updating the legal docs for packages, based on the latest whisker tool source.
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-01-30 09:32:02 -05:00
Chip Childers 68d13d7b07 Updated the copyright year in the descriptor.xml files
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-01-30 09:32:02 -05:00
Rohit Yadav cb8705c756 cli: Pygments based output in cloudmonkey and new cfg processing
- Pygments based colored output for tabular and normal list outputs
- Fix cfg processing as per new cfg paths and ds
- Get rid of clint and old way of parsing and color printing

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-28 17:59:37 -08:00
Rohit Yadav 233c0adcf3 cli: Fix common.py's cfg fields grouped under similarites like ui, core, user etc.
Changes config path to ~/.cloudmonkey this will break cfg path but all configs are
still backward compatible. We need folder to put a lot of stuff that is coming
for ex. themes and plugins

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-28 17:52:40 -08:00
Rohit Yadav 0720d25e12 cli: Get rid of clint, use Pygments
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-28 17:51:34 -08:00
Rohit Yadav ad3692cbba cli: Add pygments based lexical output processing
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-28 17:48:49 -08:00
Rohit Yadav 59d01bfe20 cli: Show filter only when a subject is specified in autocompletion
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
(cherry picked from commit 7ea83b82e6)

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-28 16:31:12 -08:00
Rohit Yadav 7ea83b82e6 cli: Show filter only when a subject is specified in autocompletion
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-28 16:30:04 -08:00
Chip Childers afd7de7e33 CLOUDSTACK-1076: Legal documentation improvements to separate source
distributions from packaged distributions.

* Remove all binary dependency license and notice info from the top
level LICENSE and NOTICE files in our source tree
* Create two copies of the Whisker descriptor.xml file (stored in
tools/whisker), one that can be used to regenerate the source distro's
LICENSE and NOTICE files, and one that can generate an appropriate
LICENSE and NOTICE file for a packaged version of the software.
* Generate and commit the package LICENSE and NOTICE file to the
tools/whisker folder.

Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-01-28 10:48:53 -05:00
Rohit Yadav 2fb346ab62
Merge branch 'master' into javelin 2013-01-27 05:20:49 -08:00
Rohit Yadav 6c527ffbba cli: Fix cachegen aand cloudmonkey to generate api verbs, revert last commit
Fixes cachegen and reverts "mvn: fix cloudmonkey build"

This reverts commit 6d3de41d42.
2013-01-27 04:18:31 -08:00
Prasanna Santhanam 6d3de41d42 mvn: fix cloudmonkey build
removing cachegen.py that is no longer required for execution

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-01-27 14:49:50 +05:30
Rohit Yadav ddb794d960 cli: generate verbs on the fly, fix autocompletion whitespace bug
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-26 17:14: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
Rohit Yadav 6f90a86b13 cli: fix cloudmonkey's pipe-ability
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-24 14:47:45 -08:00
Rohit Yadav 71257d6bb4 cli: give filter option only when output 'tabularized' is enabled
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-24 11:28:49 -08:00
Rohit Yadav afb7e289fe cli: Fix development status to stable. cloudmonkey v1 at its most stable form
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-23 18:15:51 -08:00
Rohit Yadav 3c335bd883 cli: Fix asyncblock to search for correct key instead of hardcoded index
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-23 14:57:41 -08:00
Prasanna Santhanam 75b059e6e4 cloudmonkey: misses a couple of verbs for 'lock' and 'disassociate'
The following api commands have no cloudmonkey equivalent because
cloudmonkey grammar misses the related verbs.

~/tools/cli/cloudmonkey/marvin/cloudstackAPI(branch:master*) $ ls disassociateIpAddress.py
disassociateIpAddress.py

------------------------------------------------------------
~/tools/cli/cloudmonkey/marvin/cloudstackAPI(branch:master*) $ ls lock*
lockAccount.py lockUser.py
------------------------------------------------------------

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-01-23 16:05:41 +05:30
Rohit Yadav 7b11b71d81 maven: create dependency, deploydb on developer first and then on devcloud
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
(cherry picked from commit afb2770012)

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-22 16:32:57 -08:00
Rohit Yadav 1a695b84b4 tools: Fix devcloud artifact name, avoid confusion
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-22 16:32:51 -08:00
Rohit Yadav afb2770012 maven: create dependency, deploydb on developer first and then on devcloud
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-22 16:30:35 -08:00
Rohit Yadav a736f6b44f tools: Fix devcloud artifact name, avoid confusion
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-22 16:19:45 -08:00
Chip Childers 45d21c3202 Devcloud config for basic zone + management server.
Added a devcloud config that supports having the management
server run within devcloud, using the basic zone setup.

Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-01-22 16:44:34 -05:00
Rohit Yadav 22e70f2c8e devcloud: Update a working p.a.o url in devcloud.sql
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-22 10:55:05 -08:00
Alex Huang 10d9c019a9 All merge conflicts resolved 2013-01-18 12:14:57 -08:00