Skip to content

Commit 3cbbe2b

Browse files
committed
RAT check broken by d6ed8d7. Fix
1 parent bf72a36 commit 3cbbe2b

1 file changed

Lines changed: 29 additions & 8 deletions

File tree

server/test/com/cloud/configuration/ConfigurationManagerTest.java

Lines changed: 29 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,36 @@
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+
118
package com.cloud.configuration;
219

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;
329
import java.util.ArrayList;
430
import java.util.List;
531
import java.util.UUID;
6-
import java.lang.reflect.Field;
32+
33+
import junit.framework.Assert;
734

835
import org.apache.cloudstack.api.command.admin.vlan.DedicatePublicIpRangeCmd;
936
import org.apache.cloudstack.api.command.admin.vlan.ReleasePublicIpRangeCmd;
@@ -15,10 +42,10 @@
1542

1643
import com.cloud.configuration.Resource.ResourceType;
1744
import com.cloud.dc.AccountVlanMapVO;
45+
import com.cloud.dc.DataCenter.NetworkType;
1846
import com.cloud.dc.DataCenterVO;
1947
import com.cloud.dc.Vlan;
2048
import com.cloud.dc.VlanVO;
21-
import com.cloud.dc.DataCenter.NetworkType;
2249
import com.cloud.dc.dao.AccountVlanMapDao;
2350
import com.cloud.dc.dao.DataCenterDao;
2451
import com.cloud.dc.dao.VlanDao;
@@ -36,12 +63,6 @@
3663
import com.cloud.utils.db.Transaction;
3764
import com.cloud.utils.net.Ip;
3865

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-
4566
public class ConfigurationManagerTest {
4667

4768
private static final Logger s_logger = Logger.getLogger(ConfigurationManagerTest.class);

0 commit comments

Comments
 (0)