This is an automated email from the ASF dual-hosted git repository.
nvazquez pushed a change to branch nsx-integration
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from 42300aa80ed Merge branch 'main' into nsx-integration
add ecd32d5632a [NSX] Fix update source NAT IP (#8176)
No new revisions were added by this update.
Summary of changes:
.../com/cloud/network/{ => nsx}/NsxProvider.java | 2 +-
.../java/com/cloud/network/nsx}/NsxService.java | 6 ++++-
.../com/cloud/network/element/NsxProviderVO.java | 2 +-
...a => CreateOrUpdateNsxTier1NatRuleCommand.java} | 6 ++---
.../api/command/AddNsxControllerCmd.java | 2 +-
.../api/response/NsxControllerResponse.java | 2 +-
.../apache/cloudstack/resource/NsxResource.java | 8 +++----
.../cloudstack/service/NsxProviderService.java | 2 +-
.../cloudstack/service/NsxProviderServiceImpl.java | 2 +-
.../cloudstack/service/NsxPublicNetworkGuru.java | 5 ++--
.../apache/cloudstack/service/NsxServiceImpl.java | 27 ++++++++++++++++++++++
.../org/apache/cloudstack/utils/NsxHelper.java | 10 ++++----
.../core/spring-nsx-core-managers-context.xml | 8 +++----
.../META-INF/cloudstack/nsx/spring-nsx-context.xml | 2 --
.../service/NsxProviderServiceImplTest.java | 2 +-
.../java/com/cloud/network/vpc/VpcManagerImpl.java | 13 +++++++++++
16 files changed, 70 insertions(+), 29 deletions(-)
rename api/src/main/java/com/cloud/network/{ => nsx}/NsxProvider.java (97%)
rename
{plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service =>
api/src/main/java/com/cloud/network/nsx}/NsxService.java (85%)
rename
plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/agent/api/{CreateNsxTier1NatRuleCommand.java
=> CreateOrUpdateNsxTier1NatRuleCommand.java} (83%)
copy
engine/storage/datamotion/src/main/resources/META-INF/cloudstack/core/spring-engine-storage-datamotion-core-context.xml
=>
plugins/network-elements/nsx/src/main/resources/META-INF/cloudstack/core/spring-nsx-core-managers-context.xml
(88%)