|
| 1 | +// Licensed to the Apache Software Foundation (ASF) under one |
| 2 | +// or more contributor license agreements. See the NOTICE file |
| 3 | +// distributed with this work for additional information |
| 4 | +// regarding copyright ownership. The ASF licenses this file |
| 5 | +// to you under the Apache License, Version 2.0 (the |
| 6 | +// "License"); you may not use this file except in compliance |
| 7 | +// with the License. You may obtain a copy of the License at |
| 8 | +// |
| 9 | +// http://www.apache.org/licenses/LICENSE-2.0 |
| 10 | +// |
| 11 | +// Unless required by applicable law or agreed to in writing, |
| 12 | +// software distributed under the License is distributed on an |
| 13 | +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY |
| 14 | +// KIND, either express or implied. See the License for the |
| 15 | +// specific language governing permissions and limitations |
| 16 | +// under the License. |
| 17 | + |
1 | 18 | package com.cloud.configuration; |
2 | 19 |
|
| 20 | +import static org.mockito.Matchers.any; |
| 21 | +import static org.mockito.Matchers.anyBoolean; |
| 22 | +import static org.mockito.Matchers.anyInt; |
| 23 | +import static org.mockito.Matchers.anyLong; |
| 24 | +import static org.mockito.Matchers.anyString; |
| 25 | +import static org.mockito.Mockito.doNothing; |
| 26 | +import static org.mockito.Mockito.when; |
| 27 | + |
| 28 | +import java.lang.reflect.Field; |
3 | 29 | import java.util.ArrayList; |
4 | 30 | import java.util.List; |
5 | 31 | import java.util.UUID; |
6 | | -import java.lang.reflect.Field; |
| 32 | + |
| 33 | +import junit.framework.Assert; |
7 | 34 |
|
8 | 35 | import org.apache.cloudstack.api.command.admin.vlan.DedicatePublicIpRangeCmd; |
9 | 36 | import org.apache.cloudstack.api.command.admin.vlan.ReleasePublicIpRangeCmd; |
|
15 | 42 |
|
16 | 43 | import com.cloud.configuration.Resource.ResourceType; |
17 | 44 | import com.cloud.dc.AccountVlanMapVO; |
| 45 | +import com.cloud.dc.DataCenter.NetworkType; |
18 | 46 | import com.cloud.dc.DataCenterVO; |
19 | 47 | import com.cloud.dc.Vlan; |
20 | 48 | import com.cloud.dc.VlanVO; |
21 | | -import com.cloud.dc.DataCenter.NetworkType; |
22 | 49 | import com.cloud.dc.dao.AccountVlanMapDao; |
23 | 50 | import com.cloud.dc.dao.DataCenterDao; |
24 | 51 | import com.cloud.dc.dao.VlanDao; |
|
36 | 63 | import com.cloud.utils.db.Transaction; |
37 | 64 | import com.cloud.utils.net.Ip; |
38 | 65 |
|
39 | | -import junit.framework.Assert; |
40 | | - |
41 | | -import static org.mockito.Matchers.*; |
42 | | -import static org.mockito.Mockito.when; |
43 | | -import static org.mockito.Mockito.doNothing; |
44 | | - |
45 | 66 | public class ConfigurationManagerTest { |
46 | 67 |
|
47 | 68 | private static final Logger s_logger = Logger.getLogger(ConfigurationManagerTest.class); |
|
0 commit comments