Rename VolumeType to ServerBlockDeviceType

carolynvs · carolynvs · commit 801429893f48 · 2016-01-29T11:31:42.000-06:00
VolumeType means something else, and really
this is only for defining block device mapping
diff --git a/src/corelib/Compute/v2_1/Serialization/ServerBlockDeviceType.cs b/src/corelib/Compute/v2_1/Serialization/ServerBlockDeviceType.cs
@@ -4,8 +4,8 @@ namespace OpenStack.Compute.v2_1.Serialization
 {
     /// <summary />
     /// <exclude />
-    public class VolumeType<T> : StringEnumeration
-        where T : VolumeType<T>, new()
+    public class ServerBlockDeviceType<T> : StringEnumeration
+        where T : ServerBlockDeviceType<T>, new()
     {
         /// <summary />
         public static readonly T Blank = new T{DisplayName = "blank"};
diff --git a/src/corelib/Compute/v2_1/ServerBlockDeviceMapping.cs b/src/corelib/Compute/v2_1/ServerBlockDeviceMapping.cs
@@ -24,11 +24,11 @@ public class ServerBlockDeviceMapping
 
         /// <summary />
         [JsonProperty("source_type")]
-        public VolumeType SourceType { get; set; }
+        public ServerBlockDeviceType SourceType { get; set; }
 
         /// <summary />
         [JsonProperty("destination_type")]
-        public VolumeType DestinationType { get; set; }
+        public ServerBlockDeviceType DestinationType { get; set; }
 
         /// <summary /> // in GB
         [JsonProperty("volume_size")]
diff --git a/src/corelib/Compute/v2_1/ServerBlockDeviceType.cs b/src/corelib/Compute/v2_1/ServerBlockDeviceType.cs
@@ -3,6 +3,6 @@
 namespace OpenStack.Compute.v2_1
 {
     /// <summary />
-    public class VolumeType : VolumeType<VolumeType>
+    public class ServerBlockDeviceType : ServerBlockDeviceType<ServerBlockDeviceType>
     { }
 }
diff --git a/src/corelib/Compute/v2_1/ServerCreateDefinition.cs b/src/corelib/Compute/v2_1/ServerCreateDefinition.cs
@@ -93,7 +93,7 @@ public void ConfigureBootFromVolume(Identifier volumeId, bool deleteVolumeWithSe
         {
             BlockDeviceMapping.Add(new ServerBlockDeviceMapping
             {
-                SourceType = VolumeType.Volume,
+                SourceType = ServerBlockDeviceType.Volume,
                 SourceId = volumeId,
                 BootIndex = 0,
                 DeleteWithServer = deleteVolumeWithServer
@@ -110,10 +110,10 @@ public void ConfigureBootFromNewVolume(Identifier volumeId, int volumeSize, bool
         {
             BlockDeviceMapping.Add(new ServerBlockDeviceMapping
             {
-                SourceType = VolumeType.Volume,
+                SourceType = ServerBlockDeviceType.Volume,
                 SourceId = volumeId,
                 BootIndex = 0,
-                DestinationType = VolumeType.Volume,
+                DestinationType = ServerBlockDeviceType.Volume,
                 DestinationVolumeSize = volumeSize,
                 DeleteWithServer = deleteVolumeWithServer
             });
@@ -128,10 +128,10 @@ public void ConfigureBootFromNewVolume(int volumeSize, bool deleteVolumeWithServ
         {
             BlockDeviceMapping.Add(new ServerBlockDeviceMapping
             {
-                SourceType = VolumeType.Image,
+                SourceType = ServerBlockDeviceType.Image,
                 SourceId = ImageId,
                 BootIndex = 0,
-                DestinationType = VolumeType.Volume,
+                DestinationType = ServerBlockDeviceType.Volume,
                 DestinationVolumeSize = volumeSize,
                 DeleteWithServer = deleteVolumeWithServer
             });
diff --git a/src/corelib/OpenStack.csproj b/src/corelib/OpenStack.csproj
@@ -139,7 +139,7 @@
     <Compile Include="Compute\v2_1\Serialization\ServerAddressCollection.cs" />
     <Compile Include="Compute\v2_1\Serialization\ImageCollection.cs" />
     <Compile Include="Compute\v2_1\Serialization\FlavorCollection.cs" />
-    <Compile Include="Compute\v2_1\Serialization\VolumeType.cs" />
+    <Compile Include="Compute\v2_1\Serialization\ServerBlockDeviceType.cs" />
     <Compile Include="Compute\v2_1\ServerAction.cs" />
     <Compile Include="Compute\v2_1\ServerActionExtensions.cs" />
     <Compile Include="Compute\v2_1\ServerBlockDeviceMapping.cs" />
@@ -164,7 +164,7 @@
     <Compile Include="Compute\v2_1\ServerVolumeExtensions.cs" />
     <Compile Include="Compute\v2_1\VolumeDefinition.cs" />
     <Compile Include="Compute\v2_1\Volume.cs" />
-    <Compile Include="Compute\v2_1\VolumeType.cs" />
+    <Compile Include="Compute\v2_1\ServerBlockDeviceType.cs" />
     <Compile Include="Compute\v2_1\ServerVolumeReference.cs" />
     <Compile Include="Compute\v2_2\KeyPair.cs" />
     <Compile Include="Compute\v2_2\KeyPairDefinition.cs" />

Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@ namespace OpenStack.Compute.v2_1.Serialization`
`4`	`4`	`{`
`5`	`5`	`/// <summary />`
`6`	`6`	`/// <exclude />`
`7`		`- public class VolumeType<T> : StringEnumeration`
`8`		`- where T : VolumeType<T>, new()`
	`7`	`+ public class ServerBlockDeviceType<T> : StringEnumeration`
	`8`	`+ where T : ServerBlockDeviceType<T>, new()`
`9`	`9`	`{`
`10`	`10`	`/// <summary />`
`11`	`11`	`public static readonly T Blank = new T{DisplayName = "blank"};`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,6 @@`
`3`	`3`	`namespace OpenStack.Compute.v2_1`
`4`	`4`	`{`
`5`	`5`	`/// <summary />`
`6`		`- public class VolumeType : VolumeType<VolumeType>`
	`6`	`+ public class ServerBlockDeviceType : ServerBlockDeviceType<ServerBlockDeviceType>`
`7`	`7`	`{ }`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ public void ConfigureBootFromVolume(Identifier volumeId, bool deleteVolumeWithSe`
`93`	`93`	`{`
`94`	`94`	`BlockDeviceMapping.Add(new ServerBlockDeviceMapping`
`95`	`95`	`{`
`96`		`- SourceType = VolumeType.Volume,`
	`96`	`+ SourceType = ServerBlockDeviceType.Volume,`
`97`	`97`	`SourceId = volumeId,`
`98`	`98`	`BootIndex = 0,`
`99`	`99`	`DeleteWithServer = deleteVolumeWithServer`
`@@ -110,10 +110,10 @@ public void ConfigureBootFromNewVolume(Identifier volumeId, int volumeSize, bool`
`110`	`110`	`{`
`111`	`111`	`BlockDeviceMapping.Add(new ServerBlockDeviceMapping`
`112`	`112`	`{`
`113`		`- SourceType = VolumeType.Volume,`
	`113`	`+ SourceType = ServerBlockDeviceType.Volume,`
`114`	`114`	`SourceId = volumeId,`
`115`	`115`	`BootIndex = 0,`
`116`		`- DestinationType = VolumeType.Volume,`
	`116`	`+ DestinationType = ServerBlockDeviceType.Volume,`
`117`	`117`	`DestinationVolumeSize = volumeSize,`
`118`	`118`	`DeleteWithServer = deleteVolumeWithServer`
`119`	`119`	`});`
`@@ -128,10 +128,10 @@ public void ConfigureBootFromNewVolume(int volumeSize, bool deleteVolumeWithServ`
`128`	`128`	`{`
`129`	`129`	`BlockDeviceMapping.Add(new ServerBlockDeviceMapping`
`130`	`130`	`{`
`131`		`- SourceType = VolumeType.Image,`
	`131`	`+ SourceType = ServerBlockDeviceType.Image,`
`132`	`132`	`SourceId = ImageId,`
`133`	`133`	`BootIndex = 0,`
`134`		`- DestinationType = VolumeType.Volume,`
	`134`	`+ DestinationType = ServerBlockDeviceType.Volume,`
`135`	`135`	`DestinationVolumeSize = volumeSize,`
`136`	`136`	`DeleteWithServer = deleteVolumeWithServer`
`137`	`137`	`});`