Commit Graph

764 Commits

Author SHA1 Message Date
Hugo Trippaers 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
Edison Su 2c2afda062 jetty:run should use ${project.build.directory}/${project.build.finalName} directory 2012-10-11 12:08:28 -07:00
Edison Su ac97d67528 add nonoss maven build 2012-10-11 01:15:52 -07:00
Brian Federle 991557bfb6 UI: Add quick view to table list
For any list view that has a corresponding detail view, adds a tooltip
to display the compact overview of the detail view contents, including
all available actions. This avoids a user from having to click into a
new panel to see more details and actions for an item.

This will happen automatically for any list view with a 'detailView'
sub-option, and will append a new column to the end of each item
row. If 'noCompact: true' is specified in the detailView's options,
then the quick view will not be rendered.

** Note: This also removes the existing list actions for the instances
         and zones tables.

Example, to show a quick view:

listView: {
  detailView: {
    // Specify noCompact: true to not render a quick view
    //
    // noCompact: true
    ...
  },
  ...
}

Conflicts:
	ui/scripts/ui/widgets/detailView.js
2012-10-10 11:18:02 -07:00
David Nalley b0c7e385d7 adding several languages for which folks have added l10n 2012-10-08 23:57:40 -04:00
Hugo Trippaers 27473bd6ee Add the labels to the resources and the dictionary 2012-10-05 07:53:24 -07:00
Hugo Trippaers f16b5103d8 Merge some stuff from maven-waf branch into master 2012-10-01 15:04:08 -07:00
Hugo Trippaers 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
Hugo Trippaers bb4dadaed8 small fixes 2012-10-01 10:12:59 -07:00
Hugo Trippaers dd68a00338 Persist the uuid of the logical router once created 2012-09-27 22:16:11 -07:00
Brian Federle 951c124166 CLOUDSTACK-154: Show network details for virtual router
-Adds new NICs tab, to display network information for each router
 NIC, including network name

-Show guest network ID field on router details tab
2012-09-24 13:59:44 -07:00
Prasanna Santhanam 6e9d7aa45b property files and build file fixes for simulator db changes 2012-09-17 17:33:26 +05:30
Manikanta Kattamuri 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
Wido den Hollander 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
Wido den Hollander 0429cce9e5 debian: Update locations where to search for Java under Ubuntu and Debian 2012-09-11 15:22:17 +02:00
Koushik Das 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
Mice Xia 0ae1d58c19 CLOUDSTACK-50 build-apidocs ClassNotFoundException: com.cloud.api.commands.DeleteCiscoNexusVSMCmd 2012-09-08 10:56:32 +08:00
Mice Xia f03d438c4c CLOUDSTACK-59 missing license header. 2012-09-08 09:26:13 +08:00
Wido den Hollander 517722ef95 maven: Build KVM hypervisor by default
LEGAL-144 allows us to distribute libvirt-java in a binary release

libvirt-java 0.4.9 will switch to MIT license which will resolve this
2012-09-06 17:15:04 +02:00
Edison Su 5ae15f8bbf first OSS build 2012-09-05 17:45:25 -07:00
Rajesh Battala 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
Darren Shepherd 34f007f13a Current working dir for jetty:run Eclipse configuration is half way broken 2012-08-30 09:00:49 +02:00
Brian Federle 5c69742f7d Update zone wizard disclaimer text for local storage
Conflicts:
	client/WEB-INF/classes/resources/messages.properties
2012-08-29 15:45:25 -07:00
Jessica Wang 4a9f77610c cloudstack 3.0 UI - check in translated labels for VPC widget (Reviewed-by: Brian) 2012-08-29 10:58:55 -07:00
Hugo Trippaers 1b8b7b1bba Help the magic a little bit 2012-08-29 10:47:50 +02:00
Jessica Wang 2e6759093c cloudstack 3.0 UI - Spanish translation file is out-of-date and never used in 3.0 UI, therefore remove it from branch. 2012-08-28 16:03:40 -07:00
Jessica Wang 5b556e202e cloudstack 3.0 UI - add translation labels for VPC widget. (Reviewed-by: Brian) 2012-08-28 15:59:13 -07:00
olivier lamy de31ac34b4 configure tomcat maven plugin too 2012-08-29 00:05:56 +02:00
olivier lamy f6f1be62b9 configuring tomcat maven plugin too 2012-08-28 23:58:06 +02:00
olivier lamy f218003607 Merge branch 'maven-final' of git://github.com/ibuildthecloud/incubator-cloudstack 2012-08-28 23:30:57 +02:00
Jessica Wang a319ac7055 cloudstack 3.0 UI - VPC - check in translated labels. (Reviewed-by: Brian) 2012-08-28 11:47:32 -07:00
Darren Shepherd ff7c964a66 Add ability to do jetty:run in eclipse 2012-08-28 09:16:44 -07:00
Jessica Wang 6807da63bb cloudstack 3.0 UI - VPC feature - localize VPC labels in messages_ja.properties for network.js (Reviewed-by: Brian) 2012-08-24 14:56:10 -07:00
Jessica Wang de85e211c3 cloudstack 3.0 UI - VPC feature - localize VPC labels in messages_zh_CN.properties for network.js (Reviewed-by: Brian) 2012-08-24 14:55:33 -07:00
Jessica Wang caae9f7e04 cloudstack 3.0 UI - VPC feature - localize VPC labels in messages.properties for network.js (Reviewed-by: Brian) 2012-08-24 14:54:38 -07:00
Jessica Wang 7f8734f124 CS-15802: cloudstack 3.0 UI - stop/reboot virtualRouter/network - add text "All services provided by this virtualRouter/network will be interrupted" in confirm dialog. 2012-08-23 14:08:20 -07:00
Brian Federle b302ed904a CS-16144: Show warning before enabling local storage in zone wizard
Conflicts:
	ui/dictionary.jsp
2012-08-23 11:08:48 -07:00
Jessica Wang beb9baf950 cloudstack 3.0 UI - VPC feature - add new translation labels in messages.properties (Reviewed-by: Brian) 2012-08-21 16:49:55 -07:00
Prachi Damle 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
Brian Federle ad2b8d7579 CS-16044: Zone wizard: Add 'use local storage' checkbox
Add checkbox to zone wizard indicating whether zone will use local
storage. If checked, bypass add primary storage step and enable local
storage for zone on creation.

Conflicts:
	ui/index.jsp
2012-08-20 11:36:57 -07:00
Brian Federle b391a1c5b1 CS-16010: Add missing alt tag for 'move to bottom' reorder action 2012-08-16 13:56:07 -07:00
Mice Xia 5dcf639acc Fix a bug, failed to show resource limit page in project view due to missing vpc limit type 2012-08-16 20:17:42 +08:00
Brian Federle b5e1c53137 CS-15892: Tier detail view: Show 'tier details' instead of 'details'
Conflicts:
	ui/index.jsp
2012-08-07 16:02:07 -07:00
Brian Federle 469e180515 multiEdit: better handling for tag widget
Place tagging widget in a separate action and dialog class; it is
indicated by a 'tag' icon for better clarity.

-- This removes the requirement to specify a dummy 'edit' action on
multi-rules; instead, the separate tag action will appear automatically
as long as 'tags' is specified under the multiEdit's properties.

Conflicts:
	client/WEB-INF/classes/resources/messages.properties
	ui/css/cloudstack3.css
	ui/index.jsp
2012-08-06 14:15:41 -07:00
Hugo Trippaers cf06317671 Probably a left-over of a merge conflict 2012-08-02 09:33:48 +02:00
Alena Prokharchyk ce9f1afa78 Merge branch 'master' into vpc
Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java
2012-08-01 19:04:28 -07:00
Brian Federle 8c8c10fbbd CS-15799: Show 'network domain' instead of 'network domain text' 2012-08-01 14:36:15 -07:00
Chip Childers 99b0ea7b10 License header update for the client folder 2012-08-01 13:49:10 -04:00
Sheng Yang 736c4c1510 CS-15670: Allow normal users to configure S2S VPN 2012-07-27 16:27:36 -07:00
Alena Prokharchyk 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