This is an automated email from the ASF dual-hosted git repository.
sureshanaparti pushed a change to branch healthcheck-main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from 762e9690927 4.20/main Health Check, please don't merge this!
add 074f75838e4 Fix pre-commit warnings for deprecated stage names (#11276)
add ae501037047 Config 'vm.network.nic.max.secondary.ipaddresses' - Sync
default value (and value if not set) to 10 as per the config description and
default value in parseInt of the config (#11256)
add 0d4147f3f63 Netris Network Plugin Integration with CloudStack (#10458)
add cc39b621221 Merge branch 'main' into healthcheck-main
No new revisions were added by this update.
Summary of changes:
.pre-commit-config.yaml | 6 +-
.../com/cloud/agent/api/to/FirewallRuleTO.java | 2 +-
.../cloud/agent/api/to/PortForwardingRuleTO.java | 4 -
.../cloud/configuration/ConfigurationService.java | 16 +
api/src/main/java/com/cloud/event/EventTypes.java | 2 +
api/src/main/java/com/cloud/network/IpAddress.java | 1 +
api/src/main/java/com/cloud/network/Network.java | 1 +
api/src/main/java/com/cloud/network/Networks.java | 3 +-
.../com/cloud/network/SDNProviderNetworkRule.java | 139 +-
.../com/cloud/network/Site2SiteVpnConnection.java | 2 +-
.../com/cloud/network/element/NetworkElement.java | 9 +
.../element/PortForwardingServiceProvider.java | 28 +
.../com/cloud/network/element/VpcProvider.java | 4 +
.../java/com/cloud/network/guru/NetworkGuru.java | 4 +
.../com/cloud/network/netris/NetrisLbBackend.java | 6 +-
.../cloud/network/netris/NetrisNetworkRule.java | 108 ++
.../netris/NetrisProvider.java} | 15 +-
.../com/cloud/network/netris/NetrisService.java | 310 +++
.../java/com/cloud/network/vpc/StaticRoute.java | 5 +-
.../com/cloud/network/vpc/StaticRouteProfile.java | 22 +-
.../java/com/cloud/network/vpc/VpcOffering.java | 4 +-
.../cloud/network/vpc/VpcProvisioningService.java | 2 +-
.../java/com/cloud/network/vpc/VpcService.java | 2 +-
.../java/com/cloud/offering/NetworkOffering.java | 6 +-
.../org/apache/cloudstack/api/ApiConstants.java | 11 +
.../admin/network/CreateNetworkOfferingCmd.java | 56 +-
.../command/admin/vlan/CreateVlanIpRangeCmd.java | 13 +-
.../command/admin/vpc/CreateVPCOfferingCmd.java | 56 +-
.../user/address/ListPublicIpAddressesCmd.java | 7 +
.../api/command/user/vpc/CreateStaticRouteCmd.java | 53 +-
.../api/command/user/vpn/CreateVpnGatewayCmd.java | 14 +-
.../cloudstack/api/response/AsyncJobResponse.java | 9 -
.../response/ClusterDrsPlanMigrationResponse.java | 12 +-
.../cloudstack/api/response/IPAddressResponse.java | 8 +
.../cloudstack/api/response/NetworkResponse.java | 16 -
.../api/response/StaticRouteResponse.java | 24 +-
.../cloudstack/api/response/SystemVmResponse.java | 8 -
.../api/response/VlanIpRangeResponse.java | 10 +-
.../cloudstack/api/response/ZoneResponse.java | 13 +
client/pom.xml | 5 +
.../agent/api/CheckS2SVpnConnectionsAnswer.java | 1 -
.../cloud/agent/api/SetupGuestNetworkCommand.java | 9 +
.../facade/SetGuestNetworkConfigItem.java | 1 +
.../virtualnetwork/model/GuestNetwork.java | 9 +
.../cloud/agent/transport/ArrayTypeAdaptor.java | 12 +-
.../com/cloud/agent/transport/ResponseTest.java | 46 +
deps/install-non-oss.sh | 3 +
.../service/NetworkOrchestrationService.java | 3 +
.../cloud/configuration/ConfigurationManager.java | 5 +-
.../main/java/com/cloud/network/addr/PublicIp.java | 4 +
.../java/com/cloud/network/rules/RulesManager.java | 2 +
.../com/cloud/network/vpc/NetworkACLManager.java | 2 +-
.../java/com/cloud/network/vpc/VpcManager.java | 16 +
.../engine/orchestration/NetworkOrchestrator.java | 70 +-
.../src/main/java/com/cloud/dc/dao/VlanDao.java | 2 +
.../main/java/com/cloud/dc/dao/VlanDaoImpl.java | 27 +
.../com/cloud/network/dao/IPAddressDaoImpl.java | 1 +
.../java/com/cloud/network/dao/IPAddressVO.java | 12 +
...tworkAccountDao.java => NetrisProviderDao.java} | 5 +-
...iderDaoImpl.java => NetrisProviderDaoImpl.java} | 29 +-
.../com/cloud/network/dao/RemoteAccessVpnDao.java | 2 +
.../cloud/network/dao/RemoteAccessVpnDaoImpl.java | 7 +
.../cloud/network/dao/Site2SiteVpnGatewayDao.java | 2 +
.../network/dao/Site2SiteVpnGatewayDaoImpl.java | 8 +
.../{NsxProviderVO.java => NetrisProviderVO.java} | 168 +-
.../java/com/cloud/network/vpc/StaticRouteVO.java | 35 +-
.../java/com/cloud/network/vpc/VpcOfferingVO.java | 11 -
.../network/vpc/dao/VpcOfferingServiceMapDao.java | 5 +
.../vpc/dao/VpcOfferingServiceMapDaoImpl.java | 19 +
.../network/vpc/dao/VpcServiceMapDaoImpl.java | 11 +-
.../com/cloud/offerings/NetworkOfferingVO.java | 24 -
.../src/main/java/com/cloud/vm/dao/NicDao.java | 4 +
.../src/main/java/com/cloud/vm/dao/NicDaoImpl.java | 20 +
.../spring-engine-schema-core-daos-context.xml | 1 +
.../resources/META-INF/db/schema-42010to42100.sql | 41 +
.../db/views/cloud.network_offering_view.sql | 2 -
.../META-INF/db/views/cloud.vpc_offering_view.sql | 1 -
.../hypervisor/kvm/resource/BridgeVifDriver.java | 12 +-
.../network/element/CiscoNexusVSMElement.java | 1 -
.../cluster/KubernetesClusterManagerImpl.java | 1 -
.../cloudstack/metrics/MetricsServiceImpl.java | 2 +-
.../cloudstack/response/HostMetricsResponse.java | 10 -
.../response/ManagementServerMetricsResponse.java | 17 -
.../contrail/management/ContrailManagerImpl.java | 6 +-
.../netris}/pom.xml | 20 +-
.../apache/cloudstack/StartupNetrisCommand.java} | 4 +-
.../api/AddOrUpdateNetrisStaticRouteCommand.java} | 31 +-
.../agent/api/CreateNetrisACLCommand.java | 119 ++
.../agent/api/CreateNetrisVnetCommand.java | 84 +
.../agent/api/CreateNetrisVpcCommand.java} | 14 +-
.../agent/api/CreateOrUpdateNetrisACLCommand.java | 119 ++
...reateOrUpdateNetrisLoadBalancerRuleCommand.java | 90 +
.../agent/api/CreateOrUpdateNetrisNatCommand.java | 148 ++
.../agent/api/DeleteNetrisACLCommand.java | 38 +-
.../api/DeleteNetrisLoadBalancerRuleCommand.java | 38 +-
.../agent/api/DeleteNetrisNatRuleCommand.java | 72 +
.../agent/api/DeleteNetrisStaticRouteCommand.java | 14 +-
.../agent/api/DeleteNetrisVnetCommand.java | 45 +-
.../agent/api/DeleteNetrisVpcCommand.java} | 13 +-
.../agent/api/ListNetrisStaticRoutesAnswer.java} | 17 +-
.../agent/api/ListNetrisStaticRoutesCommand.java} | 10 +-
.../apache/cloudstack/agent/api/NetrisAnswer.java} | 13 +-
.../cloudstack/agent/api/NetrisCommand.java} | 55 +-
.../cloudstack/agent/api/ReleaseNatIpCommand.java} | 13 +-
.../agent/api/SetupNetrisPublicRangeCommand.java} | 20 +-
.../agent/api/UpdateNetrisVnetCommand.java | 41 +-
.../agent/api/UpdateNetrisVpcCommand.java} | 15 +-
.../api/command/AddNetrisProviderCmd.java | 126 ++
.../api/command/DeleteNetrisProviderCmd.java} | 47 +-
.../api/command/ListNetrisProvidersCmd.java} | 53 +-
.../api/response/NetrisProviderResponse.java} | 83 +-
.../cloudstack/resource/NetrisPortGroup.java | 16 +-
.../apache/cloudstack/resource/NetrisResource.java | 441 +++++
.../resource/NetrisResourceObjectUtils.java | 103 +
.../apache/cloudstack/service/NetrisApiClient.java | 100 +
.../cloudstack/service/NetrisApiClientImpl.java | 2000 ++++++++++++++++++++
.../apache/cloudstack/service/NetrisElement.java} | 876 ++++-----
.../service/NetrisGuestNetworkGuru.java} | 188 +-
.../cloudstack/service/NetrisProviderService.java} | 19 +-
.../service/NetrisProviderServiceImpl.java | 217 +++
.../service/NetrisPublicNetworkGuru.java} | 66 +-
.../cloudstack/service/NetrisServiceImpl.java | 556 ++++++
.../core/spring-netris-core-managers-context.xml | 5 +-
.../META-INF/cloudstack/netris}/module.properties | 2 +-
.../cloudstack/netris/spring-netris-context.xml} | 16 +-
.../AddOrUpdateNetrisStaticRouteCommandTest.java | 91 +
.../agent/api/CreateNetrisACLCommandTest.java | 144 ++
.../agent/api/CreateNetrisVnetCommandTest.java | 95 +
.../agent/api/CreateNetrisVpcCommandTest.java | 63 +
...eOrUpdateNetrisLoadBalancerRuleCommandTest.java | 139 ++
.../api/CreateOrUpdateNetrisNatCommandTest.java | 145 ++
.../agent/api/DeleteNetrisACLCommandTest.java | 103 +
.../DeleteNetrisLoadBalancerRuleCommandTest.java | 98 +
.../agent/api/DeleteNetrisNatRuleCommandTest.java | 94 +
.../agent/api/DeleteNetrisVnetCommandTest.java | 83 +
.../agent/api/DeleteNetrisVpcCommandTest.java | 64 +
.../agent/api/ReleaseNatIpCommandTest.java | 80 +
.../api/SetupNetrisPublicRangeCommandTest.java | 63 +
.../agent/api/UpdateNetrisVnetCommandTest.java | 105 +
.../agent/api/UpdateNetrisVpcCommandTest.java | 93 +
.../api/command/AddNetrisProviderCmdTest.java | 122 ++
.../api/command/DeleteNetrisProviderCmdTest.java | 101 +
.../api/command/ListNetrisProvidersCmdTest.java | 104 +
.../resource/NetrisResourceObjectUtilsTest.java | 109 ++
.../cloudstack/resource/NetrisResourceTest.java | 141 ++
.../service/NetrisApiClientImplTest.java | 103 +
.../cloudstack/service/NetrisElementTest.java | 141 ++
.../service/NetrisGuestNetworkGuruTest.java | 230 +++
.../service/NetrisProviderServiceImplTest.java | 220 +++
.../service/NetrisPublicNetworkGuruTest.java | 225 +++
.../cloudstack/service/NetrisServiceImplTest.java | 17 +-
.../api/command/DeleteNsxControllerCmd.java | 3 +-
.../apache/cloudstack/resource/NsxNetworkRule.java | 353 +---
.../apache/cloudstack/service/NsxApiClient.java | 13 +-
.../org/apache/cloudstack/service/NsxElement.java | 138 +-
.../cloudstack/service/NsxGuestNetworkGuru.java | 9 -
.../cloudstack/service/NsxPublicNetworkGuru.java | 18 +-
.../apache/cloudstack/service/NsxServiceImpl.java | 17 +-
.../cloudstack/service/NsxApiClientTest.java | 6 +-
.../apache/cloudstack/service/NsxElementTest.java | 42 +-
.../service/NsxPublicNetworkGuruTest.java | 10 +-
.../command/ConfigTungstenFabricServiceCmd.java | 1 -
plugins/pom.xml | 1 +
pom.xml | 2 +-
.../defaults.properties => requirements-dev.txt | 2 +-
requirements.txt | 2 -
.../main/java/com/cloud/api/ApiResponseHelper.java | 92 +-
.../cloud/api/query/dao/DataCenterJoinDaoImpl.java | 23 +-
.../api/query/dao/VpcOfferingJoinDaoImpl.java | 9 +-
.../cloud/api/query/vo/NetworkOfferingJoinVO.java | 20 -
.../com/cloud/api/query/vo/VpcOfferingJoinVO.java | 8 -
.../cloud/api/response/ApiResponseSerializer.java | 4 +-
.../main/java/com/cloud/configuration/Config.java | 2 +-
.../configuration/ConfigurationManagerImpl.java | 97 +-
.../deploy/DeploymentPlanningManagerImpl.java | 2 +-
.../com/cloud/network/IpAddressManagerImpl.java | 88 +
.../java/com/cloud/network/NetworkModelImpl.java | 9 +-
.../java/com/cloud/network/NetworkServiceImpl.java | 60 +-
.../com/cloud/network/SDNProviderOpObject.java | 8 +-
.../com/cloud/network/as/AutoScaleManagerImpl.java | 14 +-
.../network/element/VirtualRouterElement.java | 1 -
.../network/guru/ExternalGuestNetworkGuru.java | 5 +-
.../com/cloud/network/guru/GuestNetworkGuru.java | 20 +-
.../com/cloud/network/guru/PublicNetworkGuru.java | 14 +-
.../network/lb/LoadBalancingRulesManagerImpl.java | 15 +
.../cloud/network/router/CommandSetupHelper.java | 11 +-
.../cloud/network/router/NetworkHelperImpl.java | 14 +-
.../cloud/network/router/NicProfileHelperImpl.java | 4 +-
.../router/VirtualNetworkApplianceManagerImpl.java | 8 +
.../VpcVirtualNetworkApplianceManagerImpl.java | 20 +-
.../com/cloud/network/rules/RulesManagerImpl.java | 35 +-
.../cloud/network/vpc/NetworkACLManagerImpl.java | 11 +-
.../cloud/network/vpc/NetworkACLServiceImpl.java | 11 +-
.../java/com/cloud/network/vpc/VpcManagerImpl.java | 557 +++++-
.../network/vpn/RemoteAccessVpnManagerImpl.java | 72 +-
.../cloud/network/vpn/Site2SiteVpnManagerImpl.java | 76 +-
.../com/cloud/server/ConfigurationServerImpl.java | 71 +-
.../com/cloud/server/ManagementServerImpl.java | 36 +-
.../deployment/RouterDeploymentDefinition.java | 19 +-
.../RouterDeploymentDefinitionBuilder.java | 4 +
.../deployment/VpcRouterDeploymentDefinition.java | 6 +-
.../ConfigurationManagerImplTest.java | 4 +
.../com/cloud/network/NetworkModelImplTest.java | 8 +-
.../cloud/network/as/AutoScaleManagerImplTest.java | 16 +-
.../cloud/network/lb/UpdateLoadBalancerTest.java | 7 +-
.../cloud/vpc/MockConfigurationManagerImpl.java | 4 +-
.../java/com/cloud/vpc/NetworkACLServiceTest.java | 6 +
.../vpc/dao/MockVpcOfferingServiceMapDaoImpl.java | 11 +
.../deployment/RouterDeploymentDefinitionTest.java | 3 +
.../VpcRouterDeploymentDefinitionTest.java | 3 +
.../networkoffering/CreateNetworkOfferingTest.java | 20 +-
.../cloudstack/service/NetrisServiceMockTest.java | 134 ++
.../src/test/resources/createNetworkOffering.xml | 2 +
systemvm/debian/opt/cloud/bin/configure.py | 38 +-
systemvm/debian/opt/cloud/bin/cs/CsAddress.py | 110 +-
systemvm/debian/opt/cloud/bin/cs/CsConfig.py | 3 +
systemvm/debian/opt/cloud/bin/cs/CsDatabag.py | 7 +
systemvm/debian/opt/cloud/bin/cs/CsDhcp.py | 4 +-
systemvm/debian/opt/cloud/bin/cs/CsGuestNetwork.py | 10 +-
systemvm/debian/opt/cloud/bin/cs/CsRoute.py | 21 +
.../debian/opt/cloud/bin/cs/CsVpcGuestNetwork.py | 15 +-
systemvm/debian/opt/cloud/bin/passwd_server_ip.py | 13 +-
test/integration/component/test_project_usage.py | 25 +-
test/integration/component/test_vpn_users.py | 118 +-
test/integration/smoke/test_usage.py | 12 +-
tools/apidoc/gen_toc.py | 1 +
ui/public/locales/en.json | 32 +-
ui/src/components/CheckBoxSelectPair.vue | 8 +-
ui/src/components/view/InfoCard.vue | 2 +-
ui/src/config/section/infra/phynetworks.js | 2 +-
ui/src/config/section/network.js | 3 +-
ui/src/views/AutogenView.vue | 4 -
ui/src/views/infra/network/IpRangesTabPublic.vue | 21 +
ui/src/views/infra/network/ServiceProvidersTab.vue | 45 +-
ui/src/views/infra/network/TrafficTypesTab.vue | 2 +-
ui/src/views/infra/zone/IpAddressRangeForm.vue | 20 +-
ui/src/views/infra/zone/PhysicalNetworksTab.vue | 2 +-
ui/src/views/infra/zone/ZoneWizard.vue | 2 +-
ui/src/views/infra/zone/ZoneWizardLaunchZone.vue | 73 +-
.../infra/zone/ZoneWizardNetworkSetupStep.vue | 90 +-
.../zone/ZoneWizardPhysicalNetworkSetupStep.vue | 1 +
ui/src/views/network/IpAddressesTab.vue | 22 +-
ui/src/views/network/LoadBalancing.vue | 41 +-
ui/src/views/network/PublicIpResource.vue | 31 +-
ui/src/views/network/StaticRoutesTab.vue | 130 +-
ui/src/views/network/VpcTab.vue | 133 +-
ui/src/views/network/VpcTiersTab.vue | 6 +-
ui/src/views/network/VpnDetails.vue | 164 +-
ui/src/views/offering/AddNetworkOffering.vue | 156 +-
ui/src/views/offering/AddVpcOffering.vue | 100 +-
.../main/java/com/cloud/utils/net/NetUtils.java | 34 +
.../test/java/com/cloud/utils/LogUtilsTest.java | 2 +-
.../java/com/cloud/utils/net/NetUtilsTest.java | 19 +
253 files changed, 11972 insertions(+), 2436 deletions(-)
copy
plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/resource/NsxNetworkRule.java
=> api/src/main/java/com/cloud/network/SDNProviderNetworkRule.java (74%)
copy
plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/resource/NsxLoadBalancerMember.java
=> api/src/main/java/com/cloud/network/netris/NetrisLbBackend.java (88%)
create mode 100644
api/src/main/java/com/cloud/network/netris/NetrisNetworkRule.java
copy api/src/main/java/com/cloud/{dc/VsphereStoragePolicy.java =>
network/netris/NetrisProvider.java} (80%)
create mode 100644
api/src/main/java/com/cloud/network/netris/NetrisService.java
create mode 100644
core/src/test/java/com/cloud/agent/transport/ResponseTest.java
copy engine/schema/src/main/java/com/cloud/network/dao/{NetworkAccountDao.java
=> NetrisProviderDao.java} (83%)
copy
engine/schema/src/main/java/com/cloud/network/dao/{NsxProviderDaoImpl.java =>
NetrisProviderDaoImpl.java} (65%)
copy engine/schema/src/main/java/com/cloud/network/element/{NsxProviderVO.java
=> NetrisProviderVO.java} (59%)
copy plugins/{maintenance => network-elements/netris}/pom.xml (73%)
copy
plugins/network-elements/{nsx/src/main/java/org/apache/cloudstack/StartupNsxCommand.java
=> netris/src/main/java/org/apache/cloudstack/StartupNetrisCommand.java} (90%)
copy
plugins/network-elements/{tungsten/src/main/java/org/apache/cloudstack/network/tungsten/vrouter/Subnet.java
=>
netris/src/main/java/org/apache/cloudstack/agent/api/AddOrUpdateNetrisStaticRouteCommand.java}
(56%)
create mode 100644
plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/CreateNetrisACLCommand.java
create mode 100644
plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/CreateNetrisVnetCommand.java
copy
plugins/network-elements/{nsx/src/main/java/org/apache/cloudstack/agent/api/StartupNsxCommand.java
=>
netris/src/main/java/org/apache/cloudstack/agent/api/CreateNetrisVpcCommand.java}
(69%)
create mode 100644
plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/CreateOrUpdateNetrisACLCommand.java
create mode 100644
plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/CreateOrUpdateNetrisLoadBalancerRuleCommand.java
create mode 100644
plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/CreateOrUpdateNetrisNatCommand.java
copy
core/src/main/java/com/cloud/agent/api/routing/SetStaticNatRulesCommand.java =>
plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/DeleteNetrisACLCommand.java
(60%)
copy
api/src/main/java/org/apache/cloudstack/outofbandmanagement/driver/OutOfBandManagementDriverChangePasswordCommand.java
=>
plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/DeleteNetrisLoadBalancerRuleCommand.java
(52%)
create mode 100644
plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/DeleteNetrisNatRuleCommand.java
copy core/src/main/java/com/cloud/agent/api/PlugNicAnswer.java =>
plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/DeleteNetrisStaticRouteCommand.java
(72%)
copy
core/src/main/java/com/cloud/agent/api/routing/SetStaticNatRulesCommand.java =>
plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/DeleteNetrisVnetCommand.java
(53%)
copy
plugins/network-elements/{nsx/src/main/java/org/apache/cloudstack/agent/api/StartupNsxCommand.java
=>
netris/src/main/java/org/apache/cloudstack/agent/api/DeleteNetrisVpcCommand.java}
(69%)
copy
plugins/network-elements/{nsx/src/main/java/org/apache/cloudstack/agent/api/DeleteNsxDistributedFirewallRulesCommand.java
=>
netris/src/main/java/org/apache/cloudstack/agent/api/ListNetrisStaticRoutesAnswer.java}
(66%)
copy
plugins/network-elements/{nsx/src/main/java/org/apache/cloudstack/agent/api/StartupNsxCommand.java
=>
netris/src/main/java/org/apache/cloudstack/agent/api/ListNetrisStaticRoutesCommand.java}
(70%)
copy
plugins/network-elements/{opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/agent/responses/DestroyPortAnswer.java
=> netris/src/main/java/org/apache/cloudstack/agent/api/NetrisAnswer.java}
(78%)
copy
plugins/network-elements/{nsx/src/main/java/org/apache/cloudstack/agent/api/NsxCommand.java
=> netris/src/main/java/org/apache/cloudstack/agent/api/NetrisCommand.java}
(60%)
copy
plugins/network-elements/{nsx/src/main/java/org/apache/cloudstack/agent/api/StartupNsxCommand.java
=>
netris/src/main/java/org/apache/cloudstack/agent/api/ReleaseNatIpCommand.java}
(70%)
copy
plugins/network-elements/{nsx/src/main/java/org/apache/cloudstack/agent/api/CreateNsxStaticNatCommand.java
=>
netris/src/main/java/org/apache/cloudstack/agent/api/SetupNetrisPublicRangeCommand.java}
(63%)
copy
core/src/main/java/com/cloud/agent/api/routing/SetStaticNatRulesCommand.java =>
plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/UpdateNetrisVnetCommand.java
(55%)
copy
plugins/network-elements/{nsx/src/main/java/org/apache/cloudstack/agent/api/DeleteNsxDistributedFirewallRulesCommand.java
=>
netris/src/main/java/org/apache/cloudstack/agent/api/UpdateNetrisVpcCommand.java}
(64%)
create mode 100644
plugins/network-elements/netris/src/main/java/org/apache/cloudstack/api/command/AddNetrisProviderCmd.java
copy
plugins/network-elements/{nsx/src/main/java/org/apache/cloudstack/api/command/DeleteNsxControllerCmd.java
=>
netris/src/main/java/org/apache/cloudstack/api/command/DeleteNetrisProviderCmd.java}
(70%)
copy
plugins/network-elements/{nsx/src/main/java/org/apache/cloudstack/api/command/ListNsxControllersCmd.java
=>
netris/src/main/java/org/apache/cloudstack/api/command/ListNetrisProvidersCmd.java}
(59%)
copy
plugins/network-elements/{nsx/src/main/java/org/apache/cloudstack/api/response/NsxControllerResponse.java
=>
netris/src/main/java/org/apache/cloudstack/api/response/NetrisProviderResponse.java}
(57%)
copy
services/console-proxy/rdpconsole/src/main/java/streamer/debug/Dumper.java =>
plugins/network-elements/netris/src/main/java/org/apache/cloudstack/resource/NetrisPortGroup.java
(78%)
create mode 100644
plugins/network-elements/netris/src/main/java/org/apache/cloudstack/resource/NetrisResource.java
create mode 100644
plugins/network-elements/netris/src/main/java/org/apache/cloudstack/resource/NetrisResourceObjectUtils.java
create mode 100644
plugins/network-elements/netris/src/main/java/org/apache/cloudstack/service/NetrisApiClient.java
create mode 100644
plugins/network-elements/netris/src/main/java/org/apache/cloudstack/service/NetrisApiClientImpl.java
copy
plugins/network-elements/{nsx/src/main/java/org/apache/cloudstack/service/NsxElement.java
=> netris/src/main/java/org/apache/cloudstack/service/NetrisElement.java} (54%)
copy
plugins/network-elements/{nsx/src/main/java/org/apache/cloudstack/service/NsxGuestNetworkGuru.java
=>
netris/src/main/java/org/apache/cloudstack/service/NetrisGuestNetworkGuru.java}
(65%)
copy
plugins/network-elements/{nsx/src/main/java/org/apache/cloudstack/service/NsxProviderService.java
=>
netris/src/main/java/org/apache/cloudstack/service/NetrisProviderService.java}
(66%)
create mode 100644
plugins/network-elements/netris/src/main/java/org/apache/cloudstack/service/NetrisProviderServiceImpl.java
copy
plugins/network-elements/{nsx/src/main/java/org/apache/cloudstack/service/NsxPublicNetworkGuru.java
=>
netris/src/main/java/org/apache/cloudstack/service/NetrisPublicNetworkGuru.java}
(66%)
create mode 100644
plugins/network-elements/netris/src/main/java/org/apache/cloudstack/service/NetrisServiceImpl.java
copy client/src/main/resources/META-INF/cloudstack/webApplicationContext.xml
=>
plugins/network-elements/netris/src/main/resources/META-INF/cloudstack/core/spring-netris-core-managers-context.xml
(92%)
copy
plugins/network-elements/{nicira-nvp/src/main/resources/META-INF/cloudstack/nvp
=> netris/src/main/resources/META-INF/cloudstack/netris}/module.properties (98%)
copy
plugins/network-elements/{nsx/src/main/resources/META-INF/cloudstack/nsx/spring-nsx-context.xml
=>
netris/src/main/resources/META-INF/cloudstack/netris/spring-netris-context.xml}
(73%)
create mode 100644
plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/AddOrUpdateNetrisStaticRouteCommandTest.java
create mode 100644
plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/CreateNetrisACLCommandTest.java
create mode 100644
plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/CreateNetrisVnetCommandTest.java
create mode 100644
plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/CreateNetrisVpcCommandTest.java
create mode 100644
plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/CreateOrUpdateNetrisLoadBalancerRuleCommandTest.java
create mode 100644
plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/CreateOrUpdateNetrisNatCommandTest.java
create mode 100644
plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/DeleteNetrisACLCommandTest.java
create mode 100644
plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/DeleteNetrisLoadBalancerRuleCommandTest.java
create mode 100644
plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/DeleteNetrisNatRuleCommandTest.java
create mode 100644
plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/DeleteNetrisVnetCommandTest.java
create mode 100644
plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/DeleteNetrisVpcCommandTest.java
create mode 100644
plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/ReleaseNatIpCommandTest.java
create mode 100644
plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/SetupNetrisPublicRangeCommandTest.java
create mode 100644
plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/UpdateNetrisVnetCommandTest.java
create mode 100644
plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/UpdateNetrisVpcCommandTest.java
create mode 100644
plugins/network-elements/netris/src/test/java/org/apache/cloudstack/api/command/AddNetrisProviderCmdTest.java
create mode 100644
plugins/network-elements/netris/src/test/java/org/apache/cloudstack/api/command/DeleteNetrisProviderCmdTest.java
create mode 100644
plugins/network-elements/netris/src/test/java/org/apache/cloudstack/api/command/ListNetrisProvidersCmdTest.java
create mode 100644
plugins/network-elements/netris/src/test/java/org/apache/cloudstack/resource/NetrisResourceObjectUtilsTest.java
create mode 100644
plugins/network-elements/netris/src/test/java/org/apache/cloudstack/resource/NetrisResourceTest.java
create mode 100644
plugins/network-elements/netris/src/test/java/org/apache/cloudstack/service/NetrisApiClientImplTest.java
create mode 100644
plugins/network-elements/netris/src/test/java/org/apache/cloudstack/service/NetrisElementTest.java
create mode 100644
plugins/network-elements/netris/src/test/java/org/apache/cloudstack/service/NetrisGuestNetworkGuruTest.java
create mode 100644
plugins/network-elements/netris/src/test/java/org/apache/cloudstack/service/NetrisProviderServiceImplTest.java
create mode 100644
plugins/network-elements/netris/src/test/java/org/apache/cloudstack/service/NetrisPublicNetworkGuruTest.java
copy
engine/storage/configdrive/src/test/java/org/apache/cloudstack/storage/configdrive/ConfigDriveTest.java
=>
plugins/network-elements/netris/src/test/java/org/apache/cloudstack/service/NetrisServiceImplTest.java
(67%)
copy
framework/spring/module/src/test/resources/testfiles/all/defaults.properties =>
requirements-dev.txt (98%)
rename
plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/resource/NsxOpObject.java
=> server/src/main/java/com/cloud/network/SDNProviderOpObject.java (94%)
create mode 100644
server/src/test/java/org/apache/cloudstack/service/NetrisServiceMockTest.java