12520 Commits

Author SHA1 Message Date
Brian Federle
c839cf68a6 Add tags to edit PF dialog 2012-07-24 15:25:57 -07:00
Brian Federle
87f0ec6796 Fix tag notification messages 2012-07-24 15:25:57 -07:00
Brian Federle
a59afac31f Add tag edit to LB rule 2012-07-24 15:25:57 -07:00
Brian Federle
c5dc569aaa multiEdit: Pass context to tagger widget 2012-07-24 15:25:56 -07:00
Brian Federle
e97c47b9ae Always make tags editable 2012-07-24 15:25:56 -07:00
Brian Federle
2fdf6837ec Pass projectId to listTags, when viewing a project resource 2012-07-24 15:25:13 -07:00
bfederle
ea35f48d7e Implement tags for project detail view 2012-07-24 15:23:58 -07:00
Sheng Yang
a00456bc57 CS-15676: Fix NPE when stop non-VPC router 2012-07-24 11:43:30 -07:00
Sheng Yang
1920c2a735 CS-15534: Mark VPN connection as Disconnected when rebootRouter
Conflicts:

	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
2012-07-23 21:14:49 -07:00
Sheng Yang
6cb10ce993 S2S VPN: Add check for router status before apply vpn 2012-07-23 19:53:39 -07:00
Sheng Yang
4d42845853 S2S VPN: Add back pfs=no for ipsec.conf
According to ipsec.conf manual:

pfs

whether Perfect Forward Secrecy of keys is desired on the connection's keying
channel (with PFS, penetration of the key-exchange protocol does not compromise
keys negotiated earlier); Since there is no reason to ever refuse PFS, Openswan
will allow a connection defined with pfs=no to use PFS anyway. Acceptable values
are yes (the default) and no.

Found removing the option would make it impossible to work with no PFS setting
router. It may related to CS-15511.
2012-07-23 19:35:08 -07:00
Sheng Yang
27d82f683b S2S VPN: Support for multiply VPN connections per VPC/VPN gateway 2012-07-23 19:03:29 -07:00
Alena Prokharchyk
766b7a2706 Merge branch 'master' into vpc
Conflicts:
	server/src/com/cloud/api/ApiResponseHelper.java
2012-07-23 16:38:58 -07:00
Alena Prokharchyk
46cd99f01e VPC: CS-15668 - IpAssoc: unplug the nics before pluggning new ones 2012-07-23 16:38:14 -07:00
Likitha Shetty
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
prachi
b80c3dc9c6 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack 2012-07-23 15:34:41 -07:00
Likitha Shetty
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
Likitha Shetty
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
Brian Federle
642c667a75 Add tagger JS link 2012-07-23 15:18:36 -07:00
bfederle
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
bfederle
1c2780f233 Tag UI: Make sure data is passed to remove action 2012-07-23 15:18:36 -07:00
bfederle
39e1936c87 Fix tags widget overlap with long detail views 2012-07-23 15:18:36 -07:00
bfederle
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
Sheng Yang
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
Koushik Das
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
Sheng Yang
b18d90af04 CS-15615: Fix Site2SiteVpnService injection 2012-07-23 14:46:17 -07:00
Sheng Yang
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
Sheng Yang
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
Sheng Yang
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
Sheng Yang
230ce1dfee S2S VPN: Add state for vpn connection response 2012-07-23 14:38:06 -07:00
Sheng Yang
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
Sheng Yang
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
Sheng Yang
4b0515f8e5 CS-15471: Fix wrong type of updating customer gateway lifetime
Also fixes one typo.
2012-07-23 14:36:10 -07:00
Sheng Yang
0dec6ea804 CS-15456: Prohibit creating more than one VPN gateway of VPC 2012-07-23 14:35:52 -07:00
Sheng Yang
d855dff7c2 CS-6840: Fix wrong path of check s2s vpn script 2012-07-23 14:35:32 -07:00
Jessica Wang
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
Jessica Wang
196885e378 cloudstack 3.0 API - listVpnConnections API - add publicip property (get it from vpnGateway object). 2012-07-23 14:20:43 -07:00
Jessica Wang
8fad593ac5 cloudstack 3.0 API: CreateVpnCustomerGateway API, ListVpnCustomerGateways API: set object name for API response. 2012-07-23 12:14:59 -07:00
Jessica Wang
aac0a808c1 cloudstack 3.0 API - CreateVpnConnection API, ListVpnConnections API: set object name for API response. 2012-07-23 12:10:29 -07:00
Jessica Wang
497c324efc cloudstack 3.0 API - CreateVpnCustomerGateway API: correct parameter type on server-side. 2012-07-23 11:35:48 -07:00
Likitha Shetty
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
Alena Prokharchyk
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
Alena Prokharchyk
7cf7002571 Merge branch 'master' into vpc 2012-07-23 10:57:55 -07:00
Alena Prokharchyk
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
bfederle
c8f72c9198 Merge branch 'master' into vpc
Conflicts:
	ui/scripts/network.js
2012-07-23 10:36:25 -07:00
Alena Prokharchyk
65551cff82 Resource tags: CS-15647 - delete resource tags when SG is expunged 2012-07-23 10:33:59 -07:00
Edison Su
4c6e547e70 create devcloud base image from veewee 2012-07-20 18:20:31 -07:00
Alena Prokharchyk
394f55d9e3 More logging to the VirtualRouter manager 2012-07-20 17:12:34 -07:00
Alena Prokharchyk
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
Alena Prokharchyk
cf895d34d2 CS-15622: always get router info from the DB 2012-07-20 17:12:34 -07:00