Commit Graph

14564 Commits

Author SHA1 Message Date
Joe Brockmeier 8cee2c578f Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
Adding fix for CLOUDSTACK-395
2012-12-07 13:49:20 -06:00
Joe Brockmeier ac50c2699c CLOUDSTACK-395: Added xrefs to about-primary-storage and about-secondary-storage 2012-12-07 13:48:42 -06:00
Hugo Trippaers 9c8eba1da3 Fix the tests
Note to self, surefire actually runs with assertions enabled where junit
inside eclipse doesn't. Sure surefire will mark tests as failed when an
assertion is triggered. Take care when mocking stuff.
2012-12-07 17:34:14 +01:00
Hugo Trippaers 2b74b6e827 Start removing the old ant build files
Removed all build.xml files from the plugins
2012-12-07 15:58:56 +01:00
Hugo Trippaers fa207d2b4d Add unittests for NiciraNvpApi
Added some unittests for the NiciraNvpApi. These tests mainly validate
the logic of the execute methods, which are the main thing in this
class. Other methods are basically wrappers around these functions.

Changed NiciraNvpApi to have a factory method for obtaining the
HttpMethod. This makes it easier to mock it.

Changed the executeMethods in NiciraNvpApi to protected so the unittests
have access.

Fixed a bug in NiciraNvpApi where releaseconnection was not called in
some cases.
2012-12-07 15:55:26 +01:00
Joe Brockmeier 3ab8a65a39 removing garbage files 2012-12-07 08:49:18 -06:00
Joe Brockmeier 4fe6494881 CLOUDSTACK-480: Adding mention to install nfs-kernel-server to Install Guide 2012-12-07 08:46:32 -06:00
Brian Federle cd238b4aab Don't show egress rules tab for SRX-based networks 2012-12-06 14:35:30 -08:00
Brian Federle 75e51a03aa Egress UI: Fix columns
-If startport or endport are blank, still show the blank columns to
 keep alignment correct.
2012-12-06 14:35:30 -08:00
Jessica Wang 391e873bd9 CLOUDSTACK-537: cloudstack UI - Advanced SG-enabled zone - zone wizard - cluster dropdown - Make "KVM" the 1st option in dropdown. 2012-12-06 10:43:50 -08:00
Hugo Trippaers 1fbf2a2864 Fix bug in Port Forwarding
Nicira NVP can't handle a range of port when implementing port
forwarding, so return an error message when a rule is being implemented
that uses port ranges.

Include unittest to verify this behaviour
2012-12-06 16:50:56 +01:00
Hugo Trippaers cfd2a0bdf8 Fixes for some bug discovered while writing unittests
Rewritten handling for static nat and port forwarding, should make some
more sense now and the complex functions are split in smaller units.

Fix a small bug in Match

Add equals function to NatRule that ignores the uuid field.
2012-12-06 14:45:58 +01:00
Hugo Trippaers 22ef646b23 Add more unittests for NiciraNvpResource 2012-12-06 14:45:58 +01:00
Hugo Trippaers a0d6ca617f Make variable naming consistent with the superclass.
The field was called brandnew in portforwaringto and alreadyadded in
firewallruleto. This leads to confusion as the effect is completely
opposite.

Small fix for wrong parameter order
2012-12-06 14:45:38 +01:00
Hugo Trippaers 48308ec070 Redoing NatRule usage and some fixes based on issues found while writing
unittests
2012-12-06 14:45:37 +01:00
Hugo Trippaers 700050a713 More unittests for NiciraNvpResource
Add some basic unittest for NatRule
2012-12-06 14:45:09 +01:00
Hugo Trippaers b0955e43ff Put the mockito version in the central version list 2012-12-06 14:42:59 +01:00
Murali Reddy 7fcfcdf91e Summary: check-in for L4-L7 network services in the shared network in
the advanced zone

  Details:

  1). Added validation to check the Vlan Id specified in the createNetwork()
  does not overlap with any of the vlan's used by isolated networks or
  shared networks in the zone.

  2). state change for shared network with services to go to 'Setup' state
  on network shutdown instead of 'Allocated'

  Bug ID:CLOUDSTACK-312 enable L4-L7 network services in the shared network in the advanced zone
2012-12-06 13:06:18 +05:30
Murali Reddy d4c604cfd8 Summary: partical check-in for L4-L7 network services in the shared
network in the advanced zone

Details : ensure that CIDR specified for shared network does not overlap with any
CloudStack generated CIDR's for isaolated guest networks when using
external networking devices

Bug ID:CLOUDSTACK-312 enable L4-L7 network services in the shared network in the advanced zone

Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java
2012-12-06 12:29:38 +05:30
Murali Reddy 6657246cd4 Summary: partical check-in for L4-L7 network services in the shared
network in the advanced zone

Changing the F5, NetScaler, SRX network elemetns to handle both 'isolated networks'
and 'shared networks' in the advanced zone

Bug ID:CLOUDSTACK-312 enable L4-L7 network services in the shared network in the advanced zone
2012-12-06 11:55:19 +05:30
Murali Reddy 0de5a145e4 Summary: partical check-in for L4-L7 network services in the shared
network in the advanced zone

Summary: change 'shared network' in advanced zone with L4-L7 services to  go through network
implement phase. Add ACL checks to associate IP to shared network in the
advanced zone

   Bug ID:CLOUDSTACK-312 enable L4-L7 network services in the shared network in the advanced zone

Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java
2012-12-06 11:55:19 +05:30
Murali Reddy 28bbf6c527 Summary: partical check-in for L4-L7 network services in the shared network in the advanced zone
Details:

- changed associateIPAddr API to accept shared network Id and account Id. Ip will be owned by tuple (account Id, network Id)
- chaged createNetwork API to accpet CIDR when network offering has external networking device providers

Bug ID:CLOUDSTACK-312 enable L4-L7 network services in the shared
network in the advanced zone
2012-12-06 11:55:19 +05:30
Prasanna Santhanam 21819dafb5 Summary: Devcloud tests for vm life cycle
Detail: VM Life cycle tests needed minor changes to run them against a
devcloud - basic zone, local storage envrioment.

Signed-off-by: Prasanna Santhanam <tsp@apache.org> 1354760111 -0800
2012-12-05 18:15:11 -08:00
Marcus Sorensen 7ce2227108 Summary: master - Copy qcow2 instead of converting if source and dest are qcow2
Detail: If source image is qcow2, and we want a qcow2 image, then doing a
convert strips off compression and any snapshots the user had in that image. If
a backing file exists, we stick with convert so we can pull in both the backing
file and the COW image, otherwise we just cp the qcow2 file. This is also faster

Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1354755241 -0700
2012-12-05 17:54:01 -07:00
Marcus Sorensen a91df8f32d Summary: master - Fix typo in createvolume.sh
Detail: createvolume.sh had '$qemu-img' in one spot instead of '$qemu_img' as it
uses everywhere else

Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1354754792 -0700
2012-12-05 17:46:32 -07:00
Brian Federle 9e90ff58e9 CLOUDSTACK-536: Remove legacy CloudPlatform files 2012-12-05 13:18:25 -08:00
Pranav Saxena 30dd34d258 CLOUDSTACK-588:restoreVirtualMachine api functionality on the UI while the VMs are in running or stopped state 2012-12-06 02:35:49 +05:30
anthony 40682fc43d CLOUDSTACK-587:
use setMemoryLimits instead
2012-12-05 05:24:46 -08:00
Brian Federle 1321141797 Fix updateZone fail if guest CIDR field is blank 2012-12-04 11:33:43 -08:00
Brian Federle 5f1f1e7534 Don't show egress tab for advanced SG zones 2012-12-04 11:22:52 -08:00
Brian Federle 4bab97be3e Hide acquire new IP button if in advanced SG zone 2012-12-04 11:06:35 -08:00
Brian Federle 2514b92e4b Add VPC: Don't list SG-enabled zones
Conflicts:
	ui/scripts/network.js
2012-12-04 10:49:38 -08:00
Brian Federle 1aecd7b42a Egress UI: Make ICMP type/code optional 2012-12-04 10:49:35 -08:00
Hugo Trippaers 0902f60c61 Quickly add the license header before Chip finds out. 2012-12-02 11:19:32 -08:00
Hugo Trippaers 751e74708e Setup unittests for the nicira nvp plugin
Changed the creation of the NiciraNvpApi to a factory method that can be
overridden by a mock object.

Setup two tests to test the configure function of the NiciraNvpResource
to test this factory method.
2012-12-02 10:50:14 -08:00
Alena Prokharchyk 7857b1f62a CLOUDSTACK-573: check if external provider enabled, only when finalize the service/provider list for the network 2012-11-30 13:07:01 -08:00
Alena Prokharchyk 1aa4ad6a3c CLOUDSTACK-572: Advance SG enabled zone - allow deploying vm in SG disabled Account specific networks
Conflicts:

	server/src/com/cloud/vm/UserVmManagerImpl.java
2012-11-30 12:47:37 -08:00
Brian Federle 77f80ab72d Egress UI: Make start/end port optional 2012-11-30 11:40:10 -08:00
Brian Federle 28cc7477b0 Zone wizard UI: Add labels on traffic type edit area
For zone wizard physical network step: Adds a text label to the top of
the 'edit' button indicating what type of traffic type (Management,
Storage, Guest, etc.)
2012-11-30 11:40:06 -08:00
Brian Federle 4472eca5b4 Zone wizard UI: Fix typo in word 'Management' 2012-11-30 11:39:58 -08:00
Jessica Wang 8819ec6ea7 CLOUDSTACK-571: cloudstack UI - network menu - guest network section - network detailView - edit action - network offering upgrade is not allowed in Shared network. 2012-11-30 09:35:38 -08:00
Talluri 4b539ddcb3 Summary: Fixes marvin integration test for copy template/iso between zones
Detail:
This is a fix
1. to populate 'destzoneid' as part of the test data by issuing
listZones API. Earlier, this is provided manually in the test data.
2. to  wait till the ISO/template is downloaded & installed successfully
before being deleted as part of the cleanup.

BUG-ID: CLOUDSTACK-567
Reviewed-by: Prasanna Santhanam
Reported-by: Prasanna Santhanam
Signed-off-by: Prasanna Santhanam <tsp@apache.org> 1354234426 -0800
2012-11-29 16:13:46 -08:00
Prasanna Santhanam 2c561dd3a8 Summary: Removing ostypeid dependencies from tests
Detail: The listOsTypes API will filter when given the ostype name as
centOS 5.3. There is now no need to hardcode the uuids into the test

Signed-off-by: Prasanna Santhanam <tsp@apache.org> 1354228309 -0800
2012-11-29 15:41:56 -08:00
Alex Huang 6036f73725 Removed that darn exceptions when cloudstack is running in windows. It's a simple or check that was written as an and check 2012-11-29 13:35:23 -08:00
Jessica Wang ec40aff931 CLOUDSTACK-459: cloudstack UI - create network offering - When capability ElasticIp=true is passed to API, if capability associatePublicIP=true/false is not passed to API, cloudStack API will assume associatePublicIP=true. So, UI has to explicitly pass associatePublicIP=false to API if its checkbox is unchecked. 2012-11-29 13:11:37 -08:00
Marcus Sorensen 05d3f86b16 Summary: Fix orphaned patch disks for system VMs on KVM
Detail: This patch deletes any patchdisk found when deleting root volume for
system VM.

BUG-ID: CLOUDSTACK-566
Bugfix-for: 4.0.1
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1354222335 -0700
2012-11-29 13:52:15 -07:00
Marcus Sorensen 5aad7cc307 Summary: Pull patch from 4.0 that skips deleting patchVbd when systemvms are
stopped

Detail: This patch fixed an issue with hosts trying to stop system vms that were
already not running and deleting a patch disk for the system vm running on
another host. It got applied to 4.0 but not master.

Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1354222160 -0700
2012-11-29 13:49:20 -07:00
Hiroaki Kawai a28f4cac3c HttpClient needs releaseConnection method call
reviewboard: https://reviews.apache.org/r/8186/

Signed-off-by: Hugo Trippaers <trippie@gmail.com>
2012-11-29 20:23:30 +01:00
Jessica Wang fefec372a2 CLOUDSTACK-565: cloudstack UI - EIP/ELB Basic Zone - Network menu > Guest Network Section > Network detailView > Add Load Balancer tab > Add VMs button: pass current login's domainId and account to listVirtualMachines API. 2012-11-29 11:02:34 -08:00
Jessica Wang 6d8cd9f5c0 CLOUDSTACK-564: cloudstack UI - EIP/ELB Basic Zone - Network menu - Guest Network section - network detailView - Add Load Balancer tab - use jobid from assignToLoadBalancerRule instead of createLoadBalancerRule. 2012-11-29 10:55:51 -08:00