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
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
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
Alena Prokharchyk
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
Alena Prokharchyk
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
Jessica Wang
8712812ca7
cloudstack 3.0 API: CreateVpnGateway API, ListVpnGateways API: set object name for API response.
2012-07-20 16:49:17 -07:00
Alena Prokharchyk
9b4c578e0d
More logging on nic release
2012-07-20 16:44:24 -07:00
Chiradeep Vittal
308cb36066
Unnecessary INFO log cluttering up the logs. Also make logs more informative
2012-07-19 16:35:45 -07:00
Alena Prokharchyk
8e648e4a98
Fixed update endpointe.url global config var
2012-07-18 15:47:37 -07:00
Alena Prokharchyk
281b23c2cd
Fixed license headers
2012-07-18 14:52:13 -07:00
kishan
f2bbf62d9d
Added getUser API to get user details using API key. Services like S3 can user this API to authenticate. API is admin only.
2012-07-18 14:20:04 -07:00
Alena Prokharchyk
6ad2388c72
VPC: added one more default network offering for VPC - the one not having LB service
2012-07-17 17:46:17 -07:00
Alena Prokharchyk
519c4929bf
VPC: fixed listPublicIpAddresses for the addresses with NULL network_id
2012-07-17 17:12:00 -07:00
Alena Prokharchyk
d51719ddc3
Fixed unittest
2012-07-17 15:50:56 -07:00
Alena Prokharchyk
7c2b123d94
Merge branch 'master' into vpc
2012-07-16 15:43:16 -07:00
Alena Prokharchyk
097c260690
Resource tags: CS-15591 - delete tags for template/iso when corresponding vo object is removed
2012-07-16 15:43:06 -07:00
Alena Prokharchyk
47615a26b6
VPC: CS-15583 - hostName for the vm should be unique inside the network domain
2012-07-16 15:42:47 -07:00
Alena Prokharchyk
a3d4ee3d87
VPC: CS-15598 - update ipVO object after getting system ip as a part of elastic LB
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
2012-07-16 15:42:36 -07:00
Alena Prokharchyk
4a7149e6b5
VPC: CS-15580 - don't allow gateway for VPC guest network to be equal to the cidr subnet
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-07-13 17:09:16 -07:00
anthony
829acf6e27
CS-15551 : if 'xen.check.hvm' is false, don't check template hvm in allocator
2012-07-13 16:45:57 -07:00
Alena Prokharchyk
7a5efcc2e8
CS-15579 - perform check when account/domainId is passed to list call by the regular user
2012-07-13 15:59:15 -07:00
Alena Prokharchyk
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
Alena Prokharchyk
4dd71cb635
VPC: CS-15562 - get info about VR's guest networks from nics table
2012-07-13 13:35:18 -07:00
Alena Prokharchyk
534e6d4d80
VPC: CS-15564 - when send the rules to the backend, form the list of rules after the rules were marked with Revoke state
...
Conflicts:
server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
2012-07-13 13:35:06 -07:00
Alena Prokharchyk
d48d4c24e7
VPC: CS-15569/CS-15568 - release ip address from VPC when fail to enable static nat
...
Conflicts:
server/src/com/cloud/network/rules/RulesManagerImpl.java
2012-07-13 13:34:19 -07:00
Alena Prokharchyk
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
Alena Prokharchyk
1781f706f9
VPC: added forVpc parameter to listNetworks api call. If true, list networks not belonging to any vpc
2012-07-13 13:27:10 -07:00
Alena Prokharchyk
b475396438
VPC: CS-15550 - fixed listVPCs by cidr
...
Conflicts:
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-07-13 13:26:59 -07:00
Alena Prokharchyk
eb52f4a610
VPC: mark gateway with Deleting state when all static routes are gone
2012-07-13 13:26:04 -07:00
Alena Prokharchyk
5923659dba
VPC: CS-15548 - don't plug the nic for guest network to router when network not in Implemented state
2012-07-13 13:25:56 -07:00
Alena Prokharchyk
b15c2576a7
VPC: fixed listStaticRoutes when search by gatewayId
2012-07-13 13:25:47 -07:00
Alena Prokharchyk
a848ecae8b
VPC: fixed logging
2012-07-13 13:25:39 -07:00
Prasanna Santhanam
3d7f6a35ad
CS-15560 : Improve HVM logging of hosts
...
When a host is not considered for deployment because it has disabled HVM, then call that out in the logs for debugging.
Signed-off-by: Nitin Mehta<nitin.mehta@citrix.com>
2012-07-13 10:51:56 -07:00
Hugo Trippaers
79c7da07ab
Phase 1 of Nicira integration
2012-07-11 17:16:06 -07:00
Edison Su
8b7b838c8a
CS-15544: recreate router if router filesystem is crashed
2012-07-11 16:14:28 -07:00
Alena Prokharchyk
ef8208af00
Merge branch 'master' into vpc
2012-07-11 13:18:51 -07:00
Alena Prokharchyk
ab2669b01d
CS-15459: fixed listTags by resourceType
2012-07-11 12:08:34 -07:00
Alena Prokharchyk
7cb4ab5e60
VPC: added State to vpc_gateways
2012-07-11 12:05:42 -07:00
Alena Prokharchyk
d2e491a377
VPC: don't send staticRoutes in Revoke state to the VPC VR
2012-07-11 12:05:33 -07:00
Alena Prokharchyk
b407b3beaa
VPC: add vm to network - no need to prepare nic when add vm in Stopped state to the network; the nic will be prepared once the vm starts up
2012-07-10 18:07:45 -07:00
Alena Prokharchyk
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
Alena Prokharchyk
f59b935da5
VPC: CS-15519 - fixed ipAssoc when only zoneId parameter is passed in to the API call
...
Conflicts:
api/src/com/cloud/api/commands/AssociateIPAddrCmd.java
server/src/com/cloud/network/ExternalLoadBalancerUsageManagerImpl.java
2012-07-10 15:20:39 -07:00
Sheng Yang
ade3ae4e3c
CS-15512: Fix delete vpn connection
2012-07-10 14:47:50 -07:00
Alena Prokharchyk
c2f9417de4
VPC: CS-15345 - fixed regression in ipRelease happening as a part of cleanupNetworkResources method
2012-07-10 14:35:50 -07:00
Sheng Yang
94c62f2127
CS-15513: Fix group 5 of s2s vpn
...
Conflicts:
utils/test/com/cloud/utils/net/NetUtilsTest.java
2012-07-10 10:38:17 -07:00
Alena Prokharchyk
911ed25fbc
Merge branch 'master' into vpc
2012-07-09 18:31:28 -07:00
Alena Prokharchyk
c2134b431f
VPC: CS-15505 - allocate guest nics when new VR starts in VPC
2012-07-09 18:30:58 -07:00
Alena Prokharchyk
525ba472e8
VPC: CS-15481: don't allow creating networkACLs for overlapping cidrs/ports
2012-07-09 18:23:58 -07:00
Alena Prokharchyk
55db112990
CS-15503: don't send Ips in Releasing state as a part of VPC VR start
2012-07-09 18:23:50 -07:00
Alena Prokharchyk
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
Alena Prokharchyk
d52c6e2313
listPublicIpAddresses api: don't set associatedWithNetworkId if corresponding field is null in the DB
2012-07-09 18:13:32 -07:00
Alena Prokharchyk
10dcc117c3
VPC: CS-15486 - prepare public nic as a part of VR deployment
2012-07-09 18:12:54 -07:00
Deepti Dohare
29e90f8358
CS-15429: When an instance is created with data volume, account limit for this data volume was not checked against. Adding a check for that.
...
Signed-off-by: Nitin Mehta<nitin.mehta@citrix.com>
2012-07-10 06:02:30 +05:30
Alena Prokharchyk
84cdf2c28d
CS-15459: fixed listTags by resourceType
2012-07-09 14:59:58 -07:00
Alena Prokharchyk
a6086dc806
Removed @author tag from bunch of resources
2012-07-06 17:25:36 -07:00
Alena Prokharchyk
63d6941bdc
ResourceTags: respect tag parameter in listTemplates/listIsos commands
...
Conflicts:
server/src/com/cloud/storage/dao/VMTemplateDao.java
server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java
2012-07-06 16:59:14 -07:00
Alena Prokharchyk
5be0a3eeb1
VPC: fixed listNetworkACLs by networkId
...
Conflicts:
api/src/com/cloud/api/commands/ListNetworkACLsCmd.java
2012-07-06 16:43:39 -07:00
Alena Prokharchyk
c9eb0c59bf
VPC: allow adding private gateway to the VPC when the VR is in Stopped state
2012-07-06 15:28:07 -07:00
Alena Prokharchyk
818a3c72ac
VPC: CS-15485 - dont' create a record for VPC VR private gateway nic in router_network_ref; do it for regular guest networks only
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/vm/dao/DomainRouterDaoImpl.java
2012-07-06 14:57:26 -07:00
Alena Prokharchyk
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
Alena Prokharchyk
85677b71fe
Resource tags: CS-15473 - fixed delete/list by resourceId when UUID is specified as a value
...
Conflicts:
server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
server/src/com/cloud/network/vpc/Dao/StaticRouteDaoImpl.java
server/src/com/cloud/network/vpc/Dao/VpcDaoImpl.java
server/src/com/cloud/projects/dao/ProjectDaoImpl.java
2012-07-06 11:43:31 -07:00
Alena Prokharchyk
ec26e836fc
CS-15459: fixed listTags for userVms
2012-07-06 11:43:31 -07:00
Alena Prokharchyk
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
Alena Prokharchyk
7044fa695d
VPC: CS-15469: createNetworkACL - startPort is not accepted if protocol is ICMP
2012-07-06 11:11:36 -07:00
Alena Prokharchyk
e1fe1616d7
VPC: fixed CS-15465 - lb creation for ip not associated with any networks
2012-07-06 11:09:56 -07:00
Alena Prokharchyk
e19e26ec4e
VPC: don't fail when create/remove static route when VPC VR is in Stopped state
2012-07-06 11:09:15 -07:00
Alena Prokharchyk
b13acc6459
VPC: don't allow vm to be a part of more than one VPC
2012-07-06 11:09:06 -07:00
Alena Prokharchyk
d6774e6a86
VPC: don't allow vpcs for the same account with overlapping cidrs
2012-07-06 11:08:58 -07:00
Alena Prokharchyk
83f566cfe7
VPC: added "forVpc" (boolean) parameter to listRouters call - filter by the fact if router belongs to VPC or not
2012-07-06 11:08:48 -07:00
Alena Prokharchyk
234ae447ee
VPC: added field networkacl_service_provided to physical_network_service_providers table
2012-07-06 11:08:39 -07:00
Alena Prokharchyk
07eb6e3cf7
VPC: CS-15447 - fail vpc creation when vpc provider is not enabled at least in one physical network in the target zone
2012-07-06 11:08:28 -07:00
Alena Prokharchyk
b4fec75ff7
VPC: added dns1/dns2 + networkDomain to the list of bootload args passed on VPC VR start
2012-07-06 11:08:17 -07:00
Alena Prokharchyk
540ea34f57
VPC: removed NetworkACL interface; added getTrafficType() to Firewall
...
Conflicts:
server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
2012-07-06 11:08:00 -07:00
Alena Prokharchyk
0dfe603d48
VPC: createLB rule - removed duplicated check for ip services when createLB rule
...
Conflicts:
server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
2012-07-06 11:07:26 -07:00
Edison Su
27e9cdbece
add console proxy support for devcloud
2012-07-03 23:38:39 -07:00
Alena Prokharchyk
31f9d718fb
Merge branch 'master' into vpc
...
Conflicts:
server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
2012-07-03 17:32:50 -07:00
Alena Prokharchyk
f2078afbd8
VPC: added zoneName to the VPC api response
2012-07-03 17:28:20 -07:00
Alena Prokharchyk
07d478d836
VPC: CS-15426 - In Basic zone always pass control nic when prepare nics for the VR
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2012-07-03 17:27:46 -07:00
Vijayendra Bhamidipati
023c2e4f59
Encrypting password values that are stored in the cluster_details table
2012-07-03 17:27:21 -07:00
Alena Prokharchyk
5afa83abb6
VPC: CS-15355 - fixed router when deployVm in Basic zone
...
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2012-07-03 17:25:07 -07:00
Alena Prokharchyk
21d87f3fa5
VPC: fixed response tag for VpcRespnse
2012-07-03 17:23:50 -07:00
Alena Prokharchyk
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
Alena Prokharchyk
2b799aa9ac
VPC: added missing FirewallService to the VR provider
2012-07-03 17:22:41 -07:00
Alena Prokharchyk
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
Alena Prokharchyk
5d5b584a8e
VPC: remove network ACLs from VPC VR when shutdown guest network
2012-07-02 17:44:54 -07:00
Alena Prokharchyk
40a3482f13
VPC: multiple fixes:
...
* Separate service for NetworkACL - "NetworkACL" service
* allow having just one network supporting LB in the VPC
* perform check against VPC when upgrade network to the new network offering (the same set of checks when you add new network to the VPC)
2012-07-02 17:44:54 -07:00
Alena Prokharchyk
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
Alena Prokharchyk
b565f63e42
VPC: listPrivateGateways command is available for regular user too (he needs to know the gatewayId for the static route creation)
...
Conflicts:
api/src/com/cloud/api/ResponseGenerator.java
server/src/com/cloud/api/ApiResponseHelper.java
2012-07-02 17:44:28 -07:00
Alena Prokharchyk
1ee0c30935
VPC: added vpccidr to the list of VPC router bootload args
2012-07-02 17:44:27 -07:00
Alena Prokharchyk
2dc1a286f6
VPC: set networkId to be null for IP address when the last PF/LB rule is removed for it and the IP belongs to VPC
...
Conflicts:
server/src/com/cloud/network/rules/RulesManagerImpl.java
2012-07-02 17:44:27 -07:00
Sheng Yang
8d16d7f94f
Fix build after merge site to site vpn
2012-07-02 16:39:41 -07:00
Sheng Yang
5ee4b79688
CS-6840: Fix 0 id returned by createVpnConnection
2012-07-02 16:29:34 -07:00
Sheng Yang
1d97af3abf
CS-6840: Add status checking for site 2 site VPN
2012-07-02 16:29:23 -07:00
Sheng Yang
d9688f74ba
CS-6840: List all objects without require parameter
2012-07-02 16:29:10 -07:00
Sheng Yang
8d4079d477
CS-6840: Add hypervisor commands for site-to-site vpn
...
Conflicts:
plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
2012-07-02 16:28:44 -07:00
Sheng Yang
0ce1e78364
CS-6840: Add Site2SiteVpnServiceProvider
2012-07-02 16:27:09 -07:00
Sheng Yang
24c480f9e6
CS-6840: Add commands for site-to-site vpn
...
Conflicts:
api/src/com/cloud/api/BaseCmd.java
api/src/com/cloud/api/ResponseGenerator.java
client/tomcatconf/commands.properties.in
server/src/com/cloud/api/ApiResponseHelper.java
server/src/com/cloud/configuration/DefaultComponentLibrary.java
utils/test/com/cloud/utils/net/NetUtilsTest.java
2012-07-02 16:26:34 -07:00
Sheng Yang
9bb65b1126
CS-6840: Add data structure for site-to-site vpn tables
2012-07-02 16:20:58 -07:00
Deepti Dohare
c8bbf04c81
CS-15300: Domain Admin accounts now respect the limits imposed on the domain just as a regular account.
...
Signed-off-by: Nitin Mehta<nitin.mehta@citrix.com>
2012-07-03 04:35:53 +05:30
Jason Bausewein
0449ae37f1
CS-15274: Fix NPE on CreateVlanIpRangeCmd()
...
Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
2012-07-02 15:05:57 -07:00
Murali reddy
9876d34ea4
moving out ELB network element to plugins/network-elements/elastic-loadbalancer
2012-07-02 15:05:58 -07:00
Murali reddy
8aa2b55dd6
moving out NetApp code to plugins/file-systems/netapp
2012-07-02 08:34:02 -07:00
David Nalley
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
David Nalley
ae4b66283a
cleaning up some line endings
2012-07-02 09:50:28 -04:00
Wido den Hollander
1a2f354f4d
Remove message about contacting Cloud support.
...
CloudStack has gone Apache now.
2012-07-01 15:12:43 +02:00
Alena Prokharchyk
1f01d923ca
Merge branch 'master' into vpc
2012-06-28 17:44:08 -07:00
Alena Prokharchyk
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
Murali reddy
c41094154d
moving out OVS code to plugins/network-elements/ovs
2012-06-28 17:23:41 -07:00
Alena Prokharchyk
377b03acde
VPC: when add guest network to VPC, verify that the list of network services is within the list of services supported by VPC offering
2012-06-28 17:18:27 -07:00
Alena Prokharchyk
24772bcb4e
VPC: createPF/createLBrule: 1) don't allow to pass openFirewall=true 2) when no openFirewall is passed in, defaulted to false if the public ip belongs to VPC
2012-06-28 17:18:15 -07:00
Alena Prokharchyk
c19639e4a2
Static route can be created for generic VpcGateway now, not just Private gateway
2012-06-28 17:17:44 -07:00
Alena Prokharchyk
46b97cbf7d
VPC: update public IP info in domain_router table once the VR gets the public nic
2012-06-28 10:25:24 -07:00
Alena Prokharchyk
308fd39a73
VPC: delete network ACLs as a part of network cleanup
2012-06-28 10:18:23 -07:00
Alena Prokharchyk
b03265bc76
VPC: implemented vpc cleanup thread that cleans up Inactive VPCs (that were failed to delete)
2012-06-28 10:18:14 -07:00
Alena Prokharchyk
cec5012d5a
VPC: fixed ip addres assignment in createLB rule
2012-06-28 10:18:03 -07:00
Alena Prokharchyk
c8ec262dea
VPC: as there is no support for FirewallRules/remoteAccessVPN in the VPC, removed the networkId from the list of parameters for corresponding api calls
2012-06-28 10:17:53 -07:00
Alena Prokharchyk
5ecdad7399
VPC: don't generate empty SetStaticRoute command during VR start when there are no static routes for the VPC
...
Conflicts:
server/src/com/cloud/user/AccountManagerImpl.java
2012-06-28 10:17:34 -07:00
Alena Prokharchyk
09bd4e1725
VPC: fixed list public ips by vpcId
2012-06-28 10:16:22 -07:00
Alena Prokharchyk
42dac79e08
VPC: 1) Don't allow to delete private gateway when it has static routes assigned. Routes have to be removed first.
...
2) Re-apply static routes as a part of VPC VR start
2012-06-28 10:13:48 -07:00
Alena Prokharchyk
1140f081df
VPC: fixed getEntityOwnerId() in AssociateIpAddress command to return vpc owner if vpcId is passed in. Added action events for create/delete privateGateway/staticRoutes
2012-06-28 10:13:36 -07:00
Alena Prokharchyk
a78fcedb5e
VPC: added vpcId to SetStaticNatRule and CreateLoadBalancerConfig commands
...
Conflicts:
server/src/com/cloud/network/element/NetscalerElement.java
2012-06-28 10:13:19 -07:00
Alena Prokharchyk
1a232171eb
VPC: implementation for Add/delete/list StaticRoute. Agent implementation is yet to be done
2012-06-28 10:11:41 -07:00
Edison Su
5f6387e113
add clouddev
2012-06-27 23:28:34 -07:00
Jessica Wang
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
Murali reddy
8197f1f07c
moving out VMWAre and Nexus VSM support code into plugins/hypervisors/vmware
2012-06-26 19:48:55 -07:00
Murali reddy
550b22576f
Moving out XenServer support code into plugins/hypervisors/xen
2012-06-26 16:42:31 -07:00
Murali reddy
cefbbb3850
moving random storage allocator to plugins/storage-allocators
2012-06-26 15:17:25 -07:00
Murali reddy
3ceb8d5667
moving out plaintext authenticator to plugins/user-authenticators
2012-06-26 14:33:27 -07:00
Murali reddy
eb5e02e4e1
moving out MD5 authenticator to plugins/user-authenticators
2012-06-26 14:18:42 -07:00
Alena Prokharchyk
66e14e2627
Applied patch https://reviews.apache.org/r/5522/diff/
2012-06-25 21:19:48 -07:00
Alena Prokharchyk
ce876e24de
VPC: intermidiate checkin to Static Routes
...
Conflicts:
api/src/com/cloud/api/ApiConstants.java
2012-06-25 21:00:57 -07:00
Alena Prokharchyk
8be74c033f
VPC: update ip address object after the ip is associated with the network
2012-06-25 21:00:12 -07:00
Alena Prokharchyk
96c273ad55
VPC: finilize start for the VR - send ip assoc commands only after plug nic is done for all public nics
2012-06-25 21:00:00 -07:00
Alena Prokharchyk
d35eb73c9b
VPC: initial checkin for Static Routes
...
Conflicts:
api/src/com/cloud/api/ApiConstants.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2012-06-25 20:59:33 -07:00
Alena Prokharchyk
83ed35f06b
VPC: Don't allow to do ip assoc to the network in the VPC. The ip should be assigned to the VPC itself
2012-06-25 20:58:00 -07:00
Alena Prokharchyk
b770c8b979
VPC: moved NetworkACL manager to the vpc folder
2012-06-25 20:57:50 -07:00
Alena Prokharchyk
4e7b65ef71
VPC: CS-15354 - fixed updateNetworkServiceProvider for VpcVirtualRouter
2012-06-25 20:57:37 -07:00
Alena Prokharchyk
dc04e0b2e5
VPC: listPrivateGateways API implementation
2012-06-25 20:57:09 -07:00
Alena Prokharchyk
d3ccc3a7de
VPC: fixed NPE in network ACL delete (ip address is null for the rule of this type_
2012-06-25 20:55:37 -07:00
Alena Prokharchyk
030458a37b
VPC: implemented add/delete Private gateway
...
Conflicts:
client/tomcatconf/commands.properties.in
server/src/com/cloud/api/ApiResponseHelper.java
server/src/com/cloud/dc/DataCenterVO.java
server/src/com/cloud/network/NetworkManagerImpl.java
2012-06-25 20:54:14 -07:00
Alena Prokharchyk
300110931c
VPC: apply dhcp entries only after all guest nics are plugged
...
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2012-06-25 20:51:09 -07:00
Alena Prokharchyk
1b1e52ddb0
VPC: apply firewall ACLs as a part of VPC router start/restart and VPC network implement
...
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
2012-06-25 20:47:29 -07:00
Murali reddy
1a6102be1e
moving LDAP authenticator to plugins/user-authenticators/ldap
2012-06-25 19:30:00 -07:00
Murali reddy
974ad65b01
moving out random host allocator to plugins/host-allocators/random/
2012-06-25 18:47:47 -07:00
Murali reddy
621f2447bb
Moved out user concentrated pod deployment planner to plugins/deployment-planners/user-concentrated-pod
2012-06-25 17:58:45 -07:00
Murali reddy
392ae5cb13
moving out Srx code into Plugins/network-elements
2012-06-25 16:55:53 -07:00
Murali reddy
422c4ce513
moving out F5 code from server into plugins/network-elements/f5/
2012-06-23 14:16:59 -07:00
Vijayendra Bhamidipati
361ca9643d
CS-15173: Additional Cluster is allowed to add with the same VSM IPaddress as the previous cluster
...
Description:
Restricting association of a Cisco Nexus VSM to a single
cluster.
2012-06-22 13:31:56 -07:00
Murali reddy
49b88472a5
moving out NetScaler network element code from CloudStack core into plugins/network-elements/netscaler
2012-06-21 18:57:18 -07:00
Sheng Yang
ae32736151
Fix compile-tests
2012-06-21 12:25:06 -07:00
Alena Prokharchyk
887970690b
Added NicTO to SetSourceNat command, CreateLoadBalancerConfigCommand, SetNetworkACLCommand
2012-06-21 10:02:33 -07:00
Wido den Hollander
85fc31ec7f
Make the update proces of the SystemVM SSH keys more reliable.
...
On systems where sudo is used "echo ~" might return the homedirectory from the user who executed the sudo command.
By specifically using "echo ~username" we make sure we get back the correct homedirectory.
The same story goes for when updating the key on disk.
2012-06-21 11:56:54 +02:00
Alena Prokharchyk
ccec9192a2
VPC: implemented delete and list Network ACL(s)
2012-06-20 17:20:04 -07:00
Alena Prokharchyk
374a600746
VPC: initial checkin for network ACLs
...
Conflicts:
client/tomcatconf/commands.properties.in
2012-06-20 17:19:49 -07:00
Alena Prokharchyk
7fda6306b8
VPC: fixed user vm start in case when Implemented network existed w/o VR (it was expunged with DestroyRouter command)
2012-06-20 17:19:17 -07:00
Alena Prokharchyk
d2abc0e275
canUseForDeploy is always false for system networks
2012-06-20 15:45:14 -07:00
Alena Prokharchyk
55a12582b4
Completed API / Management server code for Resource tags feature. UI is yet to be done
2012-06-20 15:45:08 -07:00
Alena Prokharchyk
62d45b9670
Initial checkin for resource tags feature
...
Conflicts:
api/src/com/cloud/api/ApiConstants.java
client/tomcatconf/commands.properties.in
server/src/com/cloud/api/ApiDBUtils.java
server/src/com/cloud/uuididentity/dao/IdentityDao.java
server/src/com/cloud/uuididentity/dao/IdentityDaoImpl.java
setup/db/create-schema.sql
2012-06-20 15:45:08 -07:00
Wido den Hollander
bc94948e06
agent: Set the listen addr of a VM specificly to the private IP of a host
...
Now users have to modify their /etc/libvirt/qemu.conf vnc_listen, this is not needed anymore
2012-06-20 15:29:26 +02:00
Alex Huang
e2a32ab4f7
Introduced plugins directory.
...
Moved ovm into plugins.
Introduced build.xml for ovm.
2012-06-19 18:27:09 -07:00
Deepti Dohare
e0860d5a48
CS-14345 Fixing for Login API also.
...
Signed-off-by: Deepti Dohare <deepti.dohare@citrix.com>
2012-06-19 23:07:31 +05:30
Alena Prokharchyk
19f648f1aa
VPC: plug guest nic on guest network implement, and unplug on shutdown
...
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2012-06-19 10:09:46 -07:00
Alena Prokharchyk
89d7e54732
Network usage for VPC implementation
...
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2012-06-19 10:08:03 -07:00
Alena Prokharchyk
214782cc8c
Don't send public/guest nic info when start VR in VPC
...
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2012-06-19 10:05:06 -07:00
unknown
fc9a656b97
CS-14345 Logout API is not returning XML header
...
Signed-off-by: Deepti Dohare <deepti.dohare@citrix.com>
2012-06-19 14:26:18 +05:30
U-CITRITE\\koushikd
817595daf8
Fix bug CS-15261 In case IP address is passed to deployVirtualMachine API, the default property on NIC was not getting set and as a result there was a failure down the line and VM creation was failing.
...
Signed-off-by: U-CITRITE\koushikd <koushikd@banlkoushikd01.citrite.net>
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2012-06-19 06:53:43 +01:00
Sheng Yang
590b2332de
Don't need to check guest cidr overlap
...
It's not external devices, so guest network with different vlan can be the same.
2012-06-18 16:06:14 -07:00
saksham
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
Alena Prokharchyk
810151586b
1) Allow having multiple shared networks with the same vlan
...
2) Added new parameter to listNetworks command - canUseForDeploy(boolean). When true, list only networks that can be used for vm deployment (networks have enough ip addresses to allocate from for the vm)
Conflicts:
api/src/com/cloud/api/ApiConstants.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/IPAddressDao.java
2012-06-15 16:47:13 -07:00
Alena Prokharchyk
38215583ea
Fixed lock problem when add vm to guest network
2012-06-15 14:33:32 -07:00
Alena Prokharchyk
9ae62d32cd
Isolated non-vpc networks: start router with 3 nics from the very beginning
2012-06-15 14:33:14 -07:00
Alena Prokharchyk
b3985a3b48
Added new capabilities to VPN and Firewall services defining if VPN is S2S or Remote access, and if the Firewall rules should be created per cidr or per public ip address
2012-06-15 14:33:06 -07:00
anthony
e69561b857
VPC : revert some change
2012-06-15 14:32:47 -07:00
Alena Prokharchyk
3e5f391c85
VPC: more changes to ipAssoc
2012-06-15 14:32:39 -07:00
Alena Prokharchyk
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
Alena Prokharchyk
c82885021b
More logging to plug nic code
2012-06-15 14:27:49 -07:00
Alena Prokharchyk
aa2b7d2d8c
VPC: fixed guest network shutdown
2012-06-15 14:27:42 -07:00
Alena Prokharchyk
39422a3138
Release acquired lock for VPC
2012-06-15 14:27:33 -07:00
Alena Prokharchyk
7e119e4c94
Fixed addDhcpEntry/userdata/password in VPC setup
2012-06-15 14:27:24 -07:00
Alena Prokharchyk
aa84256542
1) Added VpcVirtualNetworkApplianceService interface
...
2) Pass dns1/dns2 to setupGuestNetworkCommand
3) Network implement - don't get source nat ip address for Vpc if it already has one
2012-06-15 14:27:00 -07:00
Alena Prokharchyk
d70d2f82d4
StartRouter: set only control nic during the initial router start; plug exising public and guest nics after the router is started with control nic
2012-06-15 14:25:31 -07:00
anthony
973ccdaf4b
VPC : pass netmask once for secondary storage VM
2012-06-15 14:23:51 -07:00
Alena Prokharchyk
31b8f07bb5
Added NicTO to setupGuestNetworkCommand constructor - we need this info for guest network configuraiton
2012-06-15 14:22:40 -07:00
Alena Prokharchyk
72974831a0
Modified virtual router startup procedure - initial start happens with control nic only; then we plug Public and then Guest nic to it
2012-06-15 14:22:19 -07:00
Alena Prokharchyk
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
anthony
396fa72ee3
1. move control network to eth0 on domr
...
2. if it is basic mode, use guest NIC as Control NIC
2012-06-15 14:18:38 -07:00
Alena Prokharchyk
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
Alena Prokharchyk
c56998e876
Support for IPAssoc inside VPC
2012-06-15 14:10:33 -07:00
Alena Prokharchyk
1189e92708
Destroy VPC if it fails to start during the deployment
2012-06-15 14:10:22 -07:00
Alena Prokharchyk
9ec8526281
1) Added VPC restart support - new api command RestartVPC. The purpose of the call is to shutdown and start VPC including VPCVirtualRouter restart, rules re-implement, etc
...
2) Only networks created from offerings with conserveMode=false, can participate in VPC
2012-06-15 14:10:09 -07:00
Alena Prokharchyk
b9a4e79277
1) Added search by vpcId to listRouters/listNetworks Apis
...
2) Don't allow to add new networks/implement existing ones for VPC in Disabled state. Disabled state indicates that there was unsuccessful attempt to remove the VPC, and the further cleanup will be taken care of by cleanup thread.
Conflicts:
server/src/com/cloud/network/dao/IPAddressDao.java
server/src/com/cloud/server/ManagementServerImpl.java
2012-06-15 14:09:37 -07:00
Alena Prokharchyk
d5507e1379
Support for delete VPC
2012-06-15 14:08:26 -07:00