31f9d718fb
Merge branch 'master' into vpc
...
Conflicts:
server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
2012-07-03 17:32:50 -07:00
da6d876cd4
VPC: added "forVpc" parameter to listNetworkOfferings command. If true, the offeirng can be used for vpc networks only
...
Conflicts:
api/src/com/cloud/api/ApiConstants.java
server/src/com/cloud/api/ApiDBUtils.java
2012-07-03 17:23:40 -07:00
0449ae37f1
CS-15274: Fix NPE on CreateVlanIpRangeCmd()
...
Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
2012-07-02 15:05:57 -07:00
e87558256c
Patch from Chip Childers
...
https://reviews.apache.org/r/5704/
License header updates for the server folder
2012-07-02 09:51:21 -04:00
1f01d923ca
Merge branch 'master' into vpc
2012-06-28 17:44:08 -07:00
3938c24b45
CS-15356: cloudstack 3.0 API - updateZone API - when internaldns2 parameter is not being passed to updateZone API, leave it as is (i.e. remain original value of internaldns2).
2012-06-27 16:57:03 -07:00
0a7faa9838
Support for adding private network
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/upgrade/dao/Upgrade2214to30.java
2012-06-15 14:20:34 -07:00
929997f54e
AssociateIpAddress to VPC - the ip gets associated to the network only when the first rule for the ip gets created.
...
When the last rule is removed for vpc ip, networkId is set to null
Conflicts:
api/src/com/cloud/api/commands/AssociateIPAddrCmd.java
api/src/com/cloud/api/commands/EnableStaticNatCmd.java
api/src/com/cloud/network/NetworkService.java
api/src/com/cloud/network/rules/RulesService.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
server/src/com/cloud/network/rules/RulesManagerImpl.java
server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-06-15 14:18:24 -07:00
d9fd7e02a5
Plug nic support
...
Conflicts:
server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java
server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
2012-06-15 14:07:46 -07:00
f4060c3c1d
1) Added new element - VpcVirtualRouterElement. Extends VirtualRouter + has plug/unplug nics support
...
2) Added services api support for plugging/unplugging the nics to VpcElement
Conflicts:
api/src/com/cloud/network/NetworkService.java
core/src/com/cloud/vm/VMInstanceVO.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-06-15 14:04:09 -07:00
60b52f90dd
Initial checkin for VPC feature:
...
1) Added API frameworks for the feature. New commands:
* CreateVPCCmd
* ListVPCsCmd
* DeleteVPCCmd
* UpdateVPCCmd
* CreateVPCOfferingCmd
* UpdateVPCOfferingCmd
* DeleteVPCOfferingCmd
* ListVPCOfferingsCmd
2) New db tables:
* `cloud`.`vpc`
* `cloud`.`vpc_offerings`
* `cloud`.`vpc_offering_service_map`
and corresponding VO/Dao objects.
Added vpc_id field to `cloud.`networks` table - not null when network belongs to VPC
3) New Manager and Service interfaces- VpcManager/VpcService
4) Automatically create new VpcOffering (if doesn't exist) on system start
5) New Action events:
* VPC.CREATE
* VPC.UPDATE
* VPC.DELETE
* VPC.OFFERING.CREATE
* VPC.OFFERING.UPDATE
* VPC.OFFERING.DELETE
Conflicts:
api/src/com/cloud/api/ApiConstants.java
client/tomcatconf/commands.properties.in
server/src/com/cloud/api/ApiDBUtils.java
server/src/com/cloud/network/NetworkManagerImpl.java
setup/db/create-schema.sql
2012-06-15 13:53:59 -07:00
3fd17ae029
Merge awsapi related changes to CloudStack
2012-05-25 14:40:53 -07:00
434f166c02
Removed unused comments
2012-05-24 12:04:02 -07:00
2daf7998c8
CS-14692: don't allow to remove account specific ip range when it has sourceNat ip address, and associated with non-removed Guest network
2012-05-14 10:13:44 -07:00
4f12a5191a
CS-14783
...
Fixed limit check when acquire public ip range for the account.
2012-05-11 15:40:17 -07:00
afb97f128b
Account specific vlan ranges - fixed deleteVlanRange
...
Conflicts:
api/src/com/cloud/api/commands/DeleteVlanIpRangeCmd.java
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
2012-04-24 17:18:27 -07:00
a678988f33
CS-14622: fixed adding vlan range per account - associate it with the Guest network, not public
...
Conflicts:
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-04-24 11:44:00 -07:00
6857750566
bug CS-14593, CS-14541: fixed encryption issue
2012-04-23 15:29:38 +05:30
e04822eb70
bug CS-14530: Whenver adding a new capacity check the state of the resource - if its disabled/enabled.
...
Reviewed By: Kishan
2012-04-19 14:24:12 +05:30
cc4e4e69d8
CS-14341 Order of Compute offerings does not stick
...
resolved fixed
2012-04-12 17:26:09 -07:00
52539e798d
bug 14449: added logging to createVlanIpRange
...
status 14449: resolved fixed
2012-04-10 11:24:36 -07:00
c0130a5c41
Code cleanup for createVlanRange api
2012-04-04 15:03:04 -07:00
2f634c0913
Switch to Apache license
2012-04-03 04:50:05 -07:00
dc1af9e5f4
bug 14444: specifyVlan should always be false for the network offering of type Isolated supporting sourceNat service
...
status 14444: resolved fixed
2012-03-28 11:24:09 -07:00
4060be1842
bug 14445: automatically enable firewall service for VR when VR is a provider for PF/StaticNat services
...
status 14445: resolved fixed
reviewed-by: Sheng Yang
2012-03-22 14:17:15 -07:00
fec3a87d09
bug 14388: don't return console proxy / ssvm service offerings
...
status 14388: resolved fixed
2012-03-19 14:50:09 -07:00
ad1192e264
bug 14239: limit number of Isolated account specific networks per account
...
status 14239: resolved fixed
Conflicts:
api/src/com/cloud/api/commands/CreateNetworkCmd.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-03-12 15:53:30 -07:00
ecad50c801
bug 14151,14153: configuration variables are now hidden; added ldapRemove command
2012-03-12 16:50:00 +05:30
6910740582
Revert "bug 14151,14153: configuration variables are now hidden; added ldapRemove command"
...
Reverting the commit in order to fix the build
This reverts commit 0ab0fcfa5c3b8825b8a92e3c2d2dee8e8ca6152b.
2012-03-09 09:53:56 -08:00
b7b751fdf6
bug 14151,14153: configuration variables are now hidden; added ldapRemove command
2012-03-09 16:56:01 +05:30
65e160b7e6
bug 14173: add eip/elb network offering (if missing) during the management server start
...
status 14173: resolved fixed
2012-03-07 10:02:24 -08:00
25676aa3c6
bug 14017: 1) Don't allow NULL value for Boolean type of config 2) Added a null check when compare config values
...
status 14017: resolved fixed
2012-02-29 13:09:47 -08:00
6612744c61
bug 13971: return only offerings with matching tags when zoneId is passed in and corresponding zone has more than 1 physical network
...
status 13971: resolved fixed
Reviewed-by: Prachi Damle
2012-02-23 16:52:50 -08:00
836a063a9e
bug 13924: default Firewall provider to Juniper when Juniper is a provider for Pf/StaticNat or source nat service
...
status 13924: resolved fixed
reviewed-by: Will Chan
2012-02-22 18:46:04 -08:00
798accae10
Added isTagged parameter to listNetworkOfferings api. When set to true, it will return offerings with not null tag values
...
Reviewed-by: Jessica Wang
2012-02-22 16:09:35 -08:00
2e9511e2ae
Changed isElastic to isSystem for the publicIpAddress assigned during the vm deployment in EIP enabled network
...
Reviewed-by: Chiradeep
2012-02-21 15:39:49 -08:00
12b79da6c2
bug 13903: return vm's hostName as a displayName when displayName is null in bunch of api responses
...
status 13903: resolved fixed
Reviewed-by: Kelven Yang
2012-02-21 10:46:00 -08:00
4dea695e09
bug 13871: use perzone and peraccount (no spaces in values) when compare source nat capabilities
...
status 13871: resolved fixed
Reviewed-by: Chiradeep Vittal
2012-02-21 10:06:29 -08:00
50fc52ee9b
bug 13854: don't allow to remove network offerings if its in use by existing networks
...
status 13854: resolved fixed
Reviewed-by: Alex Huang
2012-02-17 12:58:54 -08:00
13f4d92d2a
bug 13813: fixed network offering search to use traffic type when locate physical network in the zone
...
status 13813: resolved fixed
Reviewed-by: Frank
2012-02-16 10:40:00 -08:00
26d272021f
Guest cidr is optional for Advance zone (zone can have just Shared networks)
2012-02-10 10:45:05 -08:00
18ec438793
Revert zone guest cidr setting
2012-02-08 15:54:16 -08:00
44c172bdc2
bug 12980: added trust store for ssl
2012-02-08 13:07:19 +05:30
ce26703e5c
Bug 13059: Make DB changes to list top consumed resources for enabled resources only. For this introdiuced a new state called capacity state in the op_host_capacity table and would be updated on every operation of zone pod cluster and host
...
Reviewed-By: Kishan
2012-02-07 20:53:25 +05:30
74f1a821a4
bug 13134: added encryption for ldap password
2012-02-06 16:31:58 +05:30
1490e45a1c
Fixed format style in a bunch of files (replaced tabs with spaces as a part of it)
2012-02-03 13:49:11 -08:00
879ab9a5cc
More logging to domain checker
2012-02-01 11:07:13 -08:00
07545236d7
bug 13381: fixed update availablity for network offering
...
status 13381: resolved fixed
2012-01-31 11:49:09 -08:00
cd56bf9f60
Only Virtual Router can be specified as a provider for the Firewall service
2012-01-30 15:26:43 -08:00
529d0706e1
SpecifyVlan should always be true for shared network offerings and for network offerings with specifyIpRanges=true
...
SpecifyIpRanges should always be true for Shared network offerings
2012-01-30 12:34:49 -08:00
8f2cf82b24
Bug 12996: Removed createConfiguration API command
...
Status 12996: resolved fixed
Reviewed-By: Nitin
2012-01-30 14:36:50 +05:30
c40a421eb6
Bug 13250 - Not able to start System Vms when 2 physical networks are configured
...
if admin didn't specify storage traffic type before enabling zone, create default
storage traffic type with the same configuration of mgmt traffic type.
UI need a warning to admin, will file another bug for this
status 13250: resolved fixed
2012-01-26 14:06:34 -08:00
03653b936e
NAAS Changes: Before enabling a Zone, Check if the zone has:
...
- For Advance zone, a physical Network with Public/Management trafficType
- For Basic zone, a physical Network with Management trafficType
2012-01-20 17:21:53 -08:00
8bcf30da85
bug 12869: more changes to NAAS feature
2012-01-20 14:16:30 -08:00
ff1e8413f1
1) Added StaticNat/Firewall/Lb capabilities to Netscaler element. Renamed it to "NetscalerElement" from NetscalerLoadBalancingElement as it serves more services now
...
2) Added elasticIp and elasticLb network capabilities. Provided support to create network offering with these capabilities.
3) Added one more default network offering having elasticip and elasticlb
4) Public network support to Basic zone. You can associate/disassociate IP addresses now
2012-01-19 13:56:59 -08:00
1e675f45ba
Bug 11593 - CIDR conflicts with zone when extending pod but not when creating it
...
Changes:
- Now we validate Pod's CIDR only against other Pod's CIDR. No need to validate against guest CIDR and
public vlan CIDR.
2012-01-18 11:33:49 -08:00
56b3561033
bug 12856: network offerings with services w/o providers support
...
status 12856: resolved fixed
2012-01-17 16:17:09 -08:00
189822da50
Bug 12592 - createZone: zone should be added in Disabled state
...
- Zone will be Disabled by default when created using createZone API
2012-01-17 14:56:21 -08:00
83400cd15f
bug 12776: if there are multiple objects involved in resource creation, verify that they belong to the same account
...
status 12776: resolved fixed
2012-01-17 13:40:37 -08:00
c87c3bc665
bug 12065: verify that provider supports service capability
...
status 12065: resolved fixed
2012-01-17 12:39:07 -08:00
bad573168e
Bug 12639: while logging events, hide value for configs containing password string in config name
...
Status 12639: resolved fixed
Reviewed-By: Nitin
Conflicts:
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
2012-01-17 15:45:00 +05:30
e6161ac502
bug 12979: anonymous searches now allowed
2012-01-16 20:03:00 +05:30
8a3a4ab9c0
bug 13096 Make capacity deletion for pod deletion more robust.
...
Reviewed by : Kishan.
2012-01-16 14:29:51 +05:30
b1c60b9d60
bug 12964: createPhysicalNetwork/addTrafficType is no longer a part of createZone API
2012-01-10 13:55:09 -08:00
4d82413a66
Remove the check against guest network when adding pod
...
Seems we don't want to do this.
2012-01-09 16:50:48 -08:00
5886109fb9
bug 12556: Check guest network cidr when add pod
2012-01-09 16:42:57 -08:00
861fdbee17
bug 12556: Add more CIDR checking when create network with specify CIDR
...
Pod and vlan creation have already got them.
status 12556: fixed resolved
2012-01-09 16:27:00 -08:00
adaea570e4
bug 12934: added name to physical network
...
status 12934: resolved fixed
2012-01-09 14:20:37 -08:00
90066f1c12
Remove conserve-mode restriction
...
Multiply provider can be used for conserve mode.
2012-01-06 13:44:19 -08:00
5e60228d2b
bug 12656: Add conserve mode for network offering
...
Conserve mode means, we can use same IP for different purposes, in order to
"conserve" ip resources. But in this offering, all the service providers should
be the same, and the network created from this offering may be prohibited from
update to different network offering whose services are provided by different
service providers - because different service providers would need different IPs
for different services.
If user want to update the "conserve mode" network with the network offering
that has different service providers, each public IP should have only one usage,
only them the update is allowed.
2012-01-05 21:08:23 -08:00
d4e0fbda83
bug 12686: added search by zoneId to the listNetworkOfferings
2012-01-04 12:31:59 -08:00
64a54f32a5
bug 12199: error message returned from API shouldn't include double quote. That's invalid JSON format.
2012-01-03 17:53:47 -08:00
812b4782a2
Bug 9237: Checking private ip range with public ip range overlap and viceversa while adding physical resources.
...
Reviwed by: Abhi
2011-12-28 12:11:34 +05:30
2d2505d449
bug 12322: SWIFT, update template_zone_ref after update template to swift
...
status 12322: resolved fixed
2011-12-21 11:20:38 -08:00
e2cb4f94d6
bug 12337: Encrypt only password in host_detail table. Removed unused and duplicate references of HostDetailDao
...
status 12337: resolved fixed
reviewed-by: Abhi
2011-12-20 19:28:41 +05:30
a2ed3fa5e2
bug 12337: encrypt Hidden category config values only
...
reviewed-by: Abhi
2011-12-20 15:07:22 +05:30
cfb48fb7b7
bug 12337: encrypt Hidden category config values only
2011-12-20 13:01:06 +05:30
4cb6fcc17a
bug 12591: fixed updateDomain
...
status 12591: resolved fixed
2011-12-16 11:54:47 -08:00
be696bd283
No guest vlan is requried when add public IP range
2011-12-15 14:56:32 -08:00
dac505194c
Changes to PhysicalNetworkTrafficType to accomodate the simulator hypervisor type
2011-12-15 19:12:21 +05:30
ab50f65ed8
bug 12483: Discard zone's cidr
...
status 12483: resolved fixed
2011-12-14 17:23:24 -08:00
f3cd93f835
bug 11899: Added events for Zone create, update and delete
...
status 11899: resolved fixed
reviewed-by: Nitin
2011-12-13 19:29:44 +05:30
3a94a41baf
bug 12305: drop max_connections from the network offering as this information is being set on network element level now
...
status 12305: resolved fixed
2011-12-09 09:00:08 -08:00
bde5e16a26
bug 12453: when networkId is specified, don't check if the network created from Required network offering is present
...
status 12453: resolved fixed
2011-12-08 14:38:21 -08:00
9c6a56a61b
Fixed NPE in createNetworkOffering with capabilities set
2011-12-06 14:59:32 -08:00
5def0bc567
bug 12129: Disable validation of router.stats.interval in the global configuration since it can have negative values.
...
Reviewed by : Kishan.
2011-12-06 18:35:03 +05:30
7b8287d323
bug 10804: Api and middle layer support for default route feature
2011-12-05 14:53:45 -08:00
974dc62a2b
added support for dynamic load balancer provisioning when netscaler SDX is added
2011-12-05 00:06:45 -08:00
e365e64afe
Fixing build. removing windows chars
2011-12-05 10:41:24 +05:30
c4f624e7c9
bug 8313: ldap authentication, still need to fix the MD5 encoded password, cuurent authenticator only works with plaintext password
2011-12-04 15:11:06 +05:30
7ea6082f22
PhysicalNetworkId is not required in listNetworkServiceProvider call
2011-11-29 10:47:03 -08:00
6e3cbaab6f
SecurityGroupProvider is added automatically in Disabled state during the zone creation
2011-11-29 10:13:02 -08:00
ecd7004f15
bug 11978: don't allow passing -, + and spaces for instance.name config param
...
status 11978: resolved fixed
2011-11-28 11:52:46 -08:00
102f460458
Fixed updateConfiguration - updateHostDetails used to swallow the exceptions
2011-11-28 11:52:45 -08:00
74f217e1d0
Introduced new parameter to listNetworkOfferings API - sourceNatEnabled (Boolean).
2011-11-22 10:54:29 -08:00
6dc4ae47db
Bug 12103: Adding host without labelling guest network fails
...
We do not set the default network labels as 'cloud-private' anymore. Instead it is set to the values set in global config variable. This should avoid the host connect failures requiring the network labels to be setup.
2011-11-21 14:46:02 -08:00
1871de3048
bug 11853: better error message when try to add VPN user with duplicated user name
...
status 11853: resolved fixed
2011-11-18 15:49:18 -08:00
5ea4133d7b
createNetworkOffering: verify that individual services can be enabled for each provider specified for the network offering
2011-11-18 14:46:10 -08:00
337c07c0d1
Default gateway service to sourceNat service in the API
2011-11-17 16:28:10 -08:00
339e72d414
Introduced "supportedServices" parameter to createNetworkOffering API. This parameter replaces old parameters: dhcpService, gatewayService, etc.
2011-11-16 11:17:07 -08:00
Alena Prokharchyk
Jason Bausewein
David Nalley
Jessica Wang
prachi
Abhi
Nitin Mehta
frank
Sheng Yang
kishan
Jessica Wang
Naredula Janardhana Reddy
anthony
Prasanna Santhanam
Murali Reddy