etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
15,138 Commits 324 Branches 325 Tags 907 MiB
Commit Graph

153 Commits

Author SHA1 Message Date
Koushik Das 74de210359 Added name attribute for the VNMC lifecycle commands 2013-02-08 15:06:11 +05:30
Chiradeep Vittal 6ce25ef11d Fix licensing 2013-01-16 16:44:28 -08:00
Chiradeep Vittal 392cd8ed63 cisco-vnmc: Fix api to use new conventions 2013-01-16 16:38:19 -08:00
Chiradeep Vittal 1ae21ea49a WIP rename device to resource to better reflect nature of VNMC 
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
 2013-01-16 15:33:01 -08:00
Chiradeep Vittal 84d218f972 WIP: fixes for associating ASA1000v to tenant 
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
 2013-01-16 15:32:54 -08:00
Chiradeep Vittal d74c6a9ac2 WIP: fixes for associating ASA1000v to tenant 
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
 2013-01-16 15:32:45 -08:00
Chiradeep Vittal 9350d10849 WIP: admin commands for adding / listing VNMC 
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
 2013-01-16 15:32:29 -08:00
Chiradeep Vittal a8031a0cfe WIP ASA 1000v listing" 
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
 2013-01-16 15:30:41 -08:00
Chiradeep Vittal f9cc674b9c WIP : edge firewall 
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
 2013-01-16 15:30:36 -08:00
Chiradeep Vittal 6a0964af00 WIP : edge security policy 
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
 2013-01-16 15:30:30 -08:00
Chiradeep Vittal e32295e8cf WIP : dhcp server policy 
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
 2013-01-16 15:30:24 -08:00
Chiradeep Vittal 446a9b8491 WIP : dhcp server policy 
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
 2013-01-16 15:30:18 -08:00
Chiradeep Vittal e35e0eb59b Move unit test 
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
 2013-01-16 15:30:14 -08:00
Chiradeep Vittal 2b43a3e74e Move unit test 
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
 2013-01-16 15:30:08 -08:00
Chiradeep Vittal 11b804a894 WIP: XML control of VNMC 
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
 2013-01-16 15:29:54 -08:00
Murali Reddy 88a0b5ac48 Revert "Summary: partical check-in for L4-L7 network services in the shared" 
This reverts commit 6657246cd4.

Reverting due to IP clearance issued for the commit done as part of CLOUDSTACK-312
 2013-01-16 16:05:17 +05:30
Rohit Yadav bca2c928e8 PluggableService: Fix interface definition 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-14 19:01:26 -08:00
Rohit Yadav c4e890c55d PluggableService: Refactor method to return map of key value pairs 
- Makes plugins self contained so they decide their properties file format
- PluggableService creates the contract that implementing entity will return a
  properties map which is apiname:rolemask (both are strings)

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-10 15:55:02 -08:00
Rohit Yadav 999ecb67df plugins: Import and @Parameter fixes 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-09 11:23:24 -08:00
Rohit Yadav 066edc1105 plugins: Fix pluggable service getPropertiesFiles() on f5, srx and netscaler 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-09 11:21:30 -08:00
Rohit Yadav 077f47193d
Sync changes: Merge branch 'master' into api_refactoring 
Conflicts:
	plugins/network-elements/dns-notifier/pom.xml

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-08 20:36:17 -08:00
Noa Resare 4f98d879f6 maven: remove explicit submodule versions from module pom.xml 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-08 20:25:58 -08:00
Rohit Yadav d613c59dcb plugins: Fix apidiscovery's annotation field values and example plugin's name 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-08 20:00:13 -08:00
Rohit Yadav ed0637b8c2 api: Refactor move acl to org.apache.cloudstack 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-06 15:30:58 -08:00
Rohit Yadav 63481ecb34 CLOUDSTACK-212: Move api response classes to cloud-api under org.apache.cloudstack 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-05 16:27:36 -08:00
Rohit Yadav 5119785cf7 Get latest changes, merge branch 'master' into api_refactoring 
Conflicts:
	api/src/com/cloud/network/element/RemoteAccessVPNServiceProvider.java
	server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java
	server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java
	setup/db/db/schema-40to410.sql

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-04 22:21:20 -08:00
Sheng Yang 42c8c73ab6 CLOUDSTACK-306: Introducing IpDeployingRequester and implement inline mode 
For LB device in inline mode, the ip deployer(the owner of public ip) is the
firewall in front of it, not itself. So check if it's inline or not, if it's
inline, return the firewall as ip deployer
 2013-01-04 19:18:03 -08:00
Sheng Yang 177e157cbf CLOUDSTACK-306: Move inline mode parameter from device to network offering 
One F5 device can be used as inline and side-by-side at the same time(for
different networks). So we can define inline or not on network base.
 2013-01-04 19:17:58 -08:00
Sheng Yang 717f9dcd4d CLOUDSTACK-306: Implement SRX firewall 
Use SRX firewall filter as SRX firewall. The old security policy mechanism
cannot be used as IP based. This would enable SRX's ability to control traffic
for F5 behind it.
 2013-01-04 19:17:50 -08:00
Rohit Yadav 596f9d0905 api: Annotate netscaler apis, remove IdentityMapper from everywhere 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-04 17:09:40 -08:00
Rohit Yadav 65a1284e83 srx: Annotate api classes, remove IdentityMapper 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-04 17:00:10 -08:00
Rohit Yadav 4dd5f14e76 f5: Annotate f5 cmd classes, remove IdentityMapper 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-04 16:49:27 -08:00
Rohit Yadav a2f8f42575 nicira-nvp: Annotate nvp plugin, remove IdentityMapper 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-04 16:33:40 -08:00
Rohit Yadav edb00bb613 Merge branch 'master' into api_refactoring 2013-01-03 08:32:56 -08:00
Hugo Trippaers 282eb5fcf5 Summary: Unittest for nicira plugin 
More unittests for the Guru

Add unittests for the Element
 2013-01-03 11:57:14 +01:00
Hugo Trippaers 00847482cc Summary: Small fixes for issues found during unittests 2013-01-03 11:56:50 +01:00
Hugo Trippaers 6cf0c5683d Summary: Make canHandle protected 
Change access to canHandle so it's easier to unittest. 

Make a note that answers can be null if the host is down, there should
be a way to deal with this, but for now an NPE is an adequate indication
that something is wrong.
 2013-01-03 11:56:26 +01:00
Hugo Trippaers 9122809e00 Summary: nothing to see here, move along 
Fix for a stupid mistake.
 2013-01-03 11:56:02 +01:00
Rohit Yadav d235859168 Fix PluggableService to provide interface for ACL adapters etc. to get configs 
- Fix interface to return array of strings, or filenames
- Fix StaticRoleBased ACL adapter to process config files by going through all pluggable services
- Refactor interface names

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-02 16:29:39 -08:00
Rohit Yadav 774cb29b0c api: Annotate all remaining cmd classes with APICommand name field 
Automates name field filling using following python program which reads from
various *commands.properties.in files and populates name fields based on the
name cmd class mapping defined in them.

import os
search_pattern = "@APICommand("
pattern_len = len(search_pattern)
prop_files = [
"client/tomcatconf/cisconexusvsm_commands.properties.in",
"client/tomcatconf/f5bigip_commands.properties.in",
"client/tomcatconf/junipersrx_commands.properties.in",
"client/tomcatconf/netapp_commands.properties.in",
"client/tomcatconf/netscalerloadbalancer_commands.properties.in",
"client/tomcatconf/nicira-nvp_commands.properties.in",
"client/tomcatconf/simulator_commands.properties.in",]
file_prefixes = [
"plugins/hypervisors/vmware/src/",
"plugins/network-elements/f5/src/",
"plugins/network-elements/juniper-srx/src/",
"plugins/file-systems/netapp/src/",
"plugins/network-elements/netscaler/src/",
"plugins/network-elements/nicira-nvp/src/",
"plugins/hypervisors/simulator/src/",]
counter = 0
for prop_file in prop_files:
    f = open(prop_file, 'r')
    data = f.read()
    f.close()
    file_prefix = file_prefixes[counter]
    apis = filter(lambda x: x.strip()!='' and (not x.startswith('#')), data.split('\n'))
    for api in apis:
        api_name = api.split('=')[0].strip()
        cmd_name = file_prefix + api.split('=')[1].split(';')[0].replace('.', '/').strip() + ".java"
        if not os.path.exists(cmd_name):
            print cmd_name, api_name
        f = open(cmd_name, 'r')
        d = f.read()
        f.close()
        idx = d.find(search_pattern) + pattern_len
        new_str = d[:idx] + "name = \"%s\", " % api_name + d[idx:]
        f = open(cmd_name, 'w')
        f.write(new_str)
        f.close()
    counter += 1

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-28 01:28:47 -08:00
Rohit Yadav 7a7fe583e0 Rename Implementation annotation to APICommand 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-26 15:55:34 -08:00
Rohit Yadav 057ac12d23 Enforce InternalIdentity interface on all VO classes that impls long getId() 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-26 15:09:44 -08:00
Rohit Yadav 018b5215e0 api: Annotate apis in various plugins 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-23 18:03:23 -08:00
Rohit Yadav 1bd47d48ab api: Annotate some nicira apis 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-23 17:43:42 -08:00
Rohit Yadav e849d70af1 api: Annotate some juniper-src apis 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-23 17:41:10 -08:00
Rohit Yadav 296b49c2f8 Merge branch 'master' into test-merge-api 
Conflicts:
	api/src/com/cloud/agent/api/BackupSnapshotCommand.java
	api/src/com/cloud/agent/api/storage/PrimaryStorageDownloadCommand.java
	api/src/com/cloud/agent/api/to/PortForwardingRuleTO.java
	api/src/com/cloud/network/NetworkService.java
	api/src/com/cloud/resource/ResourceService.java
	api/src/org/apache/cloudstack/api/ApiConstants.java
	api/src/org/apache/cloudstack/api/ResponseGenerator.java
	api/src/org/apache/cloudstack/api/response/SSHKeyPairResponse.java
	client/tomcatconf/commands.properties.in
	core/src/com/cloud/storage/SnapshotVO.java
	pom.xml
	server/src/com/cloud/api/ApiDispatcher.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/offerings/NetworkOfferingVO.java
	server/src/com/cloud/resource/ResourceManagerImpl.java
	server/src/com/cloud/upgrade/dao/Upgrade40to41.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
	setup/db/create-schema.sql
	setup/db/db/schema-40to410.sql

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-23 13:54:46 -08:00
Min Chen 98b022a430 Remove IdentityProxy from plugin response classes. 
Signed-off-by: Min Chen <min.chen@citrix.com>
 2012-12-19 13:09:02 -08:00
Alex Huang 392feacd27 missed license 2012-12-18 13:04:34 -08:00
Alex Huang 591fb34795 Added dns-notifier as example plugin 2012-12-18 12:01:26 -08:00
Hugo Trippaers 859412c1ce Fix headers 
again....
 2012-12-14 11:58:25 +01:00