api_refactor: usage apis to admin.usage pkg

Signed-off-by: Rohit Yadav <[email protected]>


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/e07106db
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/e07106db
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/e07106db

Branch: refs/heads/api_refactoring
Commit: e07106db0bada572912f6f114589d86a553199b0
Parents: 0bbe82e
Author: Rohit Yadav <[email protected]>
Authored: Wed Dec 5 14:31:31 2012 -0800
Committer: Rohit Yadav <[email protected]>
Committed: Wed Dec 5 14:31:31 2012 -0800

----------------------------------------------------------------------
 .../commands/ListTrafficTypeImplementorsCmd.java   |   86 -----------
 .../cloud/api/commands/UpdateTrafficTypeCmd.java   |  117 ---------------
 api/src/com/cloud/network/NetworkService.java      |    2 +-
 .../command/ListTrafficTypeImplementorsCmd.java    |   86 +++++++++++
 .../admin/usage/command/UpdateTrafficTypeCmd.java  |  117 +++++++++++++++
 client/tomcatconf/commands.properties.in           |    4 +-
 .../src/com/cloud/network/NetworkManagerImpl.java  |    2 +-
 .../com/cloud/network/MockNetworkManagerImpl.java  |    2 +-
 .../test/com/cloud/vpc/MockNetworkManagerImpl.java |    2 +-
 9 files changed, 209 insertions(+), 209 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e07106db/api/src/com/cloud/api/commands/ListTrafficTypeImplementorsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/commands/ListTrafficTypeImplementorsCmd.java 
b/api/src/com/cloud/api/commands/ListTrafficTypeImplementorsCmd.java
deleted file mode 100755
index ed1ec43..0000000
--- a/api/src/com/cloud/api/commands/ListTrafficTypeImplementorsCmd.java
+++ /dev/null
@@ -1,86 +0,0 @@
-// 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.api.commands;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.log4j.Logger;
-
-import org.apache.cloudstack.api.ApiConstants;
-import org.apache.cloudstack.api.BaseListCmd;
-import org.apache.cloudstack.api.Implementation;
-import org.apache.cloudstack.api.Parameter;
-import org.apache.cloudstack.api.ServerApiException;
-import com.cloud.api.response.ListResponse;
-import com.cloud.api.response.TrafficTypeImplementorResponse;
-import com.cloud.exception.ConcurrentOperationException;
-import com.cloud.exception.InsufficientCapacityException;
-import com.cloud.exception.ResourceAllocationException;
-import com.cloud.exception.ResourceUnavailableException;
-import com.cloud.network.Networks.TrafficType;
-import com.cloud.user.Account;
-import com.cloud.utils.Pair;
-
-@Implementation(description="Lists implementors of implementor of a network 
traffic type or implementors of all network traffic types", 
responseObject=TrafficTypeImplementorResponse.class, since="3.0.0")
-public class ListTrafficTypeImplementorsCmd extends BaseListCmd {
-    public static final Logger s_logger = 
Logger.getLogger(ListTrafficTypeImplementorsCmd.class);
-    private static final String _name = "listtraffictypeimplementorsresponse";
-
-    /////////////////////////////////////////////////////
-    //////////////// API parameters /////////////////////
-    /////////////////////////////////////////////////////
-    @Parameter(name=ApiConstants.TRAFFIC_TYPE, type=CommandType.STRING, 
description="Optional. The network traffic type, if specified, return its 
implementor. Otherwise, return all traffic types with their implementor")
-    private String trafficType;
-
-    /////////////////////////////////////////////////////
-    /////////////////// Accessors ///////////////////////
-    /////////////////////////////////////////////////////
-
-    public String getTrafficType() {
-        return trafficType;
-    }
-
-    @Override
-    public void execute() throws ResourceUnavailableException, 
InsufficientCapacityException, ServerApiException, ConcurrentOperationException,
-            ResourceAllocationException {
-        List<Pair<TrafficType, String>> results = 
_networkService.listTrafficTypeImplementor(this);
-        ListResponse<TrafficTypeImplementorResponse> response = new 
ListResponse<TrafficTypeImplementorResponse>();
-        List<TrafficTypeImplementorResponse> responses= new 
ArrayList<TrafficTypeImplementorResponse>();
-        for (Pair<TrafficType, String> r : results) {
-            TrafficTypeImplementorResponse p = new 
TrafficTypeImplementorResponse();
-            p.setTrafficType(r.first().toString());
-            p.setImplementor(r.second());
-            p.setObjectName("traffictypeimplementorresponse");
-            responses.add(p);
-        }
-
-        response.setResponses(responses);
-        response.setResponseName(getCommandName());
-        this.setResponseObject(response);
-    }
-
-    @Override
-    public long getEntityOwnerId() {
-        return Account.ACCOUNT_ID_SYSTEM;
-    }
-
-    @Override
-    public String getCommandName() {
-        return _name;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e07106db/api/src/com/cloud/api/commands/UpdateTrafficTypeCmd.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/commands/UpdateTrafficTypeCmd.java 
b/api/src/com/cloud/api/commands/UpdateTrafficTypeCmd.java
deleted file mode 100644
index 2a24372..0000000
--- a/api/src/com/cloud/api/commands/UpdateTrafficTypeCmd.java
+++ /dev/null
@@ -1,117 +0,0 @@
-// 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.api.commands;
-
-import org.apache.log4j.Logger;
-
-import org.apache.cloudstack.api.ApiConstants;
-import org.apache.cloudstack.api.BaseAsyncCmd;
-import org.apache.cloudstack.api.BaseCmd;
-import org.apache.cloudstack.api.IdentityMapper;
-import org.apache.cloudstack.api.Implementation;
-import org.apache.cloudstack.api.Parameter;
-import org.apache.cloudstack.api.ServerApiException;
-import com.cloud.api.response.TrafficTypeResponse;
-import com.cloud.async.AsyncJob;
-import com.cloud.event.EventTypes;
-import com.cloud.network.PhysicalNetworkTrafficType;
-import com.cloud.user.Account;
-
-@Implementation(description="Updates traffic type of a physical network", 
responseObject=TrafficTypeResponse.class, since="3.0.0")
-public class UpdateTrafficTypeCmd extends BaseAsyncCmd {
-    public static final Logger s_logger = 
Logger.getLogger(UpdateTrafficTypeCmd.class.getName());
-
-    private static final String s_name = "updatetraffictyperesponse";
-
-    /////////////////////////////////////////////////////
-    //////////////// API parameters /////////////////////
-    /////////////////////////////////////////////////////
-
-    @IdentityMapper(entityTableName="physical_network_traffic_types")
-    @Parameter(name=ApiConstants.ID, type=CommandType.LONG, required=true, 
description="traffic type id")
-    private Long id;
-
-    @Parameter(name=ApiConstants.XEN_NETWORK_LABEL, type=CommandType.STRING, 
description="The network name label of the physical device dedicated to this 
traffic on a XenServer host")
-    private String xenLabel;
-
-    @Parameter(name=ApiConstants.KVM_NETWORK_LABEL, type=CommandType.STRING, 
description="The network name label of the physical device dedicated to this 
traffic on a KVM host")
-    private String kvmLabel;
-
-    @Parameter(name=ApiConstants.VMWARE_NETWORK_LABEL, 
type=CommandType.STRING, description="The network name label of the physical 
device dedicated to this traffic on a VMware host")
-    private String vmwareLabel;
-
-
-    /////////////////////////////////////////////////////
-    /////////////////// Accessors ///////////////////////
-    /////////////////////////////////////////////////////
-
-    public Long getId() {
-        return id;
-    }
-    public String getXenLabel() {
-        return xenLabel;
-    }
-
-    public String getKvmLabel() {
-        return kvmLabel;
-    }
-
-    public String getVmwareLabel() {
-        return vmwareLabel;
-    }
-
-    /////////////////////////////////////////////////////
-    /////////////// API Implementation///////////////////
-    /////////////////////////////////////////////////////
-
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
-    @Override
-    public long getEntityOwnerId() {
-        return Account.ACCOUNT_ID_SYSTEM;
-    }
-
-    @Override
-    public void execute(){
-        PhysicalNetworkTrafficType result = 
_networkService.updatePhysicalNetworkTrafficType(getId(), getXenLabel(), 
getKvmLabel(), getVmwareLabel());
-        if (result != null) {
-            TrafficTypeResponse response = 
_responseGenerator.createTrafficTypeResponse(result);
-            response.setResponseName(getCommandName());
-            this.setResponseObject(response);
-        }else {
-            throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to 
update traffic type");
-        }
-    }
-
-    @Override
-    public String getEventDescription() {
-        return  "Updating Traffic Type: " + getId();
-    }
-
-    @Override
-    public String getEventType() {
-        return EventTypes.EVENT_TRAFFIC_TYPE_UPDATE;
-    }
-
-    @Override
-    public AsyncJob.Type getInstanceType() {
-        return AsyncJob.Type.TrafficType;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e07106db/api/src/com/cloud/network/NetworkService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/NetworkService.java 
b/api/src/com/cloud/network/NetworkService.java
index b71b867..b5ba1e3 100755
--- a/api/src/com/cloud/network/NetworkService.java
+++ b/api/src/com/cloud/network/NetworkService.java
@@ -20,9 +20,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import 
org.apache.cloudstack.api.admin.usage.command.ListTrafficTypeImplementorsCmd;
 import org.apache.cloudstack.api.user.network.command.CreateNetworkCmd;
 import org.apache.cloudstack.api.user.network.command.ListNetworksCmd;
-import com.cloud.api.commands.ListTrafficTypeImplementorsCmd;
 import org.apache.cloudstack.api.user.network.command.RestartNetworkCmd;
 import com.cloud.exception.ConcurrentOperationException;
 import com.cloud.exception.InsufficientAddressCapacityException;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e07106db/api/src/org/apache/cloudstack/api/admin/usage/command/ListTrafficTypeImplementorsCmd.java
----------------------------------------------------------------------
diff --git 
a/api/src/org/apache/cloudstack/api/admin/usage/command/ListTrafficTypeImplementorsCmd.java
 
b/api/src/org/apache/cloudstack/api/admin/usage/command/ListTrafficTypeImplementorsCmd.java
new file mode 100755
index 0000000..1a7db85
--- /dev/null
+++ 
b/api/src/org/apache/cloudstack/api/admin/usage/command/ListTrafficTypeImplementorsCmd.java
@@ -0,0 +1,86 @@
+// 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 org.apache.cloudstack.api.admin.usage.command;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.log4j.Logger;
+
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseListCmd;
+import org.apache.cloudstack.api.Implementation;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
+import com.cloud.api.response.ListResponse;
+import com.cloud.api.response.TrafficTypeImplementorResponse;
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.exception.InsufficientCapacityException;
+import com.cloud.exception.ResourceAllocationException;
+import com.cloud.exception.ResourceUnavailableException;
+import com.cloud.network.Networks.TrafficType;
+import com.cloud.user.Account;
+import com.cloud.utils.Pair;
+
+@Implementation(description="Lists implementors of implementor of a network 
traffic type or implementors of all network traffic types", 
responseObject=TrafficTypeImplementorResponse.class, since="3.0.0")
+public class ListTrafficTypeImplementorsCmd extends BaseListCmd {
+    public static final Logger s_logger = 
Logger.getLogger(ListTrafficTypeImplementorsCmd.class);
+    private static final String _name = "listtraffictypeimplementorsresponse";
+
+    /////////////////////////////////////////////////////
+    //////////////// API parameters /////////////////////
+    /////////////////////////////////////////////////////
+    @Parameter(name=ApiConstants.TRAFFIC_TYPE, type=CommandType.STRING, 
description="Optional. The network traffic type, if specified, return its 
implementor. Otherwise, return all traffic types with their implementor")
+    private String trafficType;
+
+    /////////////////////////////////////////////////////
+    /////////////////// Accessors ///////////////////////
+    /////////////////////////////////////////////////////
+
+    public String getTrafficType() {
+        return trafficType;
+    }
+
+    @Override
+    public void execute() throws ResourceUnavailableException, 
InsufficientCapacityException, ServerApiException, ConcurrentOperationException,
+            ResourceAllocationException {
+        List<Pair<TrafficType, String>> results = 
_networkService.listTrafficTypeImplementor(this);
+        ListResponse<TrafficTypeImplementorResponse> response = new 
ListResponse<TrafficTypeImplementorResponse>();
+        List<TrafficTypeImplementorResponse> responses= new 
ArrayList<TrafficTypeImplementorResponse>();
+        for (Pair<TrafficType, String> r : results) {
+            TrafficTypeImplementorResponse p = new 
TrafficTypeImplementorResponse();
+            p.setTrafficType(r.first().toString());
+            p.setImplementor(r.second());
+            p.setObjectName("traffictypeimplementorresponse");
+            responses.add(p);
+        }
+
+        response.setResponses(responses);
+        response.setResponseName(getCommandName());
+        this.setResponseObject(response);
+    }
+
+    @Override
+    public long getEntityOwnerId() {
+        return Account.ACCOUNT_ID_SYSTEM;
+    }
+
+    @Override
+    public String getCommandName() {
+        return _name;
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e07106db/api/src/org/apache/cloudstack/api/admin/usage/command/UpdateTrafficTypeCmd.java
----------------------------------------------------------------------
diff --git 
a/api/src/org/apache/cloudstack/api/admin/usage/command/UpdateTrafficTypeCmd.java
 
b/api/src/org/apache/cloudstack/api/admin/usage/command/UpdateTrafficTypeCmd.java
new file mode 100644
index 0000000..cca4d3d
--- /dev/null
+++ 
b/api/src/org/apache/cloudstack/api/admin/usage/command/UpdateTrafficTypeCmd.java
@@ -0,0 +1,117 @@
+// 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 org.apache.cloudstack.api.admin.usage.command;
+
+import org.apache.log4j.Logger;
+
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseAsyncCmd;
+import org.apache.cloudstack.api.BaseCmd;
+import org.apache.cloudstack.api.IdentityMapper;
+import org.apache.cloudstack.api.Implementation;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
+import com.cloud.api.response.TrafficTypeResponse;
+import com.cloud.async.AsyncJob;
+import com.cloud.event.EventTypes;
+import com.cloud.network.PhysicalNetworkTrafficType;
+import com.cloud.user.Account;
+
+@Implementation(description="Updates traffic type of a physical network", 
responseObject=TrafficTypeResponse.class, since="3.0.0")
+public class UpdateTrafficTypeCmd extends BaseAsyncCmd {
+    public static final Logger s_logger = 
Logger.getLogger(UpdateTrafficTypeCmd.class.getName());
+
+    private static final String s_name = "updatetraffictyperesponse";
+
+    /////////////////////////////////////////////////////
+    //////////////// API parameters /////////////////////
+    /////////////////////////////////////////////////////
+
+    @IdentityMapper(entityTableName="physical_network_traffic_types")
+    @Parameter(name=ApiConstants.ID, type=CommandType.LONG, required=true, 
description="traffic type id")
+    private Long id;
+
+    @Parameter(name=ApiConstants.XEN_NETWORK_LABEL, type=CommandType.STRING, 
description="The network name label of the physical device dedicated to this 
traffic on a XenServer host")
+    private String xenLabel;
+
+    @Parameter(name=ApiConstants.KVM_NETWORK_LABEL, type=CommandType.STRING, 
description="The network name label of the physical device dedicated to this 
traffic on a KVM host")
+    private String kvmLabel;
+
+    @Parameter(name=ApiConstants.VMWARE_NETWORK_LABEL, 
type=CommandType.STRING, description="The network name label of the physical 
device dedicated to this traffic on a VMware host")
+    private String vmwareLabel;
+
+
+    /////////////////////////////////////////////////////
+    /////////////////// Accessors ///////////////////////
+    /////////////////////////////////////////////////////
+
+    public Long getId() {
+        return id;
+    }
+    public String getXenLabel() {
+        return xenLabel;
+    }
+
+    public String getKvmLabel() {
+        return kvmLabel;
+    }
+
+    public String getVmwareLabel() {
+        return vmwareLabel;
+    }
+
+    /////////////////////////////////////////////////////
+    /////////////// API Implementation///////////////////
+    /////////////////////////////////////////////////////
+
+    @Override
+    public String getCommandName() {
+        return s_name;
+    }
+
+    @Override
+    public long getEntityOwnerId() {
+        return Account.ACCOUNT_ID_SYSTEM;
+    }
+
+    @Override
+    public void execute(){
+        PhysicalNetworkTrafficType result = 
_networkService.updatePhysicalNetworkTrafficType(getId(), getXenLabel(), 
getKvmLabel(), getVmwareLabel());
+        if (result != null) {
+            TrafficTypeResponse response = 
_responseGenerator.createTrafficTypeResponse(result);
+            response.setResponseName(getCommandName());
+            this.setResponseObject(response);
+        }else {
+            throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to 
update traffic type");
+        }
+    }
+
+    @Override
+    public String getEventDescription() {
+        return  "Updating Traffic Type: " + getId();
+    }
+
+    @Override
+    public String getEventType() {
+        return EventTypes.EVENT_TRAFFIC_TYPE_UPDATE;
+    }
+
+    @Override
+    public AsyncJob.Type getInstanceType() {
+        return AsyncJob.Type.TrafficType;
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e07106db/client/tomcatconf/commands.properties.in
----------------------------------------------------------------------
diff --git a/client/tomcatconf/commands.properties.in 
b/client/tomcatconf/commands.properties.in
index 4731bfc..3df1ca6 100755
--- a/client/tomcatconf/commands.properties.in
+++ b/client/tomcatconf/commands.properties.in
@@ -360,8 +360,8 @@ 
updateNetworkServiceProvider=org.apache.cloudstack.api.admin.network.command.Upd
 
addTrafficType=org.apache.cloudstack.api.admin.usage.command.AddTrafficTypeCmd;1
 
deleteTrafficType=org.apache.cloudstack.api.admin.usage.command.DeleteTrafficTypeCmd;1
 
listTrafficTypes=org.apache.cloudstack.api.admin.usage.command.ListTrafficTypesCmd;1
-updateTrafficType=com.cloud.api.commands.UpdateTrafficTypeCmd;1
-listTrafficTypeImplementors=com.cloud.api.commands.ListTrafficTypeImplementorsCmd;1
+updateTrafficType=org.apache.cloudstack.api.admin.usage.command.UpdateTrafficTypeCmd;1
+listTrafficTypeImplementors=org.apache.cloudstack.api.admin.usage.command.ListTrafficTypeImplementorsCmd;1
 
 #### Storage Network commands
 
createStorageNetworkIpRange=org.apache.cloudstack.api.admin.network.command.CreateStorageNetworkIpRangeCmd;1

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e07106db/server/src/com/cloud/network/NetworkManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java 
b/server/src/com/cloud/network/NetworkManagerImpl.java
index a451141..542efa7 100755
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -40,6 +40,7 @@ import java.util.concurrent.TimeUnit;
 import javax.ejb.Local;
 import javax.naming.ConfigurationException;
 
+import 
org.apache.cloudstack.api.admin.usage.command.ListTrafficTypeImplementorsCmd;
 import org.apache.cloudstack.api.user.network.command.CreateNetworkCmd;
 import org.apache.log4j.Logger;
 
@@ -58,7 +59,6 @@ import com.cloud.agent.api.StartupRoutingCommand;
 import com.cloud.agent.api.to.NicTO;
 import com.cloud.alert.AlertManager;
 import org.apache.cloudstack.api.user.network.command.ListNetworksCmd;
-import com.cloud.api.commands.ListTrafficTypeImplementorsCmd;
 import org.apache.cloudstack.api.user.network.command.RestartNetworkCmd;
 import com.cloud.configuration.Config;
 import com.cloud.configuration.ConfigurationManager;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e07106db/server/test/com/cloud/network/MockNetworkManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/network/MockNetworkManagerImpl.java 
b/server/test/com/cloud/network/MockNetworkManagerImpl.java
index fef1eb0..99e491f 100755
--- a/server/test/com/cloud/network/MockNetworkManagerImpl.java
+++ b/server/test/com/cloud/network/MockNetworkManagerImpl.java
@@ -25,9 +25,9 @@ import javax.ejb.Local;
 import javax.naming.ConfigurationException;
 
 import com.cloud.acl.ControlledEntity.ACLType;
+import 
org.apache.cloudstack.api.admin.usage.command.ListTrafficTypeImplementorsCmd;
 import org.apache.cloudstack.api.user.network.command.CreateNetworkCmd;
 import org.apache.cloudstack.api.user.network.command.ListNetworksCmd;
-import com.cloud.api.commands.ListTrafficTypeImplementorsCmd;
 import org.apache.cloudstack.api.user.network.command.RestartNetworkCmd;
 import com.cloud.dc.DataCenter;
 import com.cloud.dc.Vlan;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e07106db/server/test/com/cloud/vpc/MockNetworkManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/vpc/MockNetworkManagerImpl.java 
b/server/test/com/cloud/vpc/MockNetworkManagerImpl.java
index 344b59e..8a7866e 100644
--- a/server/test/com/cloud/vpc/MockNetworkManagerImpl.java
+++ b/server/test/com/cloud/vpc/MockNetworkManagerImpl.java
@@ -25,12 +25,12 @@ import java.util.Set;
 import javax.ejb.Local;
 import javax.naming.ConfigurationException;
 
+import 
org.apache.cloudstack.api.admin.usage.command.ListTrafficTypeImplementorsCmd;
 import org.apache.cloudstack.api.user.network.command.ListNetworksCmd;
 import org.apache.log4j.Logger;
 
 import com.cloud.acl.ControlledEntity.ACLType;
 import org.apache.cloudstack.api.user.network.command.CreateNetworkCmd;
-import com.cloud.api.commands.ListTrafficTypeImplementorsCmd;
 import org.apache.cloudstack.api.user.network.command.RestartNetworkCmd;
 import com.cloud.dc.DataCenter;
 import com.cloud.dc.Vlan;

Reply via email to