This is an automated email from the ASF dual-hosted git repository.

sateesh pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.


    from 445dbe7  Merge remote-tracking branch 'origin/4.10'
     new 884606f  CLOUDSTACK-8672 : NCC Integration with CloudStack.
     new b2f7f9a  CLOUDSTACK-8672 : NCC Integration with CloudStack.
     new b2b422c  CLOUDSTACK-8672 : NCC Integration with CloudStack.
     new 6535949  CLOUDSTACK-8672 : NCC Integration with CloudStack. Marvin 
Integration Tests for Shared and Dedicated Workflow.
     new e243a31  CLOUDSTACK-8672 : NCC Integration with CloudStack. 
Improvements.

The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 api/src/com/cloud/agent/api/to/LoadBalancerTO.java |  71 +-
 api/src/com/cloud/event/EventTypes.java            |  16 +
 api/src/com/cloud/host/Host.java                   |   2 +-
 api/src/com/cloud/network/NetworkService.java      |   7 +
 .../com/cloud/network/VirtualRouterProvider.java   |   2 +-
 .../com/cloud/network/router/VirtualRouter.java    |   2 +-
 api/src/com/cloud/offering/NetworkOffering.java    |   4 +-
 api/src/com/cloud/vm/VirtualMachine.java           |   1 +
 .../org/apache/cloudstack/api/ApiConstants.java    |   2 +
 .../admin/address/AcquirePodIpCmdByAdmin.java      |  92 ++
 .../admin/address/ReleasePodIpCmdByAdmin.java      |  79 ++
 .../admin/network/CreateNetworkOfferingCmd.java    |  15 +-
 .../loadbalancer/UpdateLoadBalancerRuleCmd.java    |   7 +
 .../user/loadbalancer/UploadSslCertCmd.java        |   8 +
 .../api/response/AcquireIPAddressResponse.java     | 286 +++++++
 .../api/response/AcquirePodIpCmdResponse.java      | 113 +++
 .../cloudstack/api/response/SslCertResponse.java   |   8 +
 .../cloudstack/api/response/SystemVmResponse.java  |  25 +-
 .../org/apache/cloudstack/network/tls/SslCert.java |   2 +-
 .../api/ExternalNetworkResourceUsageCommand.java   |   9 +
 .../api/NetScalerImplementNetworkCommand.java      |  65 ++
 .../api/StartupExternalLoadBalancerCommand.java    |   3 +
 .../api/routing/HealthCheckLBConfigCommand.java    |   8 +-
 .../service/NetworkOrchestrationService.java       |  18 +-
 .../service/VolumeOrchestrationService.java        |   6 +-
 .../src/com/cloud/network/IpAddressManager.java    |  81 +-
 .../com/cloud/vm/VirtualMachineManagerImpl.java    |   3 +-
 .../com/cloud/dc/dao/DataCenterIpAddressDao.java   |   2 +
 .../cloud/dc/dao/DataCenterIpAddressDaoImpl.java   |  13 +
 engine/schema/src/com/cloud/dc/dao/HostPodDao.java |   2 +
 .../src/com/cloud/dc/dao/HostPodDaoImpl.java       |   8 +
 .../schema/src/com/cloud/host/dao/HostDaoImpl.java |   2 +-
 .../src/com/cloud/network/dao/NetworkDao.java      |   2 +
 .../src/com/cloud/network/dao/NetworkDaoImpl.java  |  16 +-
 .../src/com/cloud/network/dao/SslCertVO.java       |  11 +-
 .../src/com/cloud/offerings/NetworkOfferingVO.java |  12 +
 .../cloud/offerings/dao/NetworkOfferingDao.java    |   3 +
 .../offerings/dao/NetworkOfferingDaoImpl.java      |  32 +
 .../src/com/cloud/hypervisor/guru/VMwareGuru.java  |   4 +
 .../hypervisor/vmware/resource/VmwareResource.java |  10 +
 .../xenserver/resource/CitrixResourceBase.java     |  16 +-
 .../wrapper/xenbase/CitrixStartCommandWrapper.java |   1 -
 plugins/network-elements/netscaler/pom.xml         |   5 +
 .../netscaler/spring-netscaler-context.xml         |   5 +-
 .../commands/DeleteNetscalerControlCenterCmd.java  |  95 +++
 .../commands/DeleteNetscalerLoadBalancerCmd.java   |   2 +-
 .../commands/DeleteServicePackageOfferingCmd.java  |  92 ++
 ...BalancerCmd.java => DeployNetscalerVpxCmd.java} |  87 +-
 .../commands/ListNetscalerControlCenterCmd.java    |  93 +++
 .../commands/ListRegisteredServicePackageCmd.java  |  81 ++
 ...java => RegisterNetscalerControlCenterCmd.java} |  76 +-
 ...ncerCmd.java => RegisterServicePackageCmd.java} |  76 +-
 .../com/cloud/api/commands/StopNetScalerVMCmd.java | 132 +++
 .../response/NetScalerServicePackageResponse.java  |  73 ++
 .../response/NetscalerControlCenterResponse.java   |  98 +++
 .../cloud/network/NetScalerControlCenterVO.java    | 127 +++
 .../cloud/network/NetScalerServicePackageVO.java   | 105 +++
 .../network/dao/NetScalerControlCenterDao.java     |  15 +-
 .../network/dao/NetScalerControlCenterDaoImpl.java |  26 +-
 .../network/dao/NetScalerServicePackageDao.java    |  19 +-
 .../dao/NetScalerServicePackageDaoImpl.java        |  67 ++
 .../cloud/network/element/NetscalerElement.java    | 694 +++++++++++++---
 .../NetscalerLoadBalancerElementService.java       |  75 +-
 .../resource/NetScalerControlCenterResource.java   | 924 +++++++++++++++++++++
 .../com/cloud/network/vm/NetScalerVMManager.java   |  42 +
 .../cloud/network/vm/NetScalerVMManagerImpl.java   | 448 ++++++++++
 server/src/com/cloud/alert/AlertManagerImpl.java   | 208 ++---
 server/src/com/cloud/api/ApiResponseHelper.java    |   6 +-
 server/src/com/cloud/configuration/Config.java     |   9 +-
 .../configuration/ConfigurationManagerImpl.java    |  39 +-
 .../com/cloud/hypervisor/HypervisorGuruBase.java   |   4 +
 .../network/ExternalDeviceUsageManagerImpl.java    |  40 +-
 .../ExternalLoadBalancerDeviceManagerImpl.java     | 104 ++-
 .../com/cloud/network/IpAddressManagerImpl.java    | 578 +++++++------
 .../src/com/cloud/network/NetworkServiceImpl.java  |  25 +
 .../network/lb/LoadBalancingRulesManagerImpl.java  |  14 +-
 .../src/com/cloud/server/ManagementServerImpl.java |   5 +
 server/src/com/cloud/server/StatsCollector.java    |   1 +
 .../cloudstack/network/ssl/CertServiceImpl.java    |   4 +-
 .../ExternalLoadBalancerDeviceManagerImplTest.java |  19 +-
 .../test/com/cloud/vpc/MockNetworkManagerImpl.java |  12 +
 .../test/com/cloud/vpc/dao/MockNetworkDaoImpl.java | 153 +---
 setup/db/db/schema-4930to41000.sql                 |  25 +-
 .../component/test_ncc_integration_dedicated.py    | 269 ++++++
 .../component/test_ncc_integration_shared.py       | 323 +++++++
 tools/apidoc/gen_toc.py                            |  10 +
 tools/marvin/marvin/config/test_data.py            |  48 ++
 tools/marvin/marvin/lib/base.py                    |  21 +
 tools/marvin/marvin/lib/ncc.py                     | 317 +++++++
 ui/index.html                                      |   1 +
 ui/l10n/en.js                                      |  24 +
 ui/scripts/accounts.js                             | 193 +++++
 ui/scripts/configuration.js                        |  93 ++-
 ui/scripts/docs.js                                 |   4 +
 ui/scripts/lbCertificatePolicy.js                  | 183 ++++
 ui/scripts/network.js                              | 349 ++++----
 ui/scripts/regions.js                              | 222 +++++
 ui/scripts/system.js                               |  63 +-
 98 files changed, 6859 insertions(+), 1033 deletions(-)
 create mode 100644 
api/src/org/apache/cloudstack/api/command/admin/address/AcquirePodIpCmdByAdmin.java
 create mode 100644 
api/src/org/apache/cloudstack/api/command/admin/address/ReleasePodIpCmdByAdmin.java
 create mode 100644 
api/src/org/apache/cloudstack/api/response/AcquireIPAddressResponse.java
 create mode 100644 
api/src/org/apache/cloudstack/api/response/AcquirePodIpCmdResponse.java
 create mode 100644 
core/src/com/cloud/agent/api/NetScalerImplementNetworkCommand.java
 create mode 100644 
plugins/network-elements/netscaler/src/com/cloud/api/commands/DeleteNetscalerControlCenterCmd.java
 create mode 100644 
plugins/network-elements/netscaler/src/com/cloud/api/commands/DeleteServicePackageOfferingCmd.java
 copy 
plugins/network-elements/netscaler/src/com/cloud/api/commands/{DeleteNetscalerLoadBalancerCmd.java
 => DeployNetscalerVpxCmd.java} (52%)
 create mode 100644 
plugins/network-elements/netscaler/src/com/cloud/api/commands/ListNetscalerControlCenterCmd.java
 create mode 100644 
plugins/network-elements/netscaler/src/com/cloud/api/commands/ListRegisteredServicePackageCmd.java
 copy 
plugins/network-elements/netscaler/src/com/cloud/api/commands/{DeleteNetscalerLoadBalancerCmd.java
 => RegisterNetscalerControlCenterCmd.java} (58%)
 copy 
plugins/network-elements/netscaler/src/com/cloud/api/commands/{DeleteNetscalerLoadBalancerCmd.java
 => RegisterServicePackageCmd.java} (51%)
 create mode 100644 
plugins/network-elements/netscaler/src/com/cloud/api/commands/StopNetScalerVMCmd.java
 create mode 100644 
plugins/network-elements/netscaler/src/com/cloud/api/response/NetScalerServicePackageResponse.java
 create mode 100644 
plugins/network-elements/netscaler/src/com/cloud/api/response/NetscalerControlCenterResponse.java
 create mode 100644 
plugins/network-elements/netscaler/src/com/cloud/network/NetScalerControlCenterVO.java
 create mode 100644 
plugins/network-elements/netscaler/src/com/cloud/network/NetScalerServicePackageVO.java
 copy core/src/com/cloud/agent/api/StartupExternalLoadBalancerCommand.java => 
plugins/network-elements/netscaler/src/com/cloud/network/dao/NetScalerControlCenterDao.java
 (68%)
 copy engine/schema/src/com/cloud/dc/dao/HostPodDao.java => 
plugins/network-elements/netscaler/src/com/cloud/network/dao/NetScalerControlCenterDaoImpl.java
 (58%)
 copy api/src/com/cloud/network/VirtualRouterProvider.java => 
plugins/network-elements/netscaler/src/com/cloud/network/dao/NetScalerServicePackageDao.java
 (66%)
 create mode 100644 
plugins/network-elements/netscaler/src/com/cloud/network/dao/NetScalerServicePackageDaoImpl.java
 create mode 100644 
plugins/network-elements/netscaler/src/com/cloud/network/resource/NetScalerControlCenterResource.java
 create mode 100644 
plugins/network-elements/netscaler/src/com/cloud/network/vm/NetScalerVMManager.java
 create mode 100644 
plugins/network-elements/netscaler/src/com/cloud/network/vm/NetScalerVMManagerImpl.java
 create mode 100755 test/integration/component/test_ncc_integration_dedicated.py
 create mode 100755 test/integration/component/test_ncc_integration_shared.py
 create mode 100755 tools/marvin/marvin/lib/ncc.py
 create mode 100644 ui/scripts/lbCertificatePolicy.js
 mode change 100755 => 100644 ui/scripts/network.js
 mode change 100644 => 100755 ui/scripts/system.js

-- 
To stop receiving notification emails like this one, please contact
['"commits@cloudstack.apache.org" <commits@cloudstack.apache.org>'].

Reply via email to