[cloudstack] branch 4.14 updated (ca1e02f -> 1efe6e2)

[ro...@apache.org]

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

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


    from ca1e02f  vmware: search unmanaged instances using hypervisor name (#4328)
     add d6152b3  server: Broadcast URI not set to vxlan, but vlan (Fix #3040) (#4190)
     new 1efe6e2  Merge remote-tracking branch 'origin/4.13' into 4.14

The 1 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/main/java/com/cloud/network/Networks.java  | 49 ++++++++++----
 .../engine/orchestration/NetworkOrchestrator.java  | 23 ++++++-
 .../orchestration/NetworkOrchestratorTest.java     | 74 ++++++++++++++++++++++
 3 files changed, 131 insertions(+), 15 deletions(-)

[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.13' into 4.14

[ro...@apache.org]

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

rohit pushed a commit to branch 4.14
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit 1efe6e2df06a9fb6ff12b86b966724e6f224ed45
Merge: ca1e02f d6152b3
Author: Rohit Yadav <ro...@shapeblue.com>
AuthorDate: Thu Sep 24 12:13:23 2020 +0530

    Merge remote-tracking branch 'origin/4.13' into 4.14
    
    Signed-off-by: Rohit Yadav <ro...@shapeblue.com>

 api/src/main/java/com/cloud/network/Networks.java  | 49 ++++++++++----
 .../engine/orchestration/NetworkOrchestrator.java  | 23 ++++++-
 .../orchestration/NetworkOrchestratorTest.java     | 74 ++++++++++++++++++++++
 3 files changed, 131 insertions(+), 15 deletions(-)

diff --cc engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
index ab2d8f3,c49da14..804775a
--- a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
+++ b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
@@@ -2311,9 -2279,7 +2311,9 @@@ public class NetworkOrchestrator extend
          }
  
          if (vlanSpecified) {
-             URI uri = BroadcastDomainType.fromString(vlanId);
+             URI uri = encodeVlanIdIntoBroadcastUri(vlanId, pNtwk);
 +            // Aux: generate secondary URI for secondary VLAN ID (if provided) for performing checks
 +            URI secondaryUri = isNotBlank(isolatedPvlan) ? BroadcastDomainType.fromString(isolatedPvlan) : null;
              //don't allow to specify vlan tag used by physical network for dynamic vlan allocation
              if (!(bypassVlanOverlapCheck && ntwkOff.getGuestType() == GuestType.Shared) && _dcDao.findVnet(zoneId, pNtwk.getId(), BroadcastDomainType.getValue(uri)).size() > 0) {
                  throw new InvalidParameterValueException("The VLAN tag " + vlanId + " is already being used for dynamic vlan allocation for the guest network in zone "