diff --git a/cmd/climc/shell/compute/hosts.go b/cmd/climc/shell/compute/hosts.go
index 419ca00e57..d7ebb6f3af 100644
--- a/cmd/climc/shell/compute/hosts.go
+++ b/cmd/climc/shell/compute/hosts.go
@@ -49,6 +49,8 @@ func init() {
 	cmd.BatchDelete(&options.BaseIdsOptions{})
 	cmd.Perform("remove-all-netifs", &options.BaseIdOptions{})
 	cmd.Perform("probe-isolated-devices", &options.BaseIdOptions{})
+	cmd.Perform("class-metadata", &options.ResourceMetadataOptions{})
+	cmd.Perform("set-class-metadata", &options.ResourceMetadataOptions{})
 
 	cmd.BatchPerform("enable", &options.BaseIdsOptions{})
 	cmd.BatchPerform("disable", &options.BaseIdsOptions{})
diff --git a/cmd/climc/shell/image/images.go b/cmd/climc/shell/image/images.go
index 2941adf77c..776258131b 100644
--- a/cmd/climc/shell/image/images.go
+++ b/cmd/climc/shell/image/images.go
@@ -497,6 +497,32 @@ func init() {
 		return nil
 	})
 
+	R(&options.ResourceMetadataOptions{}, "image-set-class-metadata", "set class metadata for image", func(s *mcclient.ClientSession, opts *options.ResourceMetadataOptions) error {
+		params, err := opts.Params()
+		if err != nil {
+			return err
+		}
+		img, err := modules.Images.PerformAction(s, opts.ID, "set-class-metadata", params)
+		if err != nil {
+			return err
+		}
+		printObject(img)
+		return nil
+	})
+
+	R(&options.ResourceMetadataOptions{}, "image-class-metadata", "set class metadata for image", func(s *mcclient.ClientSession, opts *options.ResourceMetadataOptions) error {
+		params, err := opts.Params()
+		if err != nil {
+			return err
+		}
+		img, err := modules.Images.PerformAction(s, opts.ID, "class-metadata", params)
+		if err != nil {
+			return err
+		}
+		printObject(img)
+		return nil
+	})
+
 	type ImageProbeOptions struct {
 		ID string `help:"ID or name of image to probe"`
 	}