Added missing Apache license

Author: slavkap

…torage/datastore/api/StorPoolVolume.java …age/datastore/api/StorPoolVolumeDef.javaplugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/datastore/api/StorPoolVolume.java renamed to plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/datastore/api/StorPoolVolumeDef.java plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/datastore/api/StorPoolVolume.java renamed to plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/datastore/api/StorPoolVolumeDef.java

@@ -1,9 +1,26 @@
+// 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.datastore.api;
 
 import java.io.Serializable;
 import java.util.Map;
 
-public class StorPoolVolume implements Serializable {
+public class StorPoolVolumeDef implements Serializable {
 
     private static final long serialVersionUID = 1L;
     private transient String name;
@@ -16,11 +33,11 @@ public class StorPoolVolume implements Serializable {
     private String rename;
     private Boolean shrinkOk;
 
-    public StorPoolVolume() {
+    public StorPoolVolumeDef() {
     }
 
-    public StorPoolVolume(String name, Long size, Map<String, String> tags, String parent, Long iops, String template,
-            String baseOn, String rename, Boolean shrinkOk) {
+    public StorPoolVolumeDef(String name, Long size, Map<String, String> tags, String parent, Long iops, String template,
+                             String baseOn, String rename, Boolean shrinkOk) {
         super();
         this.name = name;
         this.size = size;

plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/datastore/driver/StorPoolPrimaryDataStoreDriver.java

@@ -47,7 +47,7 @@
 import org.apache.cloudstack.storage.command.CreateObjectAnswer;
 import org.apache.cloudstack.storage.command.StorageSubSystemCommand;
 import org.apache.cloudstack.storage.datastore.api.StorPoolSnapshotDef;
-import org.apache.cloudstack.storage.datastore.api.StorPoolVolume;
+import org.apache.cloudstack.storage.datastore.api.StorPoolVolumeDef;
 import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
 import org.apache.cloudstack.storage.datastore.db.SnapshotDataStoreDao;
 import org.apache.cloudstack.storage.datastore.db.SnapshotDataStoreVO;
@@ -456,13 +456,13 @@ private String updateStorPoolVolume(VolumeObject vol, ResizeVolumePayload payloa
         SpApiResponse resp = new SpApiResponse();
         if (tier != null || template != null) {
             Map<String, String> tags = StorPoolHelper.addStorPoolTags(null, null, null, null, tier);
-            StorPoolVolume spVolume = new StorPoolVolume(name, payload.newSize, tags, null, null, template, null, null,
+            StorPoolVolumeDef spVolume = new StorPoolVolumeDef(name, payload.newSize, tags, null, null, template, null, null,
                     payload.shrinkOk);
             resp = StorPoolUtil.volumeUpdate(spVolume, conn);
         } else {
             long maxIops = payload.newMaxIops == null ? Long.valueOf(0) : payload.newMaxIops;
 
-            StorPoolVolume spVolume = new StorPoolVolume(name, payload.newSize, null, null, maxIops, null, null, null,
+            StorPoolVolumeDef spVolume = new StorPoolVolumeDef(name, payload.newSize, null, null, maxIops, null, null, null,
                     payload.shrinkOk);
             StorPoolUtil.spLog(
                     "StorpoolPrimaryDataStoreDriverImpl.resize: name=%s, uuid=%s, oldSize=%d, newSize=%s, shrinkOk=%s, maxIops=%s",
@@ -1394,7 +1394,7 @@ public void updateStorageWithTheNewDiskOffering(Volume volume, DiskOffering newD
         StorPoolUtil.spLog("Updating volume [%s] with tier tag [%s] or template [%s] from Disk offering", volume.getId(), tier, template);
         String volumeName = StorPoolStorageAdaptor.getVolumeNameFromPath(volume.getPath(), true);
         Map<String, String> tags = StorPoolHelper.addStorPoolTags(null, null, null, null, tier);
-        StorPoolVolume spVolume = new StorPoolVolume(volumeName, null, tags, null, null, template, null, null, null);
+        StorPoolVolumeDef spVolume = new StorPoolVolumeDef(volumeName, null, tags, null, null, template, null, null, null);
         SpApiResponse response = StorPoolUtil.volumeUpdate(spVolume, conn);
         if (response.getError() != null) {
             StorPoolUtil.spLog("Could not update volume [%s] with tier tag [%s] or template [%s] from Disk offering due to [%s]", volume.getId(), tier, template, response.getError());

plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/datastore/util/StorPoolUtil.java

@@ -30,7 +30,7 @@
 import com.google.gson.JsonPrimitive;
 
 import org.apache.cloudstack.storage.datastore.api.StorPoolSnapshotDef;
-import org.apache.cloudstack.storage.datastore.api.StorPoolVolume;
+import org.apache.cloudstack.storage.datastore.api.StorPoolVolumeDef;
 import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
 import org.apache.cloudstack.storage.datastore.db.StoragePoolDetailVO;
 import org.apache.cloudstack.storage.datastore.db.StoragePoolDetailsDao;
@@ -599,7 +599,7 @@ public static SpApiResponse volumeUpdateTemplate(final String name, SpConnection
         return POST("MultiCluster/VolumeUpdate/" + name, json, conn);
     }
 
-    public static SpApiResponse volumeUpdate(StorPoolVolume volume, SpConnectionDesc conn) {
+    public static SpApiResponse volumeUpdate(StorPoolVolumeDef volume, SpConnectionDesc conn) {
         return POST("MultiCluster/VolumeUpdate/" + volume.getName(), volume, conn);
     }