Merge pull request #3570 from dougm/storage-policy-filters

govc: add storage.policy.info flag to query IO filters
vmware · Oct 3, 2024 · d1684ba · d1684ba
2 parents 3db76c0 + 2613278
commit d1684ba
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 7 deletions.
diff --git a/govc/storage/policy/info.go b/govc/storage/policy/info.go
@@ -38,6 +38,7 @@ type info struct {
 
 	compliance bool
 	storage    bool
+	iofilters  bool
 }
 
 func init() {
@@ -53,6 +54,10 @@ func (cmd *info) Register(ctx context.Context, f *flag.FlagSet) {
 
 	f.BoolVar(&cmd.storage, "s", false, "Check Storage Compatibility")
 	f.BoolVar(&cmd.compliance, "c", false, "Check VM Compliance")
+
+	if cli.ShowUnreleased() {
+		f.BoolVar(&cmd.iofilters, "i", false, "Query IO Filters")
+	}
 }
 
 func (cmd *info) Process(ctx context.Context) error {
@@ -79,9 +84,10 @@ Examples:
 }
 
 type Policy struct {
-	Profile              types.BasePbmProfile `json:"profile"`
-	CompliantVM          []string             `json:"compliantVM"`
-	CompatibleDatastores []string             `json:"compatibleDatastores"`
+	Profile              types.BasePbmProfile            `json:"profile"`
+	CompliantVM          []string                        `json:"compliantVM"`
+	CompatibleDatastores []string                        `json:"compatibleDatastores"`
+	FilterMap            []types.PbmProfileToIofilterMap `json:"filterMap,omitempty"`
 }
 
 type infoResult struct {
@@ -190,6 +196,13 @@ func (cmd *info) Run(ctx context.Context, f *flag.FlagSet) error {
 			}
 		}
 
+		if cmd.iofilters {
+			policy.FilterMap, err = c.QueryIOFiltersFromProfileId(ctx, p.ProfileId.UniqueId)
+			if err != nil {
+				return err
+			}
+		}
+
 		policies = append(policies, policy)
 	}
 

diff --git a/govc/test/storage.bats b/govc/test/storage.bats
@@ -25,6 +25,12 @@ load test_helper
 
     run govc storage.policy.info "vSAN Default Storage Policy"
     assert_success
+
+    run env GOVC_SHOW_UNRELEASED=true govc storage.policy.info -json -i "VM Encryption Policy"
+    assert_success
+
+    kind="$(jq -r .policies[].filterMap[].iofilters[].filterType <<<"$output")"
+    assert_equal "ENCRYPTION" "$kind"
 }
 
 @test "storage.policy.create" {

diff --git a/pbm/methods/internal_methods.go b/pbm/methods/internal_methods.go
@@ -24,8 +24,8 @@ import (
 )
 
 type PbmQueryIOFiltersFromProfileIdBody struct {
-	Req    *types.PbmQueryIOFiltersFromProfileId         `xml:"urn:pbm PbmQueryIOFiltersFromProfileId,omitempty"`
-	Res    *types.PbmQueryIOFiltersFromProfileIdResponse `xml:"urn:pbm PbmQueryIOFiltersFromProfileIdResponse,omitempty"`
+	Req    *types.PbmQueryIOFiltersFromProfileId         `xml:"urn:internalpbm PbmQueryIOFiltersFromProfileId,omitempty"`
+	Res    *types.PbmQueryIOFiltersFromProfileIdResponse `xml:"urn:internalpbm PbmQueryIOFiltersFromProfileIdResponse,omitempty"`
 	Fault_ *soap.Fault                                   `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
 }
 

diff --git a/simulator/simulator.go b/simulator/simulator.go
@@ -315,16 +315,29 @@ type response struct {
 }
 
 func (r *response) MarshalXML(e *xml.Encoder, start xml.StartElement) error {
-	val := reflect.ValueOf(r.Body).Elem().FieldByName("Res")
+	body := reflect.ValueOf(r.Body).Elem()
+	val := body.FieldByName("Res")
 	if !val.IsValid() {
 		return fmt.Errorf("%T: invalid response type (missing 'Res' field)", r.Body)
 	}
 	if val.IsNil() {
 		return fmt.Errorf("%T: invalid response (nil 'Res' field)", r.Body)
 	}
+
+	// Default response namespace
+	ns := "urn:" + r.Namespace
+	// Override namespace from struct tag if defined
+	field, _ := body.Type().FieldByName("Res")
+	if tag := field.Tag.Get("xml"); tag != "" {
+		tags := strings.Split(tag, " ")
+		if len(tags) > 0 && strings.HasPrefix(tags[0], "urn") {
+			ns = tags[0]
+		}
+	}
+
 	res := xml.StartElement{
 		Name: xml.Name{
-			Space: "urn:" + r.Namespace,
+			Space: ns,
 			Local: val.Elem().Type().Name(),
 		},
 	}