Sheng Yang
2d2c0c48cd
Merge branch 'pvlan'
...
Conflicts:
scripts/vm/hypervisor/xenserver/xenserver60/patch
server/src/com/cloud/network/NetworkManager.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/NetworkServiceImpl.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/network/vpc/VpcManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
server/test/com/cloud/network/MockNetworkManagerImpl.java
server/test/com/cloud/vpc/MockNetworkManagerImpl.java
server/test/com/cloud/vpc/MockVpcVirtualNetworkApplianceManager.java
2013-05-15 16:08:08 -07:00
Edison Su
a0c3d280b4
merge to master
2013-05-15 00:40:53 -07:00
Jessica Wang
b082e23af3
CLOUDSTACK-2351: object store - UI - restore UI change that was overwriten by the sync from master branch.
2013-05-13 16:22:20 -07:00
Jessica Wang
b1f6d89141
CLOUDSTACK-1816: Cisco VNMC ASA1000v - UI - Infrastructure menu - network service providers - populate provider detailView.
2013-05-09 15:31:25 -07:00
Jessica Wang
04be0cdec2
CLOUDSTACK-1816: Cisco VNMC ASA1000v - UI - Infrastructure menu - network service providers - show Cisco VNMC in Advanced zone, hide it in Basic zone.
2013-05-09 14:33:18 -07:00
Brian Federle
c1e9e4de61
Merge branch 'master' into ui-cisco-asa1000v-support
2013-05-08 10:47:54 -07:00
Pranav Saxena
305f3cb8a5
CLOUDSTACK-2387:Addition/Deletion of a VLAN Range from UI calls updateTrafficType API which makes all networklabels as undefined which finally results in failure to deploy VMs
2013-05-08 17:07:46 +05:30
Pranav Saxena
76e8afa24f
CLOUDSTACK-2171:Unable to Create a VM In the VMware Setup with the latest Master
2013-05-08 17:05:36 +05:30
Jessica Wang
25e992dc8e
CLOUDSTACK-2348: PVLAN - UI - Infrastructure menu - guest network - add broadcast URI field to listView and detailView.
2013-05-07 13:04:04 -07:00
Jessica Wang
87b7a84507
CLOUDSTACK-2348: PVLAN - UI - infrastructure menu - create guest network - add new field Private VLAN ID.
2013-05-06 12:14:19 -07:00
Brian Federle
2cd70d06b3
Merge branch 'master' into ui-cisco-asa1000v-support
2013-05-06 10:40:08 -07:00
Pranav Saxena
e6ae66d596
scaleUp VM response change corresponding UI changes
2013-05-06 14:08:40 +05:30
Pranav Saxena
5811ae7e25
CLOUDSTACK-2274:Detail view loading problem when deleting a zone
2013-05-05 01:15:14 +05:30
Pranav Saxena
3087bf7e5b
CLOUDSTACK-2041:Granular global parameter- Storage Pool granular settings
2013-05-03 11:21:00 +05:30
Pranav Saxena
324b4f680c
CLOUDSTACK-2041:Granular global parameter- Storage Pool granular settings
2013-05-03 11:16:15 +05:30
Brian Federle
ac07a54a7e
Merge branch 'master' into ui-cisco-asa1000v-support
2013-05-02 10:30:40 -07:00
Pranav Saxena
4933533893
CLOUDSTACK-2041:Granular global parameter- secondary storage settings not needed
2013-05-02 20:11:17 +05:30
Pranav Saxena
d91b0f2f6d
CLOUDSTACK-2041:Granular global parameter- Cluster settings
2013-05-02 18:23:35 +05:30
Pranav Saxena
61f3f931dd
CLOUDSTACK-2041:Granular global parameter- Zone settings
2013-05-02 17:37:01 +05:30
Brian Federle
c1de600cb4
Merge branch 'master' into ui-granular-settings
2013-05-01 14:45:05 -07:00
Jessica Wang
60a8e881c1
CLOUDSTACK-2120: mixed zone management - UI - system.js - remove obsolete code that has been replaced with new change in global function createURL().
2013-05-01 14:22:35 -07:00
Pranav Saxena
38071e63d2
CLOUDSTACK-2113:Router VM scale up UI support
2013-05-02 02:33:27 +05:30
Pranav Saxena
6bf67c9f68
CLOUDSTACK-2113:System VM scaleUp UI support
2013-04-29 16:21:49 +05:30
Jessica Wang
6f60833f93
CLOUDSTACK-2120: mixed zone management - (1) extend listRouters API to to take in zonetype. (2) UI: populate Routers list page with ones whose networktype matches selected option in zone type dropdown on top menu. (3) UI: count total number of Routers based on selected option in zone type dropdown on top menu.
2013-04-25 15:10:33 -07:00
Jessica Wang
f883b0f904
CLOUDSTACK-2120: mixed zone management - UI: count total number of Primary Storages, Secondary Storages based on selected option in zone type dropdown on top menu.
2013-04-25 14:25:34 -07:00
Jessica Wang
e8b6c7b33d
CLOUDSTACK-2120: mixed zone management - UI: count total number of hosts based on selected option in zone type dropdown on top menu.
2013-04-25 11:14:20 -07:00
Jessica Wang
b5979ba9b5
LOUDSTACK-2120: mixed zone management - (1) extend listZones API to to take in networktype. (2) UI: populate Zones list page with ones whose networktype matches selected option in zone type dropdown on top menu. (3) UI: count total number of zones based on selected option in zone type dropdown on top menu.
2013-04-25 10:40:08 -07:00
Jessica Wang
ee02311fae
CLOUDSTACK-2120: mixed zone management - (1) extend listHosts API to to take in zonetype. (2) UI: populate Hosts/SecondaryStorages list page with ones whose zonetype matches selected option in zone type dropdown on top menu.
2013-04-25 09:51:57 -07:00
Jessica Wang
48b82a6f91
CLOUDSTACK-2120: mixed zone management - (1) extend listStoragePools API to to take in zonetype. (2) UI: populate Primary Storages list page with ones whose zonetype matches selected option in zone type dropdown on top menu.
2013-04-24 16:36:07 -07:00
Pranav Saxena
4b7fe3bc29
CLOUDSTACK-2151:Vlan values in the UI Detail view are not updated properly
2013-04-24 14:21:39 +05:30
Pranav Saxena
fa7049a583
CLOUDSTACK-2166:UI Support for remove Vlan for the non-contiguous vlan support:Exception handling
2013-04-24 14:02:30 +05:30
Pranav Saxena
94d5d3de50
CLOUDSTACK-2166:UI Support for remove Vlan for the non-contiguous vlan support
2013-04-24 12:40:38 +05:30
Brian Federle
a9b903d597
Add pod action: Add custom 'appendData' to action
...
For use with plugin API, if 'appendData' is passed in args, always
append this data to the end of the API call. Used when plugin adds new
attributes that need to be passed via the API.
2013-04-23 14:42:16 -07:00
Jessica Wang
b2b8f0e9f4
CLOUDSTACK-2010: cloudstack UI - IPv6 - Infrastructure menu - zone detail - add IPv6 DNS1, IPv6 DNS 2 field.
2013-04-22 15:07:31 -07:00
Pranav Saxena
130492d089
Xenserver storage motion UI changes for systemVMs
2013-04-22 13:37:09 +05:30
Brian Federle
908115203e
WIP: Service provider module
...
-Add 'add service provider' module to assist with creating a new
service provider UI
-Add required functionality to append service provider to hardcoded list
-Add basic ASA 1000v provider to list (name, id, state)
2013-04-18 15:13:14 -07:00
Mice Xia
ff4b55fff8
Fix CLOUDSTACK-1852 showing disconnected host as suitable target during system vms migration
2013-04-17 21:08:34 +08:00
Jessica Wang
f0d6776225
CLOUDSTACK-1910: cloudstack UI - zone detail - physical network - network service providers - NetScaler - add Netscaler device dialog - add 3 new fields: "GSLB service", "GSLB service Public IP", "GSLB service Private IP".
2013-04-16 18:17:58 -07:00
Brian Federle
b54f643b91
Always maximize detail views with settings tab (to fit listView layout)
2013-04-16 12:51:07 -07:00
Brian Federle
9130cd0499
Add seondary storage-level parameters UI
2013-04-16 12:46:58 -07:00
Brian Federle
e8295dd4b0
Add primary storage-level parameters UI
2013-04-16 12:46:44 -07:00
Brian Federle
59d0541bac
Add cluster-level parameters
2013-04-16 12:46:23 -07:00
Brian Federle
019e8cd0ff
Add zone-level granular settings UI
2013-04-16 12:41:20 -07:00
Jessica Wang
23211d1483
CLOUDSTACK-1974: cloudstack UI - Infrastructure menu - zone detail - public traffic type - IP Ranges tab - show new action "Release from account", "Add Account" action.
2013-04-15 17:07:57 -07:00
Jessica Wang
6f3069f0da
CLOUDSTACK-1974: cloudstack UI - Infrastructure menu - zone detail - public traffic type - IP Ranges tab - add action filter.
2013-04-09 17:16:21 -07:00
Jessica Wang
bf72a36ea8
CLOUDSTACK-1974: cloudstack UI - Infrastructure menu - zone detail - public traffic type - IP Ranges tab - add new action "Release from account", "Add Account" for existing IP Ranges.
2013-04-08 14:46:23 -07:00
Pranav Saxena
bb841d6011
CLOUDSTACK-1669:UI for non-contiguous VLAN ranges
2013-04-04 02:56:34 +05:30
Dave Cahill
eddf7b9357
MidoNet Networking Plugin
...
- Supports DHCP, Source NAT, Static NAT, Firewall rules, Port Forwarding
- Renamed MidokuraMidonet to MidoNet
- Related Jira ticket is CLOUDSTACK-996
Signed-off-by: Dave Cahill <dcahill@midokura.com>
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
2013-04-03 12:03:11 +02:00
Pranav Saxena
3d8afb0cfb
CLOUDSTACK-1887:removing the host option from the scope field for primary storage
2013-04-02 16:21:25 +05:30
Phong Nguyen
aa79ccf985
CLOUDSTACK-922: LXC Support in Cloudstack.
...
Signed-off-by: Edison Su <sudison@gmail.com>
2013-04-01 15:41:42 -07:00