Browse code

Update volume type and regenerate types

generation fixed some comments.

Signed-off-by: Daniel Nephin <dnephin@docker.com>

Daniel Nephin authored on 2016/10/21 05:31:32
Showing 3 changed files
... ...
@@ -857,7 +857,7 @@ definitions:
857 857
 
858 858
   Volume:
859 859
     type: "object"
860
-    required: [Name, Driver, Mountpoint, Labels, Scope]
860
+    required: [Name, Driver, Mountpoint, Labels, Scope, Options]
861 861
     properties:
862 862
       Name:
863 863
         type: "string"
... ...
@@ -894,10 +894,11 @@ definitions:
894 894
         default: "local"
895 895
         x-nullable: false
896 896
         enum: ["local", "global"]
897
-      RefCount:
898
-        type: "integer"
899
-        default: -1
900
-        x-nullable: false
897
+      Options:
898
+        type: "object"
899
+        description: "The driver specific options used when creating the volume."
900
+        additionalProperties:
901
+          type: "string"
901 902
       UsageData:
902 903
         type: "object"
903 904
         required: [Size, RefCount]
... ...
@@ -909,6 +910,7 @@ definitions:
909 909
             x-nullable: false
910 910
           RefCount:
911 911
             type: "integer"
912
+            default: -1
912 913
             description: "The number of containers referencing this volume."
913 914
             x-nullable: false
914 915
 
... ...
@@ -31,7 +31,7 @@ type Plugin struct {
31 31
 	Tag string `json:"Tag"`
32 32
 }
33 33
 
34
-// PluginConfigSettings that can be modified by users.
34
+// PluginConfig Settings that can be modified by users.
35 35
 // swagger:model PluginConfig
36 36
 type PluginConfig struct {
37 37
 
... ...
@@ -52,7 +52,7 @@ type PluginConfig struct {
52 52
 	Mounts []PluginMount `json:"Mounts"`
53 53
 }
54 54
 
55
-// PluginManifestThe manifest of a plugin.
55
+// PluginManifest The manifest of a plugin.
56 56
 // swagger:model PluginManifest
57 57
 type PluginManifest struct {
58 58
 
... ...
@@ -108,7 +108,7 @@ type PluginManifest struct {
108 108
 	Workdir string `json:"Workdir"`
109 109
 }
110 110
 
111
-// PluginManifestArgsplugin manifest args
111
+// PluginManifestArgs plugin manifest args
112 112
 // swagger:model PluginManifestArgs
113 113
 type PluginManifestArgs struct {
114 114
 
... ...
@@ -129,7 +129,7 @@ type PluginManifestArgs struct {
129 129
 	Value []string `json:"Value"`
130 130
 }
131 131
 
132
-// PluginManifestInterfaceThe interface between Docker and the plugin
132
+// PluginManifestInterface The interface between Docker and the plugin
133 133
 // swagger:model PluginManifestInterface
134 134
 type PluginManifestInterface struct {
135 135
 
... ...
@@ -142,7 +142,7 @@ type PluginManifestInterface struct {
142 142
 	Types []PluginInterfaceType `json:"Types"`
143 143
 }
144 144
 
145
-// PluginManifestNetworkplugin manifest network
145
+// PluginManifestNetwork plugin manifest network
146 146
 // swagger:model PluginManifestNetwork
147 147
 type PluginManifestNetwork struct {
148 148
 
... ...
@@ -151,7 +151,7 @@ type PluginManifestNetwork struct {
151 151
 	Type string `json:"Type"`
152 152
 }
153 153
 
154
-// PluginManifestUserplugin manifest user
154
+// PluginManifestUser plugin manifest user
155 155
 // swagger:model PluginManifestUser
156 156
 type PluginManifestUser struct {
157 157
 
... ...
@@ -23,8 +23,9 @@ type Volume struct {
23 23
 	// Required: true
24 24
 	Name string `json:"Name"`
25 25
 
26
-	// ref count
27
-	RefCount int64 `json:"RefCount,omitempty"`
26
+	// The driver specific options used when creating the volume.
27
+	// Required: true
28
+	Options map[string]string `json:"Options"`
28 29
 
29 30
 	// The level at which the volume exists. Either `global` for cluster-wide, or `local` for machine level.
30 31
 	// Required: true
... ...
@@ -43,7 +44,7 @@ type Volume struct {
43 43
 	UsageData *VolumeUsageData `json:"UsageData,omitempty"`
44 44
 }
45 45
 
46
-// VolumeUsageDatavolume usage data
46
+// VolumeUsageData volume usage data
47 47
 // swagger:model VolumeUsageData
48 48
 type VolumeUsageData struct {
49 49