Merge pull request #122 from hvedati/dev/havedati/DiskFileFormatSupport

fixing the default type for generation and the diskfileformat
microsoft · Apr 6, 2022 · fa13db1 · fa13db1
2 parents 16aff77 + 48e8b2c
commit fa13db1
Show file tree

Hide file tree

Showing 8 changed files with 112 additions and 112 deletions.
diff --git a/go.mod b/go.mod
@@ -11,7 +11,7 @@ require (
 	github.com/pkg/errors v0.9.1
 	github.com/stretchr/testify v1.5.1
 	golang.org/x/net v0.0.0-20220403103023-749bd193bc2b // indirect
-	golang.org/x/sys v0.0.0-20220403205710-6acee93ad0eb // indirect
+	golang.org/x/sys v0.0.0-20220405052023-b1e9470b6e64 // indirect
 	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
 	google.golang.org/grpc v1.26.0
 	google.golang.org/protobuf v1.28.0 // indirect

diff --git a/go.sum b/go.sum
@@ -46,8 +46,8 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20190529164535-6a60838ec259/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220403205710-6acee93ad0eb h1:PVGECzEo9Y3uOidtkHGdd347NjLtITfJFO9BxFpmRoo=
-golang.org/x/sys v0.0.0-20220403205710-6acee93ad0eb/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220405052023-b1e9470b6e64 h1:D1v9ucDTYBtbz5vNuBbAhIMAGhQhJ6Ym5ah3maMVNX4=
+golang.org/x/sys v0.0.0-20220405052023-b1e9470b6e64/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=

diff --git a/rpc/cloudagent/compute/moc_cloudagent_galleryimage.pb.go b/rpc/cloudagent/compute/moc_cloudagent_galleryimage.pb.go
diff --git a/rpc/cloudagent/compute/moc_cloudagent_virtualmachineimage.pb.go b/rpc/cloudagent/compute/moc_cloudagent_virtualmachineimage.pb.go
diff --git a/rpc/cloudagent/storage/moc_cloudagent_virtualharddisk.pb.go b/rpc/cloudagent/storage/moc_cloudagent_virtualharddisk.pb.go
diff --git a/rpc/common/moc_common_common.pb.go b/rpc/common/moc_common_common.pb.go
diff --git a/rpc/common/moc_common_common.proto b/rpc/common/moc_common_common.proto
@@ -170,13 +170,13 @@ enum ImageSource {
 }
 
 enum HyperVGeneration {
-	HyperVGenerationV1 = 0;
-	HyperVGenerationV2 = 1;
+	HyperVGenerationV2 = 0;
+	HyperVGenerationV1 = 1;
 } 
 
 enum DiskFileFormat {
-	DiskFileFormatVHD =  0;
-	DiskFileFormatVHDX = 1;
+	DiskFileFormatVHDX =  0;
+	DiskFileFormatVHD = 1;
 } 
 
 enum CloudInitDataSource {

diff --git a/rpc/nodeagent/storage/moc_nodeagent_virtualharddisk.pb.go b/rpc/nodeagent/storage/moc_nodeagent_virtualharddisk.pb.go