cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject [20/21] git commit: updated refs/heads/ui-vm-affinity to 6629eb7
Date Fri, 12 Apr 2013 17:38:06 GMT
Fixed Primary typo


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

Branch: refs/heads/ui-vm-affinity
Commit: 95cbb790f3e65d42182a52032a4ad6827391e57e
Parents: 69b0c14
Author: Pascal Borreli <pascal@borreli.com>
Authored: Fri Apr 12 15:06:11 2013 +0000
Committer: Chip Childers <chip.childers@gmail.com>
Committed: Fri Apr 12 16:20:11 2013 +0100

----------------------------------------------------------------------
 .../cloudstack/storage/test/DirectAgentTest.java   |    4 +-
 .../command/CreateVolumeFromBaseImageCommand.java  |    6 +-
 .../provider/DataStoreProviderManagerImpl.java     |    4 +-
 .../storage/to/ImageOnPrimaryDataStoreTO.java      |   44 +++++++++++++++
 .../storage/to/ImageOnPrimayDataStoreTO.java       |   44 ---------------
 .../xen/resource/XenServerStorageResource.java     |    4 +-
 6 files changed, 53 insertions(+), 53 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/95cbb790/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentTest.java
----------------------------------------------------------------------
diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentTest.java
b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentTest.java
index 2d6b94f..fc4aea8 100644
--- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentTest.java
+++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentTest.java
@@ -23,7 +23,7 @@ import java.util.UUID;
 import javax.inject.Inject;
 
 import org.apache.cloudstack.storage.to.ImageDataStoreTO;
-import org.apache.cloudstack.storage.to.ImageOnPrimayDataStoreTO;
+import org.apache.cloudstack.storage.to.ImageOnPrimaryDataStoreTO;
 import org.apache.cloudstack.storage.to.PrimaryDataStoreTO;
 import org.apache.cloudstack.storage.to.TemplateTO;
 import org.mockito.Mockito;
@@ -126,7 +126,7 @@ public class DirectAgentTest extends CloudStackTestNGBase {
     
     @Test
     public void testDownloadTemplate() {
-        ImageOnPrimayDataStoreTO image = Mockito.mock(ImageOnPrimayDataStoreTO.class);
+        ImageOnPrimaryDataStoreTO image = Mockito.mock(ImageOnPrimaryDataStoreTO.class);
         PrimaryDataStoreTO primaryStore = Mockito.mock(PrimaryDataStoreTO.class);
         Mockito.when(primaryStore.getUuid()).thenReturn(this.getLocalStorageUuid());
         Mockito.when(image.getPrimaryDataStore()).thenReturn(primaryStore);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/95cbb790/engine/storage/src/org/apache/cloudstack/storage/command/CreateVolumeFromBaseImageCommand.java
----------------------------------------------------------------------
diff --git a/engine/storage/src/org/apache/cloudstack/storage/command/CreateVolumeFromBaseImageCommand.java
b/engine/storage/src/org/apache/cloudstack/storage/command/CreateVolumeFromBaseImageCommand.java
index f4be067..1734bc4 100644
--- a/engine/storage/src/org/apache/cloudstack/storage/command/CreateVolumeFromBaseImageCommand.java
+++ b/engine/storage/src/org/apache/cloudstack/storage/command/CreateVolumeFromBaseImageCommand.java
@@ -18,14 +18,14 @@
  */
 package org.apache.cloudstack.storage.command;
 
-import org.apache.cloudstack.storage.to.ImageOnPrimayDataStoreTO;
+import org.apache.cloudstack.storage.to.ImageOnPrimaryDataStoreTO;
 import org.apache.cloudstack.storage.to.VolumeTO;
 
 import com.cloud.agent.api.Command;
 
 public class CreateVolumeFromBaseImageCommand extends Command implements StorageSubSystemCommand
{
     private final VolumeTO volume;
-    private final ImageOnPrimayDataStoreTO image;
+    private final ImageOnPrimaryDataStoreTO image;
 
     public CreateVolumeFromBaseImageCommand(VolumeTO volume, String image) {
         this.volume = volume;
@@ -36,7 +36,7 @@ public class CreateVolumeFromBaseImageCommand extends Command implements
Storage
         return this.volume;
     }
     
-    public ImageOnPrimayDataStoreTO getImage() {
+    public ImageOnPrimaryDataStoreTO getImage() {
         return this.image;
     }
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/95cbb790/engine/storage/src/org/apache/cloudstack/storage/datastore/provider/DataStoreProviderManagerImpl.java
----------------------------------------------------------------------
diff --git a/engine/storage/src/org/apache/cloudstack/storage/datastore/provider/DataStoreProviderManagerImpl.java
b/engine/storage/src/org/apache/cloudstack/storage/datastore/provider/DataStoreProviderManagerImpl.java
index 91b6c63..40a65dc 100644
--- a/engine/storage/src/org/apache/cloudstack/storage/datastore/provider/DataStoreProviderManagerImpl.java
+++ b/engine/storage/src/org/apache/cloudstack/storage/datastore/provider/DataStoreProviderManagerImpl.java
@@ -64,7 +64,7 @@ public class DataStoreProviderManagerImpl extends ManagerBase implements
DataSto
         return null;
     }
     
-    public List<StorageProviderResponse> getPrimayrDataStoreProviders() {
+    public List<StorageProviderResponse> getPrimaryDataStoreProviders() {
         List<StorageProviderResponse> providers = new ArrayList<StorageProviderResponse>();
         for (DataStoreProvider provider : providerMap.values()) {
             if (provider instanceof PrimaryDataStoreProvider) {
@@ -138,7 +138,7 @@ public class DataStoreProviderManagerImpl extends ManagerBase implements
DataSto
             throw new InvalidParameterValueException("Invalid parameter, need to specify
type: either primary or image");
         }
         if (type.equalsIgnoreCase(DataStoreProvider.DataStoreProviderType.PRIMARY.toString()))
{
-            return this.getPrimayrDataStoreProviders();
+            return this.getPrimaryDataStoreProviders();
         } else if (type.equalsIgnoreCase(DataStoreProvider.DataStoreProviderType.IMAGE.toString()))
{
             return this.getImageDataStoreProviders();
         } else {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/95cbb790/engine/storage/src/org/apache/cloudstack/storage/to/ImageOnPrimaryDataStoreTO.java
----------------------------------------------------------------------
diff --git a/engine/storage/src/org/apache/cloudstack/storage/to/ImageOnPrimaryDataStoreTO.java
b/engine/storage/src/org/apache/cloudstack/storage/to/ImageOnPrimaryDataStoreTO.java
new file mode 100644
index 0000000..a9a3cc4
--- /dev/null
+++ b/engine/storage/src/org/apache/cloudstack/storage/to/ImageOnPrimaryDataStoreTO.java
@@ -0,0 +1,44 @@
+/*
+ * 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.storage.to;
+
+import org.apache.cloudstack.storage.volume.TemplateOnPrimaryDataStoreInfo;
+
+public class ImageOnPrimaryDataStoreTO {
+    private final String pathOnPrimaryDataStore;
+    private  PrimaryDataStoreTO dataStore;
+    private final TemplateTO template;
+    public ImageOnPrimaryDataStoreTO(TemplateOnPrimaryDataStoreInfo template) {
+        this.pathOnPrimaryDataStore = template.getPath();
+        //this.dataStore = template.getPrimaryDataStore().getDataStoreTO();
+        this.template = new TemplateTO(template.getTemplate());
+    }
+    
+    public String getPathOnPrimaryDataStore() {
+        return this.pathOnPrimaryDataStore;
+    }
+    
+    public PrimaryDataStoreTO getPrimaryDataStore() {
+        return this.dataStore;
+    }
+    
+    public TemplateTO getTemplate() {
+        return this.template;
+    }
+}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/95cbb790/engine/storage/src/org/apache/cloudstack/storage/to/ImageOnPrimayDataStoreTO.java
----------------------------------------------------------------------
diff --git a/engine/storage/src/org/apache/cloudstack/storage/to/ImageOnPrimayDataStoreTO.java
b/engine/storage/src/org/apache/cloudstack/storage/to/ImageOnPrimayDataStoreTO.java
deleted file mode 100644
index 18743d7..0000000
--- a/engine/storage/src/org/apache/cloudstack/storage/to/ImageOnPrimayDataStoreTO.java
+++ /dev/null
@@ -1,44 +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 org.apache.cloudstack.storage.to;
-
-import org.apache.cloudstack.storage.volume.TemplateOnPrimaryDataStoreInfo;
-
-public class ImageOnPrimayDataStoreTO {
-    private final String pathOnPrimaryDataStore;
-    private  PrimaryDataStoreTO dataStore;
-    private final TemplateTO template;
-    public ImageOnPrimayDataStoreTO(TemplateOnPrimaryDataStoreInfo template) {
-        this.pathOnPrimaryDataStore = template.getPath();
-        //this.dataStore = template.getPrimaryDataStore().getDataStoreTO();
-        this.template = new TemplateTO(template.getTemplate());
-    }
-    
-    public String getPathOnPrimaryDataStore() {
-        return this.pathOnPrimaryDataStore;
-    }
-    
-    public PrimaryDataStoreTO getPrimaryDataStore() {
-        return this.dataStore;
-    }
-    
-    public TemplateTO getTemplate() {
-        return this.template;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/95cbb790/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageResource.java
b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageResource.java
index 9c29149..7e0ccbe 100644
--- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageResource.java
+++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageResource.java
@@ -39,7 +39,7 @@ import org.apache.cloudstack.storage.command.CreatePrimaryDataStoreCmd;
 import org.apache.cloudstack.storage.command.CreateVolumeFromBaseImageCommand;
 import org.apache.cloudstack.storage.command.StorageSubSystemCommand;
 import org.apache.cloudstack.storage.datastore.protocol.DataStoreProtocol;
-import org.apache.cloudstack.storage.to.ImageOnPrimayDataStoreTO;
+import org.apache.cloudstack.storage.to.ImageOnPrimaryDataStoreTO;
 import org.apache.cloudstack.storage.to.VolumeTO;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
@@ -207,7 +207,7 @@ public class XenServerStorageResource {
     
     protected Answer execute(CreateVolumeFromBaseImageCommand cmd) {
         VolumeTO volume = cmd.getVolume();
-        ImageOnPrimayDataStoreTO baseImage = cmd.getImage();
+        ImageOnPrimaryDataStoreTO baseImage = cmd.getImage();
         Connection conn = hypervisorResource.getConnection();
         
         try {


Mime
View raw message