From 2121fbd4698342bd5b14f9b5ec086a541d259dd8 Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Tue, 4 Dec 2012 11:38:40 -0800 Subject: [PATCH] api_refactor: refactor network apis for admin pkg Signed-off-by: Rohit Yadav --- .../configuration/ConfigurationService.java | 6 ++-- .../cloud/network/StorageNetworkService.java | 8 +++--- .../AddNetworkServiceProviderCmd.java | 2 +- .../command}/CreateNetworkOfferingCmd.java | 2 +- .../command}/DeleteNetworkOfferingCmd.java | 2 +- .../DeleteNetworkServiceProviderCmd.java | 2 +- .../command}/DeletePhysicalNetworkCmd.java | 2 +- .../DeleteStorageNetworkIpRangeCmd.java | 2 +- .../ListNetworkServiceProvidersCmd.java | 2 +- .../command}/ListPhysicalNetworksCmd.java | 2 +- .../ListSupportedNetworkServicesCmd.java | 2 +- .../command}/UpdateNetworkOfferingCmd.java | 2 +- .../UpdateNetworkServiceProviderCmd.java | 2 +- .../command}/UpdatePhysicalNetworkCmd.java | 2 +- .../UpdateStorageNetworkIpRangeCmd.java | 2 +- .../listStorageNetworkIpRangeCmd.java | 6 ++-- .../network/command/DeleteNetworkCmd.java | 2 +- .../AddNetworkServiceProviderCmdTest.java | 2 +- client/tomcatconf/commands.properties.in | 28 +++++++++---------- .../ConfigurationManagerImpl.java | 6 ++-- .../network/StorageNetworkManagerImpl.java | 8 +++--- .../vpc/MockConfigurationManagerImpl.java | 6 ++-- 22 files changed, 49 insertions(+), 49 deletions(-) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/admin/network/command}/AddNetworkServiceProviderCmd.java (98%) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/admin/network/command}/CreateNetworkOfferingCmd.java (99%) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/admin/network/command}/DeleteNetworkOfferingCmd.java (98%) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/admin/network/command}/DeleteNetworkServiceProviderCmd.java (98%) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/admin/network/command}/DeletePhysicalNetworkCmd.java (98%) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/admin/network/command}/DeleteStorageNetworkIpRangeCmd.java (98%) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/admin/network/command}/ListNetworkServiceProvidersCmd.java (98%) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/admin/network/command}/ListPhysicalNetworksCmd.java (98%) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/admin/network/command}/ListSupportedNetworkServicesCmd.java (98%) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/admin/network/command}/UpdateNetworkOfferingCmd.java (98%) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/admin/network/command}/UpdateNetworkServiceProviderCmd.java (98%) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/admin/network/command}/UpdatePhysicalNetworkCmd.java (98%) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/admin/network/command}/UpdateStorageNetworkIpRangeCmd.java (98%) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/admin/network/command}/listStorageNetworkIpRangeCmd.java (96%) diff --git a/api/src/com/cloud/configuration/ConfigurationService.java b/api/src/com/cloud/configuration/ConfigurationService.java index 098d2800e62..c27e6c7c57d 100644 --- a/api/src/com/cloud/configuration/ConfigurationService.java +++ b/api/src/com/cloud/configuration/ConfigurationService.java @@ -21,12 +21,12 @@ import java.util.List; import javax.naming.NamingException; import com.cloud.api.commands.CreateDiskOfferingCmd; -import com.cloud.api.commands.CreateNetworkOfferingCmd; +import org.apache.cloudstack.api.admin.network.command.CreateNetworkOfferingCmd; import com.cloud.api.commands.CreateServiceOfferingCmd; import com.cloud.api.commands.CreateVlanIpRangeCmd; import com.cloud.api.commands.CreateZoneCmd; import com.cloud.api.commands.DeleteDiskOfferingCmd; -import com.cloud.api.commands.DeleteNetworkOfferingCmd; +import org.apache.cloudstack.api.admin.network.command.DeleteNetworkOfferingCmd; import com.cloud.api.commands.DeletePodCmd; import com.cloud.api.commands.DeleteServiceOfferingCmd; import com.cloud.api.commands.DeleteVlanIpRangeCmd; @@ -36,7 +36,7 @@ import com.cloud.api.commands.LDAPRemoveCmd; import org.apache.cloudstack.api.user.network.command.ListNetworkOfferingsCmd; import com.cloud.api.commands.UpdateCfgCmd; import com.cloud.api.commands.UpdateDiskOfferingCmd; -import com.cloud.api.commands.UpdateNetworkOfferingCmd; +import org.apache.cloudstack.api.admin.network.command.UpdateNetworkOfferingCmd; import com.cloud.api.commands.UpdatePodCmd; import com.cloud.api.commands.UpdateServiceOfferingCmd; import com.cloud.api.commands.UpdateZoneCmd; diff --git a/api/src/com/cloud/network/StorageNetworkService.java b/api/src/com/cloud/network/StorageNetworkService.java index 86a8352316a..1cc92ede0c7 100755 --- a/api/src/com/cloud/network/StorageNetworkService.java +++ b/api/src/com/cloud/network/StorageNetworkService.java @@ -20,9 +20,9 @@ import java.sql.SQLException; import java.util.List; import com.cloud.api.commands.CreateStorageNetworkIpRangeCmd; -import com.cloud.api.commands.DeleteStorageNetworkIpRangeCmd; -import com.cloud.api.commands.UpdateStorageNetworkIpRangeCmd; -import com.cloud.api.commands.listStorageNetworkIpRangeCmd; +import org.apache.cloudstack.api.admin.network.command.DeleteStorageNetworkIpRangeCmd; +import org.apache.cloudstack.api.admin.network.command.UpdateStorageNetworkIpRangeCmd; +import org.apache.cloudstack.api.admin.network.command.ListStorageNetworkIpRangeCmd; import com.cloud.dc.StorageNetworkIpRange; public interface StorageNetworkService { @@ -30,7 +30,7 @@ public interface StorageNetworkService { void deleteIpRange(DeleteStorageNetworkIpRangeCmd cmd); - List listIpRange(listStorageNetworkIpRangeCmd cmd); + List listIpRange(ListStorageNetworkIpRangeCmd cmd); StorageNetworkIpRange updateIpRange(UpdateStorageNetworkIpRangeCmd cmd); } diff --git a/api/src/com/cloud/api/commands/AddNetworkServiceProviderCmd.java b/api/src/org/apache/cloudstack/api/admin/network/command/AddNetworkServiceProviderCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/AddNetworkServiceProviderCmd.java rename to api/src/org/apache/cloudstack/api/admin/network/command/AddNetworkServiceProviderCmd.java index 30f054f8886..542f8ddc9c9 100644 --- a/api/src/com/cloud/api/commands/AddNetworkServiceProviderCmd.java +++ b/api/src/org/apache/cloudstack/api/admin/network/command/AddNetworkServiceProviderCmd.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.commands; +package org.apache.cloudstack.api.admin.network.command; import java.util.List; diff --git a/api/src/com/cloud/api/commands/CreateNetworkOfferingCmd.java b/api/src/org/apache/cloudstack/api/admin/network/command/CreateNetworkOfferingCmd.java similarity index 99% rename from api/src/com/cloud/api/commands/CreateNetworkOfferingCmd.java rename to api/src/org/apache/cloudstack/api/admin/network/command/CreateNetworkOfferingCmd.java index 447a5fb6aca..d85f5753bed 100644 --- a/api/src/com/cloud/api/commands/CreateNetworkOfferingCmd.java +++ b/api/src/org/apache/cloudstack/api/admin/network/command/CreateNetworkOfferingCmd.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.commands; +package org.apache.cloudstack.api.admin.network.command; import java.util.ArrayList; import java.util.Collection; diff --git a/api/src/com/cloud/api/commands/DeleteNetworkOfferingCmd.java b/api/src/org/apache/cloudstack/api/admin/network/command/DeleteNetworkOfferingCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/DeleteNetworkOfferingCmd.java rename to api/src/org/apache/cloudstack/api/admin/network/command/DeleteNetworkOfferingCmd.java index 8feede431fa..2e0f098ccd8 100644 --- a/api/src/com/cloud/api/commands/DeleteNetworkOfferingCmd.java +++ b/api/src/org/apache/cloudstack/api/admin/network/command/DeleteNetworkOfferingCmd.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.commands; +package org.apache.cloudstack.api.admin.network.command; import org.apache.log4j.Logger; diff --git a/api/src/com/cloud/api/commands/DeleteNetworkServiceProviderCmd.java b/api/src/org/apache/cloudstack/api/admin/network/command/DeleteNetworkServiceProviderCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/DeleteNetworkServiceProviderCmd.java rename to api/src/org/apache/cloudstack/api/admin/network/command/DeleteNetworkServiceProviderCmd.java index c30b2cbbbd1..abfe7cb6738 100644 --- a/api/src/com/cloud/api/commands/DeleteNetworkServiceProviderCmd.java +++ b/api/src/org/apache/cloudstack/api/admin/network/command/DeleteNetworkServiceProviderCmd.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.commands; +package org.apache.cloudstack.api.admin.network.command; import org.apache.log4j.Logger; diff --git a/api/src/com/cloud/api/commands/DeletePhysicalNetworkCmd.java b/api/src/org/apache/cloudstack/api/admin/network/command/DeletePhysicalNetworkCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/DeletePhysicalNetworkCmd.java rename to api/src/org/apache/cloudstack/api/admin/network/command/DeletePhysicalNetworkCmd.java index 0a036b81a50..5d146bf70b5 100644 --- a/api/src/com/cloud/api/commands/DeletePhysicalNetworkCmd.java +++ b/api/src/org/apache/cloudstack/api/admin/network/command/DeletePhysicalNetworkCmd.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.commands; +package org.apache.cloudstack.api.admin.network.command; import org.apache.log4j.Logger; diff --git a/api/src/com/cloud/api/commands/DeleteStorageNetworkIpRangeCmd.java b/api/src/org/apache/cloudstack/api/admin/network/command/DeleteStorageNetworkIpRangeCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/DeleteStorageNetworkIpRangeCmd.java rename to api/src/org/apache/cloudstack/api/admin/network/command/DeleteStorageNetworkIpRangeCmd.java index 6b50add9b45..5cb4eb70b32 100755 --- a/api/src/com/cloud/api/commands/DeleteStorageNetworkIpRangeCmd.java +++ b/api/src/org/apache/cloudstack/api/admin/network/command/DeleteStorageNetworkIpRangeCmd.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.commands; +package org.apache.cloudstack.api.admin.network.command; import org.apache.log4j.Logger; diff --git a/api/src/com/cloud/api/commands/ListNetworkServiceProvidersCmd.java b/api/src/org/apache/cloudstack/api/admin/network/command/ListNetworkServiceProvidersCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/ListNetworkServiceProvidersCmd.java rename to api/src/org/apache/cloudstack/api/admin/network/command/ListNetworkServiceProvidersCmd.java index 9818842cab4..efaf15e5d35 100644 --- a/api/src/com/cloud/api/commands/ListNetworkServiceProvidersCmd.java +++ b/api/src/org/apache/cloudstack/api/admin/network/command/ListNetworkServiceProvidersCmd.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.commands; +package org.apache.cloudstack.api.admin.network.command; import java.util.ArrayList; import java.util.List; diff --git a/api/src/com/cloud/api/commands/ListPhysicalNetworksCmd.java b/api/src/org/apache/cloudstack/api/admin/network/command/ListPhysicalNetworksCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/ListPhysicalNetworksCmd.java rename to api/src/org/apache/cloudstack/api/admin/network/command/ListPhysicalNetworksCmd.java index 69b00afadb5..e26e2862afa 100644 --- a/api/src/com/cloud/api/commands/ListPhysicalNetworksCmd.java +++ b/api/src/org/apache/cloudstack/api/admin/network/command/ListPhysicalNetworksCmd.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.commands; +package org.apache.cloudstack.api.admin.network.command; import java.util.ArrayList; import java.util.List; diff --git a/api/src/com/cloud/api/commands/ListSupportedNetworkServicesCmd.java b/api/src/org/apache/cloudstack/api/admin/network/command/ListSupportedNetworkServicesCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/ListSupportedNetworkServicesCmd.java rename to api/src/org/apache/cloudstack/api/admin/network/command/ListSupportedNetworkServicesCmd.java index 83462bb0707..6eaa9cff3d2 100644 --- a/api/src/com/cloud/api/commands/ListSupportedNetworkServicesCmd.java +++ b/api/src/org/apache/cloudstack/api/admin/network/command/ListSupportedNetworkServicesCmd.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.commands; +package org.apache.cloudstack.api.admin.network.command; import java.util.ArrayList; import java.util.List; diff --git a/api/src/com/cloud/api/commands/UpdateNetworkOfferingCmd.java b/api/src/org/apache/cloudstack/api/admin/network/command/UpdateNetworkOfferingCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/UpdateNetworkOfferingCmd.java rename to api/src/org/apache/cloudstack/api/admin/network/command/UpdateNetworkOfferingCmd.java index 0c3f829bb4f..cb4497422df 100755 --- a/api/src/com/cloud/api/commands/UpdateNetworkOfferingCmd.java +++ b/api/src/org/apache/cloudstack/api/admin/network/command/UpdateNetworkOfferingCmd.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.commands; +package org.apache.cloudstack.api.admin.network.command; import org.apache.log4j.Logger; diff --git a/api/src/com/cloud/api/commands/UpdateNetworkServiceProviderCmd.java b/api/src/org/apache/cloudstack/api/admin/network/command/UpdateNetworkServiceProviderCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/UpdateNetworkServiceProviderCmd.java rename to api/src/org/apache/cloudstack/api/admin/network/command/UpdateNetworkServiceProviderCmd.java index fb34038e424..cdacdd8149f 100644 --- a/api/src/com/cloud/api/commands/UpdateNetworkServiceProviderCmd.java +++ b/api/src/org/apache/cloudstack/api/admin/network/command/UpdateNetworkServiceProviderCmd.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.commands; +package org.apache.cloudstack.api.admin.network.command; import java.util.List; diff --git a/api/src/com/cloud/api/commands/UpdatePhysicalNetworkCmd.java b/api/src/org/apache/cloudstack/api/admin/network/command/UpdatePhysicalNetworkCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/UpdatePhysicalNetworkCmd.java rename to api/src/org/apache/cloudstack/api/admin/network/command/UpdatePhysicalNetworkCmd.java index 32c29a49fe3..fccde132d08 100644 --- a/api/src/com/cloud/api/commands/UpdatePhysicalNetworkCmd.java +++ b/api/src/org/apache/cloudstack/api/admin/network/command/UpdatePhysicalNetworkCmd.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.commands; +package org.apache.cloudstack.api.admin.network.command; import java.util.List; diff --git a/api/src/com/cloud/api/commands/UpdateStorageNetworkIpRangeCmd.java b/api/src/org/apache/cloudstack/api/admin/network/command/UpdateStorageNetworkIpRangeCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/UpdateStorageNetworkIpRangeCmd.java rename to api/src/org/apache/cloudstack/api/admin/network/command/UpdateStorageNetworkIpRangeCmd.java index ec162b6dcd7..75526586d0b 100755 --- a/api/src/com/cloud/api/commands/UpdateStorageNetworkIpRangeCmd.java +++ b/api/src/org/apache/cloudstack/api/admin/network/command/UpdateStorageNetworkIpRangeCmd.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.commands; +package org.apache.cloudstack.api.admin.network.command; import org.apache.log4j.Logger; diff --git a/api/src/com/cloud/api/commands/listStorageNetworkIpRangeCmd.java b/api/src/org/apache/cloudstack/api/admin/network/command/listStorageNetworkIpRangeCmd.java similarity index 96% rename from api/src/com/cloud/api/commands/listStorageNetworkIpRangeCmd.java rename to api/src/org/apache/cloudstack/api/admin/network/command/listStorageNetworkIpRangeCmd.java index 12d97090ccc..06b6e2c5175 100755 --- a/api/src/com/cloud/api/commands/listStorageNetworkIpRangeCmd.java +++ b/api/src/org/apache/cloudstack/api/admin/network/command/listStorageNetworkIpRangeCmd.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.commands; +package org.apache.cloudstack.api.admin.network.command; import java.util.ArrayList; import java.util.List; @@ -38,8 +38,8 @@ import com.cloud.exception.ResourceUnavailableException; import com.cloud.user.Account; @Implementation(description="List a storage network IP range.", responseObject=StorageNetworkIpRangeResponse.class, since="3.0.0") -public class listStorageNetworkIpRangeCmd extends BaseListCmd { - public static final Logger s_logger = Logger.getLogger(listStorageNetworkIpRangeCmd.class); +public class ListStorageNetworkIpRangeCmd extends BaseListCmd { + public static final Logger s_logger = Logger.getLogger(ListStorageNetworkIpRangeCmd.class); String s_name = "liststoragenetworkiprangeresponse"; diff --git a/api/src/org/apache/cloudstack/api/user/network/command/DeleteNetworkCmd.java b/api/src/org/apache/cloudstack/api/user/network/command/DeleteNetworkCmd.java index 994e6d55144..f158e4321ab 100644 --- a/api/src/org/apache/cloudstack/api/user/network/command/DeleteNetworkCmd.java +++ b/api/src/org/apache/cloudstack/api/user/network/command/DeleteNetworkCmd.java @@ -16,7 +16,7 @@ // under the License. package org.apache.cloudstack.api.user.network.command; -import com.cloud.api.commands.DeleteNetworkOfferingCmd; +import org.apache.cloudstack.api.admin.network.command.DeleteNetworkOfferingCmd; import org.apache.log4j.Logger; import org.apache.cloudstack.api.ApiConstants; diff --git a/api/test/src/com/cloud/api/commands/test/AddNetworkServiceProviderCmdTest.java b/api/test/src/com/cloud/api/commands/test/AddNetworkServiceProviderCmdTest.java index 446a1614220..b484916dcc1 100644 --- a/api/test/src/com/cloud/api/commands/test/AddNetworkServiceProviderCmdTest.java +++ b/api/test/src/com/cloud/api/commands/test/AddNetworkServiceProviderCmdTest.java @@ -22,6 +22,7 @@ import java.util.List; import junit.framework.Assert; import junit.framework.TestCase; +import org.apache.cloudstack.api.admin.network.command.AddNetworkServiceProviderCmd; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -29,7 +30,6 @@ import org.junit.rules.ExpectedException; import org.mockito.Mockito; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.commands.AddNetworkServiceProviderCmd; import com.cloud.exception.ResourceAllocationException; import com.cloud.network.NetworkService; import com.cloud.network.PhysicalNetworkServiceProvider; diff --git a/client/tomcatconf/commands.properties.in b/client/tomcatconf/commands.properties.in index 5632fe61b63..efa5cd928ec 100755 --- a/client/tomcatconf/commands.properties.in +++ b/client/tomcatconf/commands.properties.in @@ -302,9 +302,9 @@ removeVpnUser=org.apache.cloudstack.api.user.vpn.command.RemoveVpnUserCmd;15 listVpnUsers=org.apache.cloudstack.api.user.vpn.command.ListVpnUsersCmd;15 #### network offering commands -createNetworkOffering=com.cloud.api.commands.CreateNetworkOfferingCmd;1 -updateNetworkOffering=com.cloud.api.commands.UpdateNetworkOfferingCmd;1 -deleteNetworkOffering=com.cloud.api.commands.DeleteNetworkOfferingCmd;1 +createNetworkOffering=org.apache.cloudstack.api.admin.network.command.CreateNetworkOfferingCmd;1 +updateNetworkOffering=org.apache.cloudstack.api.admin.network.command.UpdateNetworkOfferingCmd;1 +deleteNetworkOffering=org.apache.cloudstack.api.admin.network.command.DeleteNetworkOfferingCmd;1 listNetworkOfferings=org.apache.cloudstack.api.user.network.command.ListNetworkOfferingsCmd;15 #### network commands @@ -345,16 +345,16 @@ listHypervisorCapabilities=com.cloud.api.commands.ListHypervisorCapabilitiesCmd; #### Physical Network commands createPhysicalNetwork=com.cloud.api.commands.CreatePhysicalNetworkCmd;1 -deletePhysicalNetwork=com.cloud.api.commands.DeletePhysicalNetworkCmd;1 -listPhysicalNetworks=com.cloud.api.commands.ListPhysicalNetworksCmd;1 -updatePhysicalNetwork=com.cloud.api.commands.UpdatePhysicalNetworkCmd;1 +deletePhysicalNetwork=org.apache.cloudstack.api.admin.network.command.DeletePhysicalNetworkCmd;1 +listPhysicalNetworks=org.apache.cloudstack.api.admin.network.command.ListPhysicalNetworksCmd;1 +updatePhysicalNetwork=org.apache.cloudstack.api.admin.network.command.UpdatePhysicalNetworkCmd;1 #### Physical Network Service Provider commands -listSupportedNetworkServices=com.cloud.api.commands.ListSupportedNetworkServicesCmd;1 -addNetworkServiceProvider=com.cloud.api.commands.AddNetworkServiceProviderCmd;1 -deleteNetworkServiceProvider=com.cloud.api.commands.DeleteNetworkServiceProviderCmd;1 -listNetworkServiceProviders=com.cloud.api.commands.ListNetworkServiceProvidersCmd;1 -updateNetworkServiceProvider=com.cloud.api.commands.UpdateNetworkServiceProviderCmd;1 +listSupportedNetworkServices=org.apache.cloudstack.api.admin.network.command.ListSupportedNetworkServicesCmd;1 +addNetworkServiceProvider=org.apache.cloudstack.api.admin.network.command.AddNetworkServiceProviderCmd;1 +deleteNetworkServiceProvider=org.apache.cloudstack.api.admin.network.command.DeleteNetworkServiceProviderCmd;1 +listNetworkServiceProviders=org.apache.cloudstack.api.admin.network.command.ListNetworkServiceProvidersCmd;1 +updateNetworkServiceProvider=org.apache.cloudstack.api.admin.network.command.UpdateNetworkServiceProviderCmd;1 #### Physical Network Traffic Type commands addTrafficType=com.cloud.api.commands.AddTrafficTypeCmd;1 @@ -365,9 +365,9 @@ listTrafficTypeImplementors=com.cloud.api.commands.ListTrafficTypeImplementorsCm #### Storage Network commands createStorageNetworkIpRange=com.cloud.api.commands.CreateStorageNetworkIpRangeCmd;1 -deleteStorageNetworkIpRange=com.cloud.api.commands.DeleteStorageNetworkIpRangeCmd;1 -listStorageNetworkIpRange=com.cloud.api.commands.listStorageNetworkIpRangeCmd;1 -updateStorageNetworkIpRange=com.cloud.api.commands.UpdateStorageNetworkIpRangeCmd;1 +deleteStorageNetworkIpRange=org.apache.cloudstack.api.admin.network.command.DeleteStorageNetworkIpRangeCmd;1 +listStorageNetworkIpRange=org.apache.cloudstack.api.admin.network.command.ListStorageNetworkIpRangeCmd;1 +updateStorageNetworkIpRange=org.apache.cloudstack.api.admin.network.command.UpdateStorageNetworkIpRangeCmd;1 ### Network Devices commands addNetworkDevice=com.cloud.api.commands.AddNetworkDeviceCmd;1 diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java index 4b9b33622f5..bff0cd514b5 100755 --- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java +++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java @@ -38,6 +38,8 @@ import javax.naming.NamingException; import javax.naming.directory.DirContext; import javax.naming.directory.InitialDirContext; +import org.apache.cloudstack.api.admin.network.command.DeleteNetworkOfferingCmd; +import org.apache.cloudstack.api.admin.network.command.UpdateNetworkOfferingCmd; import org.apache.log4j.Logger; import com.cloud.acl.SecurityChecker; @@ -45,12 +47,11 @@ import com.cloud.alert.AlertManager; import org.apache.cloudstack.api.ApiConstants.LDAPParams; import com.cloud.api.ApiDBUtils; import com.cloud.api.commands.CreateDiskOfferingCmd; -import com.cloud.api.commands.CreateNetworkOfferingCmd; +import org.apache.cloudstack.api.admin.network.command.CreateNetworkOfferingCmd; import com.cloud.api.commands.CreateServiceOfferingCmd; import com.cloud.api.commands.CreateVlanIpRangeCmd; import com.cloud.api.commands.CreateZoneCmd; import com.cloud.api.commands.DeleteDiskOfferingCmd; -import com.cloud.api.commands.DeleteNetworkOfferingCmd; import com.cloud.api.commands.DeletePodCmd; import com.cloud.api.commands.DeleteServiceOfferingCmd; import com.cloud.api.commands.DeleteVlanIpRangeCmd; @@ -60,7 +61,6 @@ import com.cloud.api.commands.LDAPRemoveCmd; import org.apache.cloudstack.api.user.network.command.ListNetworkOfferingsCmd; import com.cloud.api.commands.UpdateCfgCmd; import com.cloud.api.commands.UpdateDiskOfferingCmd; -import com.cloud.api.commands.UpdateNetworkOfferingCmd; import com.cloud.api.commands.UpdatePodCmd; import com.cloud.api.commands.UpdateServiceOfferingCmd; import com.cloud.api.commands.UpdateZoneCmd; diff --git a/server/src/com/cloud/network/StorageNetworkManagerImpl.java b/server/src/com/cloud/network/StorageNetworkManagerImpl.java index 3772f55e5da..6413e49cc6f 100755 --- a/server/src/com/cloud/network/StorageNetworkManagerImpl.java +++ b/server/src/com/cloud/network/StorageNetworkManagerImpl.java @@ -25,12 +25,12 @@ import java.util.Map; import javax.ejb.Local; import javax.naming.ConfigurationException; +import org.apache.cloudstack.api.admin.network.command.ListStorageNetworkIpRangeCmd; +import org.apache.cloudstack.api.admin.network.command.UpdateStorageNetworkIpRangeCmd; import org.apache.log4j.Logger; import com.cloud.api.commands.CreateStorageNetworkIpRangeCmd; -import com.cloud.api.commands.DeleteStorageNetworkIpRangeCmd; -import com.cloud.api.commands.UpdateStorageNetworkIpRangeCmd; -import com.cloud.api.commands.listStorageNetworkIpRangeCmd; +import org.apache.cloudstack.api.admin.network.command.DeleteStorageNetworkIpRangeCmd; import com.cloud.dc.HostPodVO; import com.cloud.dc.StorageNetworkIpRange; import com.cloud.dc.StorageNetworkIpAddressVO; @@ -304,7 +304,7 @@ public class StorageNetworkManagerImpl implements StorageNetworkManager, Storage } @Override - public List listIpRange(listStorageNetworkIpRangeCmd cmd) { + public List listIpRange(ListStorageNetworkIpRangeCmd cmd) { Long rangeId = cmd.getRangeId(); Long podId = cmd.getPodId(); Long zoneId = cmd.getZoneId(); diff --git a/server/test/com/cloud/vpc/MockConfigurationManagerImpl.java b/server/test/com/cloud/vpc/MockConfigurationManagerImpl.java index 73caf5b4058..c3496f0247e 100644 --- a/server/test/com/cloud/vpc/MockConfigurationManagerImpl.java +++ b/server/test/com/cloud/vpc/MockConfigurationManagerImpl.java @@ -25,12 +25,12 @@ import javax.naming.ConfigurationException; import javax.naming.NamingException; import com.cloud.api.commands.CreateDiskOfferingCmd; -import com.cloud.api.commands.CreateNetworkOfferingCmd; +import org.apache.cloudstack.api.admin.network.command.CreateNetworkOfferingCmd; import com.cloud.api.commands.CreateServiceOfferingCmd; import com.cloud.api.commands.CreateVlanIpRangeCmd; import com.cloud.api.commands.CreateZoneCmd; import com.cloud.api.commands.DeleteDiskOfferingCmd; -import com.cloud.api.commands.DeleteNetworkOfferingCmd; +import org.apache.cloudstack.api.admin.network.command.DeleteNetworkOfferingCmd; import com.cloud.api.commands.DeletePodCmd; import com.cloud.api.commands.DeleteServiceOfferingCmd; import com.cloud.api.commands.DeleteVlanIpRangeCmd; @@ -40,7 +40,7 @@ import com.cloud.api.commands.LDAPRemoveCmd; import org.apache.cloudstack.api.user.network.command.ListNetworkOfferingsCmd; import com.cloud.api.commands.UpdateCfgCmd; import com.cloud.api.commands.UpdateDiskOfferingCmd; -import com.cloud.api.commands.UpdateNetworkOfferingCmd; +import org.apache.cloudstack.api.admin.network.command.UpdateNetworkOfferingCmd; import com.cloud.api.commands.UpdatePodCmd; import com.cloud.api.commands.UpdateServiceOfferingCmd; import com.cloud.api.commands.UpdateZoneCmd;