3cf13c8b7c
Fixed unittest
...
Conflicts:
server/test/com/cloud/vpc/VpcApiUnitTest.java
2012-08-08 19:00:08 -07:00
bda1e2d08d
VPC: more unittests for VpcService
...
Conflicts:
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-08-07 11:37:36 -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
0e0b75a041
Merge branch 'master' into vpc
...
Conflicts:
api/src/com/cloud/api/ApiConstants.java
2012-08-02 18:45:37 -07:00
e116c24989
Removed obsolete file SearchCriteria2Test.java which caused ant unittest
...
to fail.
cleanup.sql cleans up CLOUD and CLOUD_USAGE databases which are required
by many unit-testcases.
RB: https://reviews.apache.org/r/6283/diff/3/
Send-by: saksham.srivastava@citrix.com
2012-08-02 10:33:06 -07:00
7cceaae912
VPC: moved vpc related code from NetworkManager to VpcManager
...
Conflicts:
api/src/com/cloud/api/commands/AssociateIPAddrCmd.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/src/com/cloud/network/vpc/VpcManagerImpl.java
server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-08-01 18:45:06 -07:00
7706a9c32f
Merge branch 'master' into vpc
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/rules/RulesManagerImpl.java
2012-07-31 13:37:28 -07:00
7026822e20
Fixed unittest build failure
2012-07-30 15:15:47 +05:30
110903a91a
VPC: added vif info to ipassoc command
...
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/vm/VirtualMachineManagerImpl.java
server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-07-27 13:53:41 -07:00
6420ecbd6f
Merge branch 'master' into vpc
...
Conflicts:
server/src/com/cloud/server/ManagementServerImpl.java
2012-07-24 16:13:06 -07:00
c99b1d104a
Fixed broken unittest
2012-07-24 10:30:39 -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
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
d51719ddc3
Fixed unittest
2012-07-17 15:50:56 -07:00
a1acfd3bfa
Merge branch 'master' into vpc
...
Conflicts:
api/src/com/cloud/api/ApiConstants.java
api/src/com/cloud/network/Network.java
client/tomcatconf/components.xml.in
plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
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/network/guru/GuestNetworkGuru.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
setup/db/create-schema.sql
2012-07-13 13:52:58 -07:00
ad80f426a0
VPC: CS-15553 and CS-15549 - more checks during automatic ip assoc to VPC network
...
Conflicts:
api/src/com/cloud/api/commands/CreateLoadBalancerRuleCmd.java
server/src/com/cloud/network/firewall/FirewallManagerImpl.java
server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
server/src/com/cloud/network/rules/RulesManagerImpl.java
2012-07-13 13:32:14 -07:00
8b7b838c8a
CS-15544: recreate router if router filesystem is crashed
2012-07-11 16:14:28 -07:00
697aa4589b
VPC: unplugNic - release the nic in the DB only after the command is executed succesfully on the backend
...
Conflicts:
api/src/com/cloud/agent/api/routing/SetStaticRouteCommand.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-07-10 18:07:09 -07:00
21519070fc
VPC: added vpc_id to private_ip_address table to indicate which vpc the ip belongs to
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/vpc/VpcManager.java
server/src/com/cloud/vm/VirtualMachineManagerImpl.java
server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-07-09 18:23:35 -07:00
10dcc117c3
VPC: CS-15486 - prepare public nic as a part of VR deployment
2012-07-09 18:12:54 -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
7acf8585b1
Resource tags: 1) Remove tag records when correspdonding cloudStack object gets removed
...
2) added "tags" request parameter to the banch of list* Api commands (listVirtualMachines, listSnapshots - all commands are listed in the resource tags functional spec)
Conflicts:
api/src/com/cloud/api/commands/ListFirewallRulesCmd.java
api/src/com/cloud/api/commands/ListPortForwardingRulesCmd.java
api/src/com/cloud/api/commands/ListPublicIpAddressesCmd.java
api/src/com/cloud/api/commands/ListSecurityGroupsCmd.java
api/src/com/cloud/api/commands/ListSnapshotsCmd.java
api/src/com/cloud/api/commands/ListVolumesCmd.java
api/src/com/cloud/api/response/FirewallResponse.java
api/src/com/cloud/api/response/IPAddressResponse.java
api/src/com/cloud/api/response/VolumeResponse.java
server/src/com/cloud/api/ApiDBUtils.java
server/src/com/cloud/api/ApiResponseHelper.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
server/src/com/cloud/network/security/dao/SecurityGroupDaoImpl.java
server/src/com/cloud/server/ManagementServerImpl.java
server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java
server/src/com/cloud/vm/dao/UserVmDaoImpl.java
2012-07-06 11:43:31 -07:00
31f9d718fb
Merge branch 'master' into vpc
...
Conflicts:
server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
2012-07-03 17:32:50 -07:00
580261119c
VPC: corrected the name for PublicIp interface (mistakenly renamed it as a part of previous checkin)
...
Conflicts:
server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-07-02 17:44:54 -07:00
183633cf70
VPC: createPrivateGateway - consists of plug nic + ipassoc (no setsource nat is needed)
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-07-02 17:44:54 -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
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
8be74c033f
VPC: update ip address object after the ip is associated with the network
2012-06-25 21:00:12 -07:00
ae32736151
Fix compile-tests
2012-06-21 12:25:06 -07:00
f6d16d0ab5
CS-15018: Event USER.LOGIN should contain the client IP address. Changes made in accordance with the coding convention.
...
Reviewed-by: Alena Prokharchyk
2012-06-18 10:18:30 -07:00
982562b9fb
VPC: ipAssoc consists of 3 parts: plug nic (if needed), associateIp, enableSourceNat(if ip is source nat ip)
...
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2012-06-15 14:31:58 -07:00
7e119e4c94
Fixed addDhcpEntry/userdata/password in VPC setup
2012-06-15 14:27:24 -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
c56998e876
Support for IPAssoc inside VPC
2012-06-15 14:10:33 -07:00
f28cefc4c3
Added support for network shutdown in VPC guest networks
2012-06-15 14:07:59 -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
ab680bc30c
Start Virtual Router as a part of VPC start
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
2012-06-15 13:57:00 -07:00
7092532ae8
CS-15220: fixed db upgrade for networks using external devices
...
Reviewed-by: Sheng Yang
Conflicts:
server/test/com/cloud/network/MockNetworkManagerImpl.java
Conflicts:
server/src/com/cloud/upgrade/dao/Upgrade2214to30.java
2012-06-05 15:10:49 -07:00
c59d5415ad
CS-9919 Support for Nexus Swiches (Cisco Vswitches)
...
Description:
Portprofile shaping policies will be fetched
from nexus vswitch instead of vcenter.
ACLs and Policies won't be synced to vCenter.
Get physical network label while adding cluster.
Cleanup.
Conflicts:
core/src/com/cloud/hypervisor/vmware/manager/VmwareManager.java
server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-05-25 17:44:02 -07:00
d11dceaccc
CS-14904
...
Fixed the bug where vm_instance.ha_enabled wasn't updated during service offering upgrade
Conflicts:
server/src/com/cloud/server/ManagementServerImpl.java
2012-05-15 12:36:40 -07:00
2bf0c7f7ff
CS-14605: OVS cleanup
...
Fix syntax errors in ConfigurationManager and Resource Manager test
2012-04-25 10:53:41 +01: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
59436be4ee
fixing line endings in server
2012-04-07 20:13:10 -04:00
2d1a6b0b35
bug 14615: deployVm can work 2 diff ways now: 1) Default way - create and start the vm. 2) Create the vm without starting it. Note that vm's volumes stay in Allocated state -not created on the backend till the point where vm starts
...
status 14615: resolved fixed
2012-04-06 11:30:48 -07:00
1dc99a17eb
Fixed unittest
2012-04-04 16:13:51 -07:00
2f634c0913
Switch to Apache license
2012-04-03 04:50:05 -07:00
0f34744c9e
bug 14301: Decouple synchronized crosss management server call with clustering transport. Reviewed-by: Kelven
2012-03-27 16:01:54 -07:00
ce8e9a9f51
bug 14500: set default value for is_system field as a part of 3.0 to 3.0.1 upgrade
...
status 14500: resolved fixed
reviwed-by: Frank Zhang
Conflicts:
server/test/com/cloud/network/MockNetworkManagerImpl.java
setup/db/db/schema-30to301.sql
2012-03-26 10:27:15 -07:00
3773b52b2f
add cleanup.sql to DB upgrade test
2012-03-19 14:36:57 -07:00
c01ed2f754
Added upgrade path from 3.0.x to 3.0.1
2012-03-19 13:38:38 -07:00
ea007f833f
use fake.sql for db upgrade test
2012-03-19 13:06:43 -07:00
4f741c833c
bug 14170: issues #1-#3 are fixed
2012-03-07 13:37:16 -08:00
637b228130
Bug 14081: Added 3.0.0 templtae upgrade support. Added unit test case and DB dump
...
Status 14081: resolved fixed
Reviewed-By: Abhi
2012-03-05 17:25:38 +05:30
fa0e25d146
bug 14080: do EQ instead of LIKE search when search for duplicated users during the user update
...
status 14080: resolved fixed
2012-03-01 15:11:46 -08:00
5aade501dc
fix merge conflicts
2012-02-28 17:06:23 -08:00
52ebf15e7c
Console proxy refactoring incremental check-in - new VNC protocol implementation
2012-02-28 17:03:38 -08:00
2eaefc4aa8
Fixed unittest and some issues with 2.2.14-3.0 upgrade
2012-02-28 15:17:14 -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
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
3a37ab6772
bug 13715: Modify changeCidr parameter of updateNetwork API
...
We expect user to use following sequence when update virtual router provided
network offering to external firewall devices offering:
1. Shutdown all the user VMs.
2. Modify network to new offering.
3. Click "Allow CIDR change" in the pop-up dialog, which would pass
changeCidr=true to the updateNetwork API.
We would shutdown guest network before we update the network for new
offering(with changeCidr = true), in order to re-implement the network.
status 13715: resolved fixed
Reviewed-by: Alex
2012-02-14 19:34:23 -08:00
5e9a15c07d
bug 13708: make a search by traffic type when locate physical network in the zone
...
status 13708: resolved fixed
reviewed-by: Prachi Damle
2012-02-14 12:47:33 -08:00
d0e63bc377
Bug 13099 - table physical-network-traffic-types needs to be updated when xen network device setting is modified in the global settings
...
Changes:
- DB upgrade changes
-- make the global setting hidden.
-- During upgrade set network labels from global config
2012-02-07 18:41:29 -08:00
cad392cd68
bug 13335: fixed listProjectInvitations by projectId
...
status 13335: resolved fixed
2012-02-07 13:16:27 -08:00
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
78f6fc9e43
bug 12361: Inermediate checkin to 2.2.14-3.0 db upgrade
2012-02-01 16:46:56 -08:00
2f17d465dc
Fixed 2.2.14-3.0 db upgrade for usage
...
Added unittest as well
2012-02-01 13:33:53 -08:00
9219d4c41d
bug 12361: more fixes to DB upgrade for network_offerings table
...
Added unittest for testing network offerings db upgrade
2012-01-30 11:20:13 -08:00
8eed9004cd
Fixed broken unittest
2012-01-27 14:44:34 -08:00
6325d21c50
Get new elasticIp when releaseIpAddress is called for elasticIP of the vm
2012-01-19 13:58:35 -08:00
a8758d292e
ElasticLB support in Basic zone.
...
When elb capability is enabled on the network offering, we:
1) on each createLB command:
* associate ip address to the LB rule owner
* create LB rule
2) on each deleteLb command:
* delete the rule
* disassociate ip address
The rule belongs to the owner, so proper usage events are generated
2012-01-19 13:57:37 -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
f0c4980dff
bug 13110: use Ternary data structure when build search criteria
...
status 13110: resolved fixed
2012-01-16 14:15:28 -08:00
804cfaec46
Fix some testcases
2012-01-11 13:51:43 -08:00
adaea570e4
bug 12934: added name to physical network
...
status 12934: resolved fixed
2012-01-09 14:20:37 -08:00
c581506103
bug 12306: list* command revamp
2012-01-09 10:07:42 -08:00
89ca2fe48e
bug 12656: Add restriction for network update and new rules
...
status 12656: resolved fixed
2012-01-05 21:08:41 -08:00
d4e0fbda83
bug 12686: added search by zoneId to the listNetworkOfferings
2012-01-04 12:31:59 -08:00
ba1f21c29e
Unittest for db upgrade
2011-12-28 10:34:29 -08:00
6fd49a265c
Fixed unittest
2011-12-27 15:34:54 -08:00
ceb0a918a1
createTemplate/createSnapshot for project - allow to execute for Projects in Active state only
2011-12-19 16:20:40 -08:00
dac505194c
Changes to PhysicalNetworkTrafficType to accomodate the simulator hypervisor type
2011-12-15 19:12:21 +05:30
bab29c4207
Bug 12361 DB upgrade from 2.2 to Acton
...
- Changes to schema file schema-2214to30.sql: moved out cleanup to separate file, added some NAAS changes
- Added physicalNetwork setup to Upgrade2214to30.java data migration
- Unit test and sample file
2011-12-10 00:01:15 +05:30
7b8287d323
bug 10804: Api and middle layer support for default route feature
2011-12-05 14:53:45 -08:00
a4773b7080
bug 12291: listVms - show non-project resources only if no projectId specified
...
status 12291: resolved fixed
2011-12-02 15:17:50 -08:00
0effb82f82
bug 12295: fixed associateIpAddress for projects
...
status 12295: resolved fixed
2011-12-02 12:08:01 -08:00
554946fe8b
Allow networkDomain update for Shared networks
2011-11-30 10:34:58 -08:00
c2448b7bd4
list Providers by name and state
2011-11-29 09:59:43 -08:00
102f460458
Fixed updateConfiguration - updateHostDetails used to swallow the exceptions
2011-11-28 11:52:45 -08:00
00f6738e24
bug 12105: don't generate corresponding firewall rule for the pf/staticNat/lb rule in revoke state
...
Conflicts:
server/test/com/cloud/network/MockNetworkManagerImpl.java
server/test/com/cloud/user/MockAccountManagerImpl.java
server/test/com/cloud/vm/MockUserVmManagerImpl.java
2011-11-21 16:34:55 -08:00
337c07c0d1
Default gateway service to sourceNat service in the API
2011-11-17 16:28:10 -08:00
0a10e32d69
Fixed test client
2011-11-17 16:25:54 -08:00
5571afa471
Virtual router elements: prepare nics only when VirtualRouter is a provider for at least one service in the network
2011-11-17 14:33:22 -08:00
0bb325ac12
Call implement() and shutdown() methods for providers only when the provider serves a service for the network
2011-11-17 13:53:53 -08:00
790b33bdfc
More validation to network and network offering creation/upgrade
2011-11-16 14:53:38 -08:00
450b19532a
Fixed unit test
2011-11-16 13:20:53 -08:00
bb2a8cf7ea
NaaS: added "subdomainAccess" parameter to domain level network object. The parameter defines whether the network can be accessed from the subdomains. If the parameter is not specified, it would be defaulted to allow.subdomain.network.access Global Config param
2011-11-14 18:13:47 -08:00
Alena Prokharchyk
Edison Su
kishan
David Nalley
Sheng Yang
saksham
Sateesh Chodapuneedi
Salvatore Orlando
frank
Kelven Yang
Sheng Yang
prachi
Prasanna Santhanam