This is an automated email from the ASF dual-hosted git repository.
fmaximus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 14ab69e19a51886b91d77d01eed96de05eb21393
Merge: a1008f9 d467a6b
Author: Frank Maximus <the.evergr...@gmail.com>
AuthorDate: Thu Nov 16 17:33:07 2017 +0100
Merge pull request #2005 from nuagenetworks/feature/nw_offering_for_vpc
CLOUDSTACK-9450: Network Offering for VPC based on DB flag
api/src/com/cloud/offering/NetworkOffering.java | 2 +
.../admin/network/CreateNetworkOfferingCmd.java | 9 ++
.../cloud/configuration/ConfigurationManager.java | 8 +-
.../engine/orchestration/NetworkOrchestrator.java | 18 ++--
.../src/com/cloud/offerings/NetworkOfferingVO.java | 22 ++++-
.../contrail/management/ContrailManagerImpl.java | 4 +-
.../cloud/network/manager/NuageVspManagerImpl.java | 3 +-
.../configuration/ConfigurationManagerImpl.java | 43 ++++++---
.../com/cloud/server/ConfigurationServerImpl.java | 16 +--
.../configuration/ConfigurationManagerTest.java | 22 +----
.../cloud/network/CreatePrivateNetworkTest.java | 18 ++--
.../cloud/vpc/MockConfigurationManagerImpl.java | 6 +-
.../cloud/vpc/dao/MockNetworkOfferingDaoImpl.java | 12 +--
.../networkoffering/CreateNetworkOfferingTest.java | 20 ++--
setup/db/db/schema-41000to41100.sql | 16 +++
.../plugins/nuagevsp/test_nuage_static_nat.py | 107 +++++++++++++++++++++
tools/marvin/marvin/lib/base.py | 2 +-
ui/scripts/configuration.js | 13 ++-
18 files changed, 252 insertions(+), 89 deletions(-)
--
To stop receiving notification emails like this one, please contact
"commits@cloudstack.apache.org" <commits@cloudstack.apache.org>.
