00b2a8040b
Remove @author tag from non third-party source files in agent-simulator, cloud-cli, test, ui and utils folder
2012-08-13 15:30:42 +08:00
a4431b5740
S2S VPN: Use coma instead of semicolon for separating cidr list
2012-08-10 16:20:52 -07:00
ccac505944
Merge branch 'master' into vpc
2012-08-10 10:47:49 -07:00
0ad8118562
Fixed three .classpath license header issues
2012-08-09 14:21:06 -04:00
c5e3493792
Merge branch 'master' into vpc
2012-08-08 18:38:35 -07:00
e83c60a057
added JoinType to remove the j2ee source code in CloudStack
2012-08-08 13:42:08 -07:00
f04c006f9a
Added javax.persistence and javax.ejb jar packages to replace the files removed. Added a new annotation to replace the encrypt attributed added to the Column annotation. Removed join attribute added to SecondaryTable in previous commit
2012-08-08 12:58:24 -07:00
457f3b3dc9
Removed all javax source code from utils package
2012-08-08 12:58:22 -07:00
048c5e50cf
Merge branch 'master' into vpc
...
Conflicts:
utils/test/com/cloud/utils/component/MockComponentLocator.java
2012-08-08 11:50:39 -07:00
57b57703eb
fixed broken unit test
2012-08-07 17:38:05 -07:00
a617ccc898
Added missing file
2012-08-07 15:52:34 -07:00
a6a864a1a8
Removed Base64 file and use the apache version
2012-08-07 15:41:54 -07:00
1d3a443237
Added support for component libraries in plugins
2012-08-07 15:40:01 -07:00
d38e9eebed
VPC: CS-15850 - don't unplug the nic for public network when there are existing ips in the same vlan having network rules
...
Conflicts:
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-08-07 11:25:02 -07:00
cf64fda5d5
VPC: unittest preparation
...
Conflicts:
server/src/com/cloud/network/vpc/VpcManagerImpl.java
server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-08-07 11:23:52 -07:00
84a1a311f9
S2S VPN: CS-15511: Add PFS support for VPN connection
2012-08-06 15:27:13 -07:00
5a72044dc7
Merge branch 'master' into vpc
2012-08-03 14:30:54 -07:00
95ce55f0a1
License header updates for the utils folder
2012-08-03 14:15:09 -04:00
0588c9748c
VPC: CS-15818 - don't allow having ICMP networkACLs with the same cidr and icmpType=-1 for rule1 and icmpType!=-1 for rule 2 as the rule1 covers rule2 in this case
...
Conflicts:
server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
utils/src/com/cloud/utils/net/NetUtils.java
2012-08-02 18:09:10 -07:00
8f797afd42
VPC: CS-15813 - ICMP type and code validation
...
Conflicts:
server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
utils/src/com/cloud/utils/net/NetUtils.java
2012-08-01 19:55:51 -07:00
e8d2ca48b4
S2S VPN: Update the supported crypto list
...
We would support 3DES, AES128, AES192, AES256.
2012-07-30 16:43:55 -07:00
e9ae7336c1
CS-15649: Remove DES from s2s vpn support policy
...
DES is considered INSECURE.
2012-07-20 10:53:42 -07:00
c0fcca3990
CS-15511: Not allow pfs parameter for customer VPN gateway
2012-07-19 15:10:31 -07:00
4a7149e6b5
VPC: CS-15580 - don't allow gateway for VPC guest network to be equal to the cidr subnet
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-07-13 17:09:16 -07:00
94c62f2127
CS-15513: Fix group 5 of s2s vpn
...
Conflicts:
utils/test/com/cloud/utils/net/NetUtilsTest.java
2012-07-10 10:38:17 -07:00
353423acec
Merge branch 'master' into vpc
...
Conflicts:
api/src/com/cloud/api/commands/ListFirewallRulesCmd.java
api/src/com/cloud/api/response/FirewallResponse.java
api/src/com/cloud/api/response/IPAddressResponse.java
server/src/com/cloud/api/ApiDBUtils.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
server/src/com/cloud/network/dao/NetworkDaoImpl.java
server/src/com/cloud/server/ManagementServerImpl.java
2012-07-06 12:04:10 -07:00
53d5fe6636
fixing another license header
2012-07-04 19:47:12 -04:00
24c480f9e6
CS-6840: Add commands for site-to-site vpn
...
Conflicts:
api/src/com/cloud/api/BaseCmd.java
api/src/com/cloud/api/ResponseGenerator.java
client/tomcatconf/commands.properties.in
server/src/com/cloud/api/ApiResponseHelper.java
server/src/com/cloud/configuration/DefaultComponentLibrary.java
utils/test/com/cloud/utils/net/NetUtilsTest.java
2012-07-02 16:26:34 -07:00
1f01d923ca
Merge branch 'master' into vpc
2012-06-28 17:44:08 -07:00
634cd78baa
Merge branch 'master' into vpc
...
Conflicts:
api/src/com/cloud/api/ApiConstants.java
api/src/com/cloud/api/BaseCmd.java
api/src/com/cloud/api/ResponseGenerator.java
api/src/com/cloud/api/commands/ListNetworksCmd.java
api/src/com/cloud/api/response/NetworkResponse.java
api/src/com/cloud/event/EventTypes.java
api/src/com/cloud/network/NetworkService.java
client/tomcatconf/commands.properties.in
scripts/network/domr/getDomRVersion.sh
scripts/network/domr/ipassoc.sh
scripts/network/domr/l2tp_vpn.sh
scripts/network/domr/networkUsage.sh
scripts/network/domr/router_proxy.sh
server/src/com/cloud/api/ApiDBUtils.java
server/src/com/cloud/api/ApiResponseHelper.java
server/src/com/cloud/configuration/DefaultComponentLibrary.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/dao/IPAddressDao.java
server/src/com/cloud/network/dao/IPAddressDaoImpl.java
setup/apidoc/gen_toc.py
setup/db/create-schema.sql
wscript
2012-06-28 17:41:40 -07:00
46b97cbf7d
VPC: update public IP info in domain_router table once the VR gets the public nic
2012-06-28 10:25:24 -07:00
8197f1f07c
moving out VMWAre and Nexus VSM support code into plugins/hypervisors/vmware
2012-06-26 19:48:55 -07:00
55a12582b4
Completed API / Management server code for Resource tags feature. UI is yet to be done
2012-06-20 15:45:08 -07:00
fe76cf8a60
CS-15241: static NAT is not working when provider is set to Juniper SRX
...
Description:
Checking in fix for the exception seen due to the absence of
the AsyncCommandQueued exception in the map of CSExceptionErrorCode
which is used to look up the error code corresponding to a
cloudstack exception. Also printing the stack trace in case
an exception is not found in the map.
2012-06-19 11:44:48 -07:00
e177b8d6f6
CS-15241: static NAT is not working when provider is set to Juniper SRX
...
Description:
Checking in fix for the exception seen due to the absence of
the AsyncCommandQueued exception in the map of CSExceptionErrorCode
which is used to look up the error code corresponding to a
cloudstack exception. Also printing the stack trace in case
an exception is not found in the map.
Conflicts:
utils/src/com/cloud/utils/exception/CSExceptionErrorCode.java
2012-06-15 14:29:12 -07:00
b7ca7f8df2
Doh, broke the build - fixing that.
2012-06-06 23:21:54 -04:00
937a9f7c45
fixing utils license header
2012-06-06 23:06:02 -04:00
0e3bf8cabb
CS-14956: Fixing an issue that surfaced while testing rate limiting
...
policies. An error was getting reported during policy map creation that
config operation was in progress, Added synchronization to make sure
sending and receiving commands are seralized. Also removed the retry logic
as after this change it is not needed.
Reviewed-By: Vijay
2012-05-25 19:35:34 -07:00
ec83e0e939
CS-9919: Support for Nexus Swiches (Cisco Vswitches)
...
Description:
Removing the CiscoNexusVSMService class since
we don't use it anywhere.
2012-05-25 18:38:42 -07:00
5fc5b7a0eb
CS-9919: Adding helper routines to query details of a port profile and
...
associated policy maps. Also updating the error message logs.
2012-05-25 18:24:20 -07:00
3006bed6df
CS-14948: Fixing an issue with parsing the xml-rpc response to a command
...
from vsm. This was throwing false exceptions when infact the command
execution was a success. Also adding retry logic for create port profile
request.
2012-05-25 18:08:48 -07:00
6d896951b3
CS-9919 Support for Nexus Swiches (Cisco Vswitches)
...
Description:
Increasing the window for xmlstream.
2012-05-25 17:41:31 -07:00
8db1ca296b
CS-9919: Support for Nexus Swiches (Cisco Vswitches)
...
Description:
Do not set the access mode of an interface if vlanid is zero.
2012-05-25 17:41:17 -07:00
8d1b9c2477
CS-9919: Support for Nexus Swiches (Cisco Vswitches)
...
Description:
Adding api to remove from a service policy
(policy map) from a port profile.
2012-05-25 17:36:48 -07:00
ec19facd30
CS-9919: Support for Nexus Swiches (Cisco Vswitches)
...
Description:
Adding apis to create service policies and
associate them with a port profile.
2012-05-25 17:36:42 -07:00
0e293b7b5b
CS-9919: Support for Nexus Swiches (Cisco Vswitches)
...
Description:
Made changes to persist the vsm configuration
after updating it.
2012-05-25 17:18:11 -07:00
76e1d338f3
CS-9919: Support for Nexus Swiches (Cisco Vswitches)
...
Description:
Adding a helper routine for modifying port
profile configuration.
2012-05-25 17:18:04 -07:00
4ff2893ffc
CS-9919: Support for Nexus Swiches (Cisco Vswitches)
...
Description:
Updated the add port profile routine to support
more options (bindingtype, switchport mode, port
profile types).
2012-05-25 17:17:43 -07:00
441a811927
CS-9919: Support for Nexus Swiches (Cisco Vswitches)
...
Description:
Added handling for error responses from vsm.
Fixing an issue with port profile creation.
2012-05-25 17:17:02 -07:00
3fd32c1784
CS-9919: Support for Nexus Swiches (Cisco Vswitches)
...
Description:
Removing unused classes and references to them.
2012-05-25 17:16:55 -07:00
Mice Xia
Sheng Yang
Alena Prokharchyk
Chip Childers
Alex Huang
David Nalley
Murali reddy
Vijayendra Bhamidipati
Devdeep Singh
Sateesh Chodapuneedi