766b7a2706
Merge branch 'master' into vpc
...
Conflicts:
server/src/com/cloud/api/ApiResponseHelper.java
2012-07-23 16:38:58 -07:00
46cd99f01e
VPC: CS-15668 - IpAssoc: unplug the nics before pluggning new ones
2012-07-23 16:38:14 -07:00
11f5bd25f8
CS-15145: Summary: ec2-register: need better error handling for negative cases.
...
The negative cases for which the error handling is improved,
1. run ec2-register with incorrect field separator for architecture parameter.
2. run ec2-register without providing required parameters.
2012-07-23 15:46:03 -07:00
b80c3dc9c6
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
2012-07-23 15:34:41 -07:00
59462cd825
Modifying filter support in 3 EC2 Describe* API's(DescribeInstances, DescribeVolumes and DescribeSnapshots) to include tags. Component: AWSAPI.
...
Tags support has been added to 3 EC2Describe* API's(DescribeInstances, DescribeVolumes and DescribeSnapshots). Hence for the same 3 EC2Describe* API's filter support has been modified to included 3 tag related filters: tag-key,
tag-value and tag:key.
2012-07-23 15:24:41 -07:00
aef09e1b20
Adding tags support to the 4 EC2 Describe* API's (DescribeImages, DescribeInstances, DescribeVolumes, DescribeSnapshots) in AWSAPI
...
- List* APIs in CloudStack have tags support. Adding the corresponding support to EC2Decsribe* APIs in the AWSAPI component.
2012-07-23 15:22:38 -07:00
642c667a75
Add tagger JS link
2012-07-23 15:18:36 -07:00
64605e7703
UI: Add tag API call generator
...
Adds a helper to return an object to pass to the 'tagger' widget,
including all required data and action functions.
Syntax is as follows, just include anywhere were the tags widget is
supported:
tags: cloudStack.api.tags({
resourceType: 'Project',
contextId: 'projects'
})
2012-07-23 15:18:36 -07:00
1c2780f233
Tag UI: Make sure data is passed to remove action
2012-07-23 15:18:36 -07:00
39e1936c87
Fix tags widget overlap with long detail views
2012-07-23 15:18:36 -07:00
5e94b0d12e
Implement tag UI widget
...
Create UI for handling new tag API. This currently supports the detail view and multi-edit
To enable tags UI, add a 'tags' object to each detailView/multiEdit configuration:
tabs: {
...
details: {
...
tags: {
actions: {
add: function(args) {
setTimeout(function() {
args.response.success({
notification: {
desc: 'Add tags for instance',
poll: testData.notifications.testPoll
}
});
}, 500);
},
remove: function(args) {
args.response.success({
notification: {
desc: 'Remove tags for instance',
poll: testData.notifications.testPoll
}
});
}
},
dataProvider: function(args) {
args.response.success({
data: [
{
id: '1',
key: 'user',
value: 'brian'
},
{
id: '2',
key: 'region',
value: 'usa'
}
]
});
}
}
...
Conflicts:
ui/css/cloudstack3.css
ui/scripts/ui/widgets/tagger.js
2012-07-23 15:18:36 -07:00
f1e2be7157
CS-15511: Fix parameter transfer in bash
...
[Dropped Vmware support in this commit, due to lack of VMware support in VPC now]
Conflicts:
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
2012-07-23 14:51:40 -07:00
88f7872b81
CS-15279
...
Issue happens when ROOT volume gets created and there is subsequent failure in starting the VM. During retry if allocator assigns a different storage pool the scenario was not handled. Now in case of local storage the volume get recreated on the newly assigned pool and old one gets cleaned up. In case of shared storage the existing volume is migrated to new storage pool.
2012-07-23 14:49:04 -07:00
b18d90af04
CS-15615: Fix Site2SiteVpnService injection
2012-07-23 14:46:17 -07:00
c357134330
CS-15574: Delete VPN gateway and connection when deleting VPC
...
Conflicts:
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-07-23 14:45:42 -07:00
7d68e33323
S2S VPN: Use source NAT ip address for VPN gateway
...
Conflicts:
api/src/com/cloud/api/commands/CreateVpnGatewayCmd.java
server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-07-23 14:44:05 -07:00
671475242c
S2S VPN: Add domain and account for VPN
...
Admin can add VPN connection for others
Conflicts:
api/src/com/cloud/api/commands/CreateVpnConnectionCmd.java
server/src/com/cloud/api/ApiResponseHelper.java
setup/db/create-schema.sql
2012-07-23 14:40:26 -07:00
230ce1dfee
S2S VPN: Add state for vpn connection response
2012-07-23 14:38:06 -07:00
df9315ff02
CS-15447: Don't enable s2s vpn when provider is disabled
...
Conflicts:
server/src/com/cloud/network/vpc/VpcManager.java
2012-07-23 14:37:40 -07:00
52c145dc46
CS-15470: Remove UNIQUE keyword for some fields
...
User can create/delete/create gateway again and again, then it would no longer
be unique. The unique should be guaranteed by API level.
2012-07-23 14:36:22 -07:00
4b0515f8e5
CS-15471: Fix wrong type of updating customer gateway lifetime
...
Also fixes one typo.
2012-07-23 14:36:10 -07:00
0dec6ea804
CS-15456: Prohibit creating more than one VPN gateway of VPC
2012-07-23 14:35:52 -07:00
d855dff7c2
CS-6840: Fix wrong path of check s2s vpn script
2012-07-23 14:35:32 -07:00
830901d7cc
cloudstack 3.0 API - listVpnConnections API - add gatewayIp, guestCidrList,ipsecPsk, ikePolicy, espPolicy, lifetime property (get it from customerGateway object).
2012-07-23 14:21:10 -07:00
196885e378
cloudstack 3.0 API - listVpnConnections API - add publicip property (get it from vpnGateway object).
2012-07-23 14:20:43 -07:00
8fad593ac5
cloudstack 3.0 API: CreateVpnCustomerGateway API, ListVpnCustomerGateways API: set object name for API response.
2012-07-23 12:14:59 -07:00
aac0a808c1
cloudstack 3.0 API - CreateVpnConnection API, ListVpnConnections API: set object name for API response.
2012-07-23 12:10:29 -07:00
497c324efc
cloudstack 3.0 API - CreateVpnCustomerGateway API: correct parameter type on server-side.
2012-07-23 11:35:48 -07:00
c60e4b4a9e
Adding support in AWSAPI for CloudStack API's that implement the tags feature.
...
Verified the output of,
1. ec2-create-tags for all 4 supported ec2 resources(image, instance, volume and snapshot) with and without tag-value.
2. ec2-delete-tags for all types of created tags.
3. ec2-describe-tags with and without all supported filter.
2012-07-23 11:31:17 -07:00
9e5fb17e3d
CS-15077: fixed listPublicIpAddresses in basic zone
...
Conflicts:
server/src/com/cloud/api/ApiResponseHelper.java
server/src/com/cloud/server/ManagementServerImpl.java
2012-07-23 11:21:28 -07:00
7cf7002571
Merge branch 'master' into vpc
2012-07-23 10:57:55 -07:00
7bef9a961d
Resource tags: CS-15661 - don't accept NULL or empty key value when create resource tag
2012-07-23 10:51:20 -07:00
c8f72c9198
Merge branch 'master' into vpc
...
Conflicts:
ui/scripts/network.js
2012-07-23 10:36:25 -07:00
65551cff82
Resource tags: CS-15647 - delete resource tags when SG is expunged
2012-07-23 10:33:59 -07:00
4c6e547e70
create devcloud base image from veewee
2012-07-20 18:20:31 -07:00
394f55d9e3
More logging to the VirtualRouter manager
2012-07-20 17:12:34 -07:00
966c1b0ad8
VPC: when VPC router gets destroyed and recreated, plug public nic for each Vlan where VPC public ips belong to
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
2012-07-20 17:12:34 -07:00
cf895d34d2
CS-15622: always get router info from the DB
2012-07-20 17:12:34 -07:00
2b7ec3f4a8
VPC: one more fix for multiple public nic case for the VPC VR
...
Conflicts:
server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-07-20 17:12:34 -07:00
5a64d4fbb1
VPC: CS-15638: Plug nic for the public ip address if the ip address from the diff vlan range than sourceNat ip
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/firewall/FirewallManagerImpl.java
server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/network/rules/RulesManagerImpl.java
server/src/com/cloud/network/vpc/VpcManagerImpl.java
server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-07-20 17:12:34 -07:00
8712812ca7
cloudstack 3.0 API: CreateVpnGateway API, ListVpnGateways API: set object name for API response.
2012-07-20 16:49:17 -07:00
9b4c578e0d
More logging on nic release
2012-07-20 16:44:24 -07:00
2a822de5e0
cloudstack 3.0 UI - multiEdit widget - make headerFields hidden as default.
2012-07-20 16:13:03 -07:00
f3841b3b8f
cloudstack 3.0 UI - VPC - add LB rule - fix a JS error "args.context.networks is undefined" when configure stickiness.
2012-07-20 16:10:35 -07:00
1381fa46e1
cloudstack 3.0 UI - listView widget - pass context from caller function.
2012-07-20 16:05:11 -07:00
9176d13246
cloudstack 3.0 UI - VPC - infrasture page - network service providers - add "VPC Virtual Router".
2012-07-20 15:59:05 -07:00
254c05813c
cloudstack 3.0 UI - VPC - add zone wizard - enable VpcVirtualRouter element, enable VpcVirtualRouter provider for advanced zone.
2012-07-20 15:49:13 -07:00
dc847ed832
cloudstack 3.0 UI - VPC - tier - implement "Add VM to tier" action.
2012-07-20 15:44:45 -07:00
20db2e515b
cloudstack 3.0 UI - VPC - add network offering dialog - when service(s) has VPC Virtual Router as provider: (1) conserve mode is set to unchecked and grayed out. (2) redundant router capability checkbox is set to unchecked and grayed out. (3) remove Firewall service, SecurityGroup service.
2012-07-20 14:28:20 -07:00
ee9074a175
cloudstack 3.0 UI - VPC - sync VPC UI from citrix-hosted repo to apache-hosted repo.
2012-07-20 14:12:53 -07:00
Alena Prokharchyk
Likitha Shetty
prachi
Brian Federle
bfederle
Sheng Yang
Koushik Das
Jessica Wang
Edison Su