You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2015/03/17 11:26:52 UTC
[50/50] git commit: updated refs/heads/master to 3c429ee
Merge remote-tracking branch 'sbp/feature/persisten-systemvm-redundant-vpc-REBASE'
This closes #118
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3c429ee6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3c429ee6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3c429ee6
Branch: refs/heads/master
Commit: 3c429ee6b5e7dc2dc948c837aa53f554f1c40d9c
Parents: 83736ab 23c100d
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Tue Mar 17 15:44:40 2015 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Tue Mar 17 15:44:57 2015 +0530
----------------------------------------------------------------------
.gitignore | 8 +-
api/src/com/cloud/network/Network.java | 2 +
api/src/com/cloud/network/NetworkProfile.java | 11 +-
.../VpcVirtualNetworkApplianceService.java | 4 +-
api/src/com/cloud/network/vpc/Vpc.java | 2 +
api/src/com/cloud/network/vpc/VpcOffering.java | 4 +
api/src/com/cloud/network/vpc/VpcService.java | 14 +-
.../org/apache/cloudstack/api/ApiConstants.java | 4 +-
.../api/command/user/vpc/RestartVPCCmd.java | 37 +-
.../cloudstack/api/response/VpcResponse.java | 56 +-
.../classes/resources/messages.properties | 3 +
.../classes/resources/messages_de_DE.properties | 1 +
.../classes/resources/messages_es.properties | 1 +
.../classes/resources/messages_fr_FR.properties | 1 +
.../classes/resources/messages_it_IT.properties | 1 +
.../classes/resources/messages_ja_JP.properties | 1 +
.../classes/resources/messages_ko_KR.properties | 1 +
.../classes/resources/messages_nb_NO.properties | 3 +
.../classes/resources/messages_nl_NL.properties | 5 +-
.../classes/resources/messages_pl.properties | 1 +
.../classes/resources/messages_pt_BR.properties | 7 +-
.../classes/resources/messages_ru_RU.properties | 3 +
.../classes/resources/messages_zh_CN.properties | 1 +
client/pom.xml | 31 +-
.../api/routing/NetworkElementCommand.java | 10 +-
.../api/routing/SetStaticRouteCommand.java | 14 +-
.../resource/virtualnetwork/ConfigHelper.java | 719 ----
.../resource/virtualnetwork/FileConfigItem.java | 10 +
.../virtualnetwork/ScriptConfigItem.java | 10 +
.../resource/virtualnetwork/VRScripts.java | 89 +-
.../virtualnetwork/VirtualRoutingResource.java | 19 +-
.../facade/AbstractConfigItemFacade.java | 120 +
.../facade/BumpUpPriorityConfigItem.java | 39 +
.../facade/CreateIpAliasConfigItem.java | 57 +
.../facade/DeleteIpAliasConfigItem.java | 64 +
.../facade/DhcpEntryConfigItem.java | 49 +
.../facade/DnsMasqConfigItem.java | 56 +
.../facade/IpAssociationConfigItem.java | 59 +
.../facade/LoadBalancerConfigItem.java | 74 +
.../facade/RemoteAccessVpnConfigItem.java | 48 +
.../facade/SavePasswordConfigItem.java | 47 +
.../facade/SetFirewallRulesConfigItem.java | 58 +
.../facade/SetGuestNetworkConfigItem.java | 68 +
.../facade/SetMonitorServiceConfigItem.java | 47 +
.../facade/SetNetworkAclConfigItem.java | 107 +
.../SetPortForwardingRulesConfigItem.java | 59 +
.../SetPortForwardingRulesVpcConfigItem.java | 33 +
.../facade/SetSourceNatConfigItem.java | 54 +
.../facade/SetStaticNatRulesConfigItem.java | 56 +
.../facade/SetStaticRouteConfigItem.java | 61 +
.../facade/Site2SiteVpnConfigItem.java | 49 +
.../virtualnetwork/facade/VmDataConfigItem.java | 48 +
.../facade/VpnUsersConfigItem.java | 54 +
.../resource/virtualnetwork/model/AclRule.java | 60 +
.../virtualnetwork/model/AllAclRule.java | 33 +
.../virtualnetwork/model/ConfigBase.java | 60 +
.../virtualnetwork/model/DhcpConfig.java | 45 +
.../virtualnetwork/model/DhcpConfigEntry.java | 72 +
.../virtualnetwork/model/FirewallRule.java | 175 +
.../virtualnetwork/model/FirewallRules.java | 42 +
.../virtualnetwork/model/ForwardingRule.java | 91 +
.../virtualnetwork/model/ForwardingRules.java | 42 +
.../virtualnetwork/model/GuestNetwork.java | 122 +
.../virtualnetwork/model/IcmpAclRule.java | 53 +
.../virtualnetwork/model/IpAddress.java | 134 +
.../virtualnetwork/model/IpAddressAlias.java | 72 +
.../virtualnetwork/model/IpAliases.java | 44 +
.../virtualnetwork/model/IpAssociation.java | 42 +
.../virtualnetwork/model/LoadBalancerRule.java | 104 +
.../virtualnetwork/model/LoadBalancerRules.java | 43 +
.../virtualnetwork/model/MonitorService.java | 52 +
.../virtualnetwork/model/NetworkACL.java | 102 +
.../virtualnetwork/model/ProtocolAclRule.java | 43 +
.../virtualnetwork/model/RemoteAccessVpn.java | 98 +
.../virtualnetwork/model/Site2SiteVpn.java | 155 +
.../virtualnetwork/model/StaticNatRule.java | 82 +
.../virtualnetwork/model/StaticNatRules.java | 44 +
.../virtualnetwork/model/StaticRoute.java | 72 +
.../virtualnetwork/model/StaticRoutes.java | 44 +
.../virtualnetwork/model/TcpAclRule.java | 53 +
.../virtualnetwork/model/UdpAclRule.java | 53 +
.../resource/virtualnetwork/model/VmData.java | 54 +
.../virtualnetwork/model/VmDhcpConfig.java | 123 +
.../virtualnetwork/model/VmPassword.java | 52 +
.../resource/virtualnetwork/model/VpnUser.java | 62 +
.../virtualnetwork/model/VpnUserList.java | 44 +
.../virtualnetwork/ConfigHelperTest.java | 286 ++
.../VirtualRoutingResourceTest.java | 46 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 1593 ++++-----
.../orchestration/NetworkOrchestrator.java | 3 +-
.../src/com/cloud/network/dao/NetworkDao.java | 2 +
.../com/cloud/network/dao/NetworkDaoImpl.java | 234 +-
.../src/com/cloud/network/dao/NetworkVO.java | 20 +-
.../com/cloud/network/vpc/VpcOfferingVO.java | 15 +-
.../schema/src/com/cloud/network/vpc/VpcVO.java | 38 +-
.../com/cloud/upgrade/dao/Upgrade451to460.java | 62 +-
.../com/cloud/vm/dao/DomainRouterDaoImpl.java | 162 +-
.../schema/src/com/cloud/vm/dao/NicDaoImpl.java | 6 +-
.../resource/HypervDirectConnectResource.java | 41 +-
.../agent/manager/MockNetworkManagerImpl.java | 7 +-
.../xenserver/resource/CitrixResourceBase.java | 3288 +++++++++---------
.../guru/BigSwitchVnsGuestNetworkGuru.java | 2 +-
.../contrail/management/ContrailGuru.java | 2 +-
.../management/ManagementNetworkGuru.java | 2 +-
.../network/guru/MidoNetGuestNetworkGuru.java | 2 +-
.../network/guru/MidoNetPublicNetworkGuru.java | 4 +-
.../network/guru/NiciraNvpGuestNetworkGuru.java | 2 +-
.../network/guru/NuageVspGuestNetworkGuru.java | 4 +-
.../OpendaylightGuestNetworkGuru.java | 2 +-
.../network/guru/VxlanGuestNetworkGuru.java | 2 +-
.../spring-server-core-managers-context.xml | 2 +
server/src/com/cloud/api/ApiResponseHelper.java | 1 +
.../network/element/VirtualRouterElement.java | 294 +-
.../element/VpcVirtualRouterElement.java | 360 +-
.../cloud/network/guru/ControlNetworkGuru.java | 2 +-
.../cloud/network/guru/DirectNetworkGuru.java | 3 +-
.../network/guru/ExternalGuestNetworkGuru.java | 2 +-
.../cloud/network/guru/GuestNetworkGuru.java | 93 +-
.../cloud/network/guru/PodBasedNetworkGuru.java | 3 +-
.../cloud/network/guru/PrivateNetworkGuru.java | 3 +-
.../cloud/network/guru/PublicNetworkGuru.java | 2 +-
.../cloud/network/guru/StorageNetworkGuru.java | 2 +-
.../network/router/CommandSetupHelper.java | 217 +-
.../com/cloud/network/router/NetworkHelper.java | 17 +-
.../cloud/network/router/NetworkHelperImpl.java | 244 +-
.../cloud/network/router/NicProfileHelper.java | 4 +-
.../network/router/NicProfileHelperImpl.java | 46 +-
.../VirtualNetworkApplianceManagerImpl.java | 309 +-
.../network/router/VpcNetworkHelperImpl.java | 40 +-
.../VpcVirtualNetworkApplianceManagerImpl.java | 487 ++-
.../com/cloud/network/vpc/VpcManagerImpl.java | 1213 ++++---
.../VpcPrivateGatewayTransactionCallable.java | 77 +
.../cloud/server/ConfigurationServerImpl.java | 2 +-
.../topology/AdvancedNetworkTopology.java | 35 +-
.../topology/AdvancedNetworkVisitor.java | 34 +-
.../network/topology/BasicNetworkTopology.java | 34 +-
.../deployment/RouterDeploymentDefinition.java | 45 +-
.../RouterDeploymentDefinitionBuilder.java | 17 +-
.../VpcRouterDeploymentDefinition.java | 67 +-
.../cloud/network/CreatePrivateNetworkTest.java | 2 +-
.../cloud/network/vpc/VpcManagerImplTest.java | 107 +-
.../MockVpcVirtualNetworkApplianceManager.java | 4 +-
server/test/com/cloud/vpc/VpcApiUnitTest.java | 2 +-
.../com/cloud/vpc/dao/MockNetworkDaoImpl.java | 78 +-
.../test/com/cloud/vpc/dao/MockVpcDaoImpl.java | 4 +-
.../network/lb/ApplicationLoadBalancerTest.java | 4 +-
.../RouterDeploymentDefinitionTest.java | 520 ++-
.../RouterDeploymentDefinitionTestBase.java | 14 +-
.../VpcRouterDeploymentDefinitionTest.java | 59 +-
systemvm/cloudpatch-descriptor.xml | 59 -
.../patches/debian/config/etc/chef/node.json | 5 +
systemvm/patches/debian/config/etc/chef/solo.rb | 4 +
.../debian/config/etc/init.d/cloud-early-config | 34 +-
.../debian/config/etc/iptables/iptables-router | 6 +-
.../config/etc/iptables/iptables-vpcrouter | 4 +-
.../debian/config/opt/cloud/bin/baremetal-vr.py | 1 -
.../debian/config/opt/cloud/bin/checkrouter.sh | 8 +
.../debian/config/opt/cloud/bin/configure.py | 658 ++++
.../debian/config/opt/cloud/bin/cs/CsAddress.py | 587 ++++
.../debian/config/opt/cloud/bin/cs/CsApp.py | 103 +
.../debian/config/opt/cloud/bin/cs/CsConfig.py | 98 +
.../debian/config/opt/cloud/bin/cs/CsDatabag.py | 144 +
.../debian/config/opt/cloud/bin/cs/CsDhcp.py | 154 +
.../debian/config/opt/cloud/bin/cs/CsFile.py | 131 +
.../config/opt/cloud/bin/cs/CsGuestNetwork.py | 75 +
.../debian/config/opt/cloud/bin/cs/CsHelper.py | 208 ++
.../config/opt/cloud/bin/cs/CsLoadBalancer.py | 46 +
.../debian/config/opt/cloud/bin/cs/CsMonitor.py | 43 +
.../config/opt/cloud/bin/cs/CsNetfilter.py | 291 ++
.../debian/config/opt/cloud/bin/cs/CsProcess.py | 63 +
.../config/opt/cloud/bin/cs/CsRedundant.py | 301 ++
.../debian/config/opt/cloud/bin/cs/CsRoute.py | 58 +
.../debian/config/opt/cloud/bin/cs/CsRule.py | 44 +
.../debian/config/opt/cloud/bin/cs/__init__.py | 16 +
.../debian/config/opt/cloud/bin/cs_cmdline.py | 27 +
.../debian/config/opt/cloud/bin/cs_dhcp.py | 49 +
.../config/opt/cloud/bin/cs_firewallrules.py | 32 +
.../config/opt/cloud/bin/cs_forwardingrules.py | 79 +
.../config/opt/cloud/bin/cs_guestnetwork.py | 41 +
.../debian/config/opt/cloud/bin/cs_ip.py | 43 +
.../config/opt/cloud/bin/cs_loadbalancer.py | 27 +
.../config/opt/cloud/bin/cs_monitorservice.py | 26 +
.../config/opt/cloud/bin/cs_network_acl.py | 24 +
.../config/opt/cloud/bin/cs_site2sitevpn.py | 28 +
.../debian/config/opt/cloud/bin/cs_vmdata.py | 23 +
.../debian/config/opt/cloud/bin/cs_vmp.py | 27 +
.../opt/cloud/bin/get_template_version.sh | 2 +-
.../patches/debian/config/opt/cloud/bin/ian.py | 10 +
.../debian/config/opt/cloud/bin/line_edit.py | 199 ++
.../debian/config/opt/cloud/bin/master.py | 53 +
.../debian/config/opt/cloud/bin/merge.py | 254 ++
.../debian/config/opt/cloud/bin/netusage.sh | 6 +-
.../config/opt/cloud/bin/passwd_server_ip | 1 +
.../config/opt/cloud/bin/patchsystemvm.sh | 24 -
.../config/opt/cloud/bin/set_redundant.py | 47 +
.../patches/debian/config/opt/cloud/bin/test.sh | 9 +
.../config/opt/cloud/bin/update_config.py | 140 +
.../debian/config/opt/cloud/bin/vmdata.py | 31 +-
.../debian/config/opt/cloud/bin/vpc_netusage.sh | 4 +-
.../config/opt/cloud/bin/vpc_passwd_server | 2 +-
.../debian/config/opt/cloud/templates/README | 2 +
.../cloud/templates/arping_gateways.sh.templ | 29 +
.../config/opt/cloud/templates/check_bumpup.sh | 19 +
.../cloud/templates/check_heartbeat.sh.templ | 62 +
.../opt/cloud/templates/checkrouter.sh.templ | 60 +
.../opt/cloud/templates/conntrackd.conf.templ | 401 +++
.../opt/cloud/templates/heartbeat.sh.templ | 20 +
.../opt/cloud/templates/keepalived.conf.templ | 59 +
.../debian/config/opt/cloud/testdata/README | 1 +
.../config/opt/cloud/testdata/acl0001.json | 54 +
.../config/opt/cloud/testdata/dhcp0001.json | 9 +
.../config/opt/cloud/testdata/gn0001.json | 10 +
.../config/opt/cloud/testdata/ips0001.json | 12 +
.../config/opt/cloud/testdata/ips0002.json | 12 +
.../config/opt/cloud/testdata/ips0003.json | 12 +
.../config/opt/cloud/testdata/s2s0001.json | 16 +
.../config/opt/cloud/testdata/vmp0001.json | 1 +
.../redundant_router/check_heartbeat.sh.templ | 11 +-
systemvm/test/python/TestCsAddress.py | 25 +
systemvm/test/python/TestCsApp.py | 21 +
systemvm/test/python/TestCsCmdLine.py | 37 +
systemvm/test/python/TestCsConfig.py | 16 +
systemvm/test/python/TestCsDatabag.py | 16 +
systemvm/test/python/TestCsDhcp.py | 20 +
systemvm/test/python/TestCsFile.py | 16 +
systemvm/test/python/TestCsGuestNetwork.py | 27 +
systemvm/test/python/TestCsHelper.py | 18 +
systemvm/test/python/TestCsInterface.py | 24 +
systemvm/test/python/TestCsNetfilter.py | 16 +
systemvm/test/python/TestCsProcess.py | 16 +
systemvm/test/python/TestCsRedundant.py | 23 +
systemvm/test/python/TestCsRoute.py | 16 +
systemvm/test/python/TestCsRule.py | 16 +
systemvm/test/python/runtests.sh | 11 +
.../integration/component/test_vpc_offerings.py | 80 +
test/systemvm/README.md | 75 +
test/systemvm/__init__.py | 224 ++
test/systemvm/test_hello_systemvm.py | 54 +
test/systemvm/test_update_config.py | 409 +++
tools/appliance/.ruby-version | 1 +
tools/appliance/Gemfile | 3 +-
tools/appliance/README.md | 8 +-
.../configure_persistent_config.sh | 25 +
.../definitions/systemvmtemplate/definition.rb | 1 +
.../install_systemvm_packages.sh | 4 +-
.../definitions/systemvmtemplate/preseed.cfg | 41 +
tools/appliance/vbox_vm_clean.rb | 4 +
tools/vagrant/devcloud/Vagrantfile | 189 +
.../vagrant/devcloud/templates/tmpl/1/1/README | 1 +
.../vagrant/devcloud/templates/tmpl/1/5/README | 2 +
tools/vagrant/systemvm/.gitignore | 52 +
tools/vagrant/systemvm/.ruby-version | 1 +
tools/vagrant/systemvm/.rvmrc | 24 +
tools/vagrant/systemvm/Gemfile | 20 +
tools/vagrant/systemvm/README.md | 30 +
tools/vagrant/systemvm/VBoxManage | 41 +
tools/vagrant/systemvm/Vagrantfile | 123 +
tools/vagrant/systemvm/test.sh | 213 ++
tools/vagrant/systemvm/vagrant.pub | 1 +
ui/dictionary.jsp | 3 +
ui/scripts/configuration.js | 15 +-
ui/scripts/network.js | 84 +-
262 files changed, 16561 insertions(+), 5645 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3c429ee6/ui/scripts/configuration.js
----------------------------------------------------------------------