mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
Allow security policies to apply on port groups: - Accepts security policies while creating network offering - Deployed network will have security policies from the network offering applied on the port group (in vmware environment) - Global settings as fallback when security policies are not defined for a network offering - Default promiscuous mode security policy set to REJECT as it's the default for standard/default vswitch Portgroup vlan-trunking options for dvswitch: This allows admins to define a network with comma separated vlan id and vlan range such as vlan://200-400,21,30-50 and use the provided vlan range to configure vlan-trunking for a portgroup in dvswitch based environment. VLAN overlap checks are performed for: - isolated network against existing shared and isolated networks - dedicated vlan ranges for the physical/public network for the zone - shared network against existing isolated network Allow shared networks to bypass vlan overlap checks: This allows admins to create shared networks with a `bypassvlanoverlapcheck` API flag which when set to 'true' will create a shared network without performing vlan overlap checks against isolated network and against the vlans allocated to the datacenter's physical network (vlan ranges). Notes: - No vlan-range overlap checks are performed when creating shared networks - Multiple vlan id/ranges should include the vlan:// scheme prefix Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
125 lines
5.4 KiB
Java
125 lines
5.4 KiB
Java
// Licensed to the Apache Software Foundation (ASF) under one
|
|
// or more contributor license agreements. See the NOTICE file
|
|
// distributed with this work for additional information
|
|
// regarding copyright ownership. The ASF licenses this file
|
|
// to you under the Apache License, Version 2.0 (the
|
|
// "License"); you may not use this file except in compliance
|
|
// with the License. You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing,
|
|
// software distributed under the License is distributed on an
|
|
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
|
// KIND, either express or implied. See the License for the
|
|
// specific language governing permissions and limitations
|
|
// under the License.
|
|
package com.cloud.network;
|
|
|
|
import com.cloud.dc.Vlan;
|
|
import com.cloud.network.Networks.BroadcastDomainType;
|
|
import com.cloud.network.Networks.IsolationType;
|
|
import com.cloud.utils.exception.CloudRuntimeException;
|
|
import org.junit.Assert;
|
|
import org.junit.Before;
|
|
import org.junit.Test;
|
|
|
|
import java.net.URI;
|
|
import java.net.URISyntaxException;
|
|
|
|
/**
|
|
* @author dhoogland
|
|
*
|
|
*/
|
|
public class NetworksTest {
|
|
|
|
@Before
|
|
public void setUp() {
|
|
}
|
|
|
|
@Test
|
|
public void emptyBroadcastDomainTypeTest() throws URISyntaxException {
|
|
BroadcastDomainType type = BroadcastDomainType.getTypeOf("");
|
|
Assert.assertEquals("an empty uri should mean a broadcasttype of undecided", BroadcastDomainType.UnDecided, type);
|
|
}
|
|
|
|
@Test
|
|
public void vlanCommaSeparatedTest() throws URISyntaxException {
|
|
Assert.assertEquals(BroadcastDomainType.getValue(new URI("vlan://100")), "100");
|
|
Assert.assertEquals(BroadcastDomainType.getValue(new URI("vlan://100-200")), "100-200");
|
|
Assert.assertEquals(BroadcastDomainType.getValue(new URI("vlan://10-50,12,11,112-170")), "10-50,12,11,112-170");
|
|
}
|
|
|
|
@Test
|
|
public void vlanBroadcastDomainTypeTest() throws URISyntaxException {
|
|
String uri1 = "vlan://1";
|
|
Long value2 = 2L;
|
|
String uri2 = BroadcastDomainType.Vlan.toUri(value2).toString();
|
|
BroadcastDomainType type1 = BroadcastDomainType.getTypeOf(uri1);
|
|
String id1 = BroadcastDomainType.getValue(uri1);
|
|
String id2 = BroadcastDomainType.getValue(uri2);
|
|
Assert.assertEquals("uri1 should be of broadcasttype vlan", BroadcastDomainType.Vlan, type1);
|
|
Assert.assertEquals("id1 should be \"1\"", "1", id1);
|
|
Assert.assertEquals("id2 should be \"2\"", "2", id2);
|
|
}
|
|
|
|
@Test
|
|
public void vlanValueTest() throws URISyntaxException {
|
|
String uri1 = "vlan://1";
|
|
String uri2 = "1";
|
|
String vtag = BroadcastDomainType.Vlan.getValueFrom(BroadcastDomainType.fromString(uri1));
|
|
Assert.assertEquals("vtag should be \"1\"", "1", vtag);
|
|
BroadcastDomainType tiep1 = BroadcastDomainType.getTypeOf(uri1);
|
|
Assert.assertEquals("the type of uri1 should be 'Vlan'", BroadcastDomainType.Vlan, tiep1);
|
|
BroadcastDomainType tiep2 = BroadcastDomainType.getTypeOf(uri2);
|
|
Assert.assertEquals("the type of uri1 should be 'Undecided'", BroadcastDomainType.UnDecided, tiep2);
|
|
BroadcastDomainType tiep3 = BroadcastDomainType.getTypeOf(Vlan.UNTAGGED);
|
|
Assert.assertEquals("the type of uri1 should be 'vlan'", BroadcastDomainType.Native, tiep3);
|
|
}
|
|
|
|
@Test
|
|
public void vlanIsolationTypeTest() throws URISyntaxException {
|
|
String uri1 = "vlan://1";
|
|
Long value2 = 2L;
|
|
String uri2 = IsolationType.Vlan.toUri(value2).toString();
|
|
Assert.assertEquals("id1 should be \"vlan://1\"", "vlan://1", uri1);
|
|
Assert.assertEquals("id2 should be \"vlan://2\"", "vlan://2", uri2);
|
|
}
|
|
|
|
@Test
|
|
public void otherTypesTest() throws URISyntaxException {
|
|
String bogeyUri = "lswitch://0";
|
|
String uri1 = "lswitch:1";
|
|
String uri2 = "mido://2";
|
|
BroadcastDomainType type = BroadcastDomainType.getTypeOf(bogeyUri);
|
|
String id = BroadcastDomainType.getValue(bogeyUri);
|
|
Assert.assertEquals("uri0 should be of broadcasttype vlan", BroadcastDomainType.Lswitch, type);
|
|
Assert.assertEquals("id0 should be \"//0\"", "//0", id);
|
|
type = BroadcastDomainType.getTypeOf(uri1);
|
|
id = BroadcastDomainType.getValue(uri1);
|
|
Assert.assertEquals("uri1 should be of broadcasttype vlan", BroadcastDomainType.Lswitch, type);
|
|
Assert.assertEquals("id1 should be \"1\"", "1", id);
|
|
type = BroadcastDomainType.getTypeOf(uri2);
|
|
id = BroadcastDomainType.getValue(uri2);
|
|
Assert.assertEquals("uri2 should be of broadcasttype vlan", BroadcastDomainType.Mido, type);
|
|
Assert.assertEquals("id2 should be \"2\"", "2", id);
|
|
}
|
|
|
|
@Test
|
|
public void invalidTypesTest() throws URISyntaxException {
|
|
String uri1 = "https://1";
|
|
String uri2 = "bla:0";
|
|
BroadcastDomainType type = BroadcastDomainType.getTypeOf(uri1);
|
|
try {
|
|
/* URI result = */BroadcastDomainType.fromString(uri1);
|
|
} catch (CloudRuntimeException e) {
|
|
Assert.assertEquals("unexpected parameter exception", "string 'https://1' has an unknown BroadcastDomainType.", e.getMessage());
|
|
}
|
|
try {
|
|
/* URI result = */BroadcastDomainType.fromString(uri2);
|
|
} catch (CloudRuntimeException e) {
|
|
Assert.assertEquals("unexpected parameter exception", "string 'bla:0' has an unknown BroadcastDomainType.", e.getMessage());
|
|
}
|
|
}
|
|
}
|