774 Commits

Author SHA1 Message Date
Hugo Trippaers
ef2ced7564 Fix findbugs findings in cloud-plugin-network-ovs
OvsTunnelManagerImpl.java:456, RC_REF_COMPARISON, Priority: High

Serveral low priority fixes
2014-02-14 18:37:46 +01:00
Hugo Trippaers
9b841af529 Findbugs : A map can't retrieve an object by index, so get(0) would
return null. Changed to retrieve the first entry in the map.

Removed the ExecutionException try catch, this would prevent the
unittest from giving accurate information on exceptions. Avoid catching
checked exceptions in a unittest, use expected keyword on @Test instead.
2014-02-14 18:37:45 +01:00
Darren Shepherd
c1cfaa2d1c Contrail Event Interceptor fix
When project/domains are created,  our plugin code won't get invoked. Our
contrail plugin uses Event infrastructure provided by cloudstack to
receive these events and handle them accordingly. It is must to create
domains/projects before creating a virtual network/vm object in contrail
implementation. Hence our plugin must need a way to get notified about
project/domain events.
2014-02-10 22:43:38 -07:00
Min Chen
3b58a45e04 Merge branch 'master' into rbac. 2014-02-07 13:43:36 -08:00
Hugo Trippaers
64c61c7202 Fix two NPE exceptions in the Contrail Plugin when contrail is not providing any services on the network. 2014-02-06 16:51:20 +01:00
Syed Ahmed
356daf3eed Review 16080 Move Netscaler plugin from non-oss to oss and upgrade the nitro API to 10.1
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
2014-02-05 14:03:49 +01:00
Hiroaki KAWAI
0d222b14a1 stratosphere-ssp plugin: Fix HttpClient4 connection leak
Replaced HttpClient#execute(HttpUriRequest) with
HttpClient#execute(HttpUriRequest,ResponseHandler<T>).
The former requires extra EntityUtils#consume(HttpEntity).
2014-02-05 16:23:32 +09:00
Alex Huang
7f34282dfa Removed references to secondarystoragevmmanager from code that doesn't use it. 2014-02-05 01:39:15 +00:00
sbalineni
cc8bde2421 Do not initialize contrail plugin component functionality like db sync, network offerring creation when contrail is not installed 2014-02-04 12:35:29 -08:00
Prachi Damle
f84375442e Merge branch 'master' into rbac
Conflicts:
	api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java
	api/src/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java
	plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/api/query/QueryManagerImpl.java
	server/src/com/cloud/template/TemplateAdapterBase.java
	setup/db/db/schema-430to440.sql
	tools/apidoc/gen_toc.py
2014-02-04 12:07:32 -08:00
Hiroaki KAWAI
836a9caa72 add charset arg to InputStreamReader constructor
thanks to findbugs.
2014-01-31 12:57:13 +09:00
sbalineni
ed3e1b95b0 VPC Support for contrail networking
Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
2014-01-30 18:13:48 -08:00
Hiroaki KAWAI
cb048f4108 Some rework stratosphere ssp plugin
* add missing command entry in commands.properties
* migrate httpclient 3.x to 4.x
* fix the broken SspClient
* add webapp session checking in mock ssp server
2014-01-30 21:31:44 +09:00
Sachchidanand Vaidya
cc98125067 These are additional fixes to make Juniper Contrail plugin work 2014-01-28 08:58:22 +00:00
Marcus Sorensen
0502d2f375 CLOUDSTACK-5697 This patchset fixes a bug with the recently merged
vxlan code. Users can set a physical network to isolation type 'vxlan',
put public traffic on that physical network, and it will still attempt
to use 'vlan' isolation on the KVM hosts. This is going to be an issue
for other isolation types as well, but I'm not familiar with them, so
I'm just fixing vxlan for now.
2014-01-27 12:11:18 -07:00
Prachi Damle
af14699c4c fixing the build _ AffinityGroup command changes 2014-01-23 18:17:43 -08:00
Hugo Trippaers
5fc03211ff Findbugs finding: the collections should have been made static 2014-01-23 15:52:46 +00:00
Min Chen
33cd1ab921 Merge branch 'master' into rbac 2014-01-22 11:23:51 -08:00
Hugo Trippaers
49124bdb7d Fix license formatting to work with the mycila license check for nvp and opendaylight 2014-01-22 11:24:37 +01:00
Hugo Trippaers
d3cd73d861 Add license check plugin to root pom. Disabled for the entire project, except for poms that override it (opendaylight, nvp) 2014-01-22 11:22:42 +01:00
Hugo Trippaers
7ab3e277c4 Cosmetics 2014-01-22 10:11:20 +01:00
Alena Prokharchyk
452c20b242 Configuration: define "host" global config parameter in cloud-api package instead of ClusterManager as the parameter is mostly used by sevices components running remotely (consoleProxy, secondarystorage), or by third party integrators.
Also intoroduced one more global config parameter - api.servlet.endpoint (default value is "http://localhost:8080/client/api?"). The parameter defines API end point. Can be used by CS components/services deployed remotely, for sending CS API requests
2014-01-20 13:37:52 -08:00
Min Chen
929fbabaa2 Merge branch 'master' into rbac. 2014-01-17 14:37:08 -08:00
Laszlo Hornyak
07f73ec054 Null-safety in http header handling
The http Content-Type header may not always be present in the response, in such cases the getResponseHeader will return null and this leads to NPE, therefore the presence of the header must be checked.

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2014-01-17 00:19:17 +01:00
Jayapal
fcd21eb7f3 CLOUDSTACK-5747 Fixed network restart issue with SRX 2014-01-16 11:29:03 +05:30
sbalineni
cc2b1c4961 Contrail plugin fixes -master branch, single commit, no transaction wrappers
Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
2014-01-15 14:11:49 -08:00
Min Chen
6c1849f4bf Fix Spring wiring issues in starting up MS. 2014-01-14 16:20:30 -08:00
Sachchidanand Vaidya
0bff705621 Add L3VPN isolation method for contrail plugin
Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
2014-01-14 13:55:35 -08:00
Alex Huang
68b8891c62 Removed all reminants of the IdentityService. Created the KeysManager to move the management
of keys out of management server
2014-01-14 13:11:35 -08:00
Min Chen
bae498c89e Handle search of those entities without db view created using new ACL
model.
2014-01-13 21:55:56 -08:00
Murali Reddy
af657b3d71 CLOUDSTACK-5861: networks that failed to implement can not be destroyed
introduces a force option in delete network to forcifully delete a
network. This comes handy in rare cases where network fails to implenet
and network is in shutdown state, but network shutdown to rollback
implement process fails as well.

Conflicts:
	api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkCmd.java
	server/src/com/cloud/user/DomainManagerImpl.java
2014-01-13 23:28:35 +05:30
Hugo Trippaers
3bea60435e Remove commented elements 2014-01-13 12:16:37 +01:00
Hugo Trippaers
16d333f06d Fix coverity issue 606007, 606008 2014-01-13 12:16:37 +01:00
Hugo Trippaers
044a2078a1 Fix coverity issue 573580 2014-01-13 12:16:37 +01:00
Hugo Trippaers
15a08107d8 Fix coverity issue 600070 2014-01-13 12:16:37 +01:00
Hugo Trippaers
4683de5a92 Fix coverity issues 569415, 569416, 569417 2014-01-13 12:16:36 +01:00
Murali Reddy
be49a2fa6d CLOUDSTACK-5647 Adding F5 device to network service provider fails with
NoClassDefFoundError

adding back missing (removed from 4.3) dependency 'commons-discovery'
2014-01-10 22:05:22 +05:30
Alex Huang
ae8560b195 Moved security out into its own jar. Will be adding more to it. Fixed a few white space issues brought up by checkstyle in eclipse. 2014-01-09 16:12:25 -08:00
Hugo Trippaers
7c8facf3c9 Change checkstyle to run on every sub project, so it will also run when you build an individual module 2014-01-09 17:00:11 +01:00
Hugo Trippaers
612a41e3f5 Add UI interface for managing the OpenDaylight provider and controllers.
Fix several bugs in the code related to the api handling.

Conflicts:
	ui/scripts/system.js

ui
2014-01-08 17:08:37 +01:00
Hugo Trippaers
8ddcc9ba80 Set unique gre key for every network.
Set interface id to nic uuid when creating the vif.
2014-01-08 16:00:59 +01:00
wrodrigues
f3f93a96f5 Adding OpenDayLight Neutron API. It includes 24 unit tests and 3 integration tests. Everythin passed the build.
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
2014-01-08 16:00:39 +01:00
Hugo Trippaers
1f9528bad3 Add a network plugin for OpenDaylight
This plugin is a technology preview and designed to work with the OVSDB module
2014-01-08 15:57:46 +01:00
Hugo Trippaers
5dc0c60239 Fix missing / in api url 2014-01-08 11:01:20 +01:00
Daan Hoogland
6d0dbf5968 check for BroadcastDomainTypes on sourceNatIp 2014-01-06 22:13:51 +01:00
Daan Hoogland
d69a35086f another issue with vlan-number vs vlan-uri 2014-01-06 15:25:35 +01:00
Hugo Trippaers
50be9a447a Apply proper license header and formatting to the new contrail tests #2 2013-12-30 09:38:10 +01:00
Hugo Trippaers
4e88197459 Apply proper license header and formatting to the new contrail tests 2013-12-30 09:15:06 +01:00
Sachchidanand Vaidya
7f9683af85 Added Virtual-Network and Virtual-Machine Model unit test.
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
2013-12-30 08:57:21 +01:00
Koushik Das
ad33f0ad66 CLOUDSTACK-2560: Adding duplicate ASA device entity failure should be handled with API
Handling duplicate ASA appliance addition gracefully
2013-12-26 17:21:58 +05:30