vcsim: Add vapi support for CategoryID and TagID fields

Signed-off-by: Doug MacEachern <[email protected]>

Author: dougm

govc/test/tags.bats

@@ -51,6 +51,16 @@ load test_helper
 
   run govc tags.category.rm "$update_name"
   assert_success
+
+  run govc tags.category.create -id "invalid" custom-id-cat
+  assert_failure
+
+  id="urn:vmomi:InventoryServiceCategory:$(new_id):GLOBAL"
+  run govc tags.category.create -id "$id" custom-id-cat
+  assert_success
+
+  run govc tags.category.info "$id"
+  assert_success
 }
 
 @test "tags" {
@@ -117,6 +127,16 @@ load test_helper
 
   run govc tags.info enoent
   assert_failure # does not exist
+
+  run govc tags.category.create -c "$category_name" -id "invalid" custom-id-tag
+  assert_failure
+
+  id="urn:vmomi:InventoryServiceTag:$(new_id):GLOBAL"
+  run govc tags.create -c "$category_name" -id "$id" custom-id-tag
+  assert_success
+
+  run govc tags.info "$id"
+  assert_success
 }
 
 @test "tags.association" {

vapi/simulator/simulator.go

@@ -595,7 +595,13 @@ func (s *handler) category(w http.ResponseWriter, r *http.Request) {
 					return
 				}
 			}
-			id := newID("Category")
+			id := spec.Category.CategoryID
+			if id == "" {
+				id = newID("Category")
+			} else if !strings.HasPrefix(id, "urn:vmomi:InventoryServiceCategory:") {
+				BadRequest(w, "com.vmware.vapi.std.errors.invalid_argument")
+				return
+			}
 			spec.Category.ID = id
 			s.Category[id] = &spec.Category
 			OK(w, id)
@@ -668,7 +674,13 @@ func (s *handler) tag(w http.ResponseWriter, r *http.Request) {
 					return
 				}
 			}
-			id := newID("Tag")
+			id := spec.Tag.TagID
+			if id == "" {
+				id = newID("Tag")
+			} else if !strings.HasPrefix(id, "urn:vmomi:InventoryServiceTag:") {
+				BadRequest(w, "com.vmware.vapi.std.errors.invalid_argument")
+				return
+			}
 			spec.Tag.ID = id
 			s.Tag[id] = &spec.Tag
 			s.Association[id] = make(map[internal.AssociatedObject]bool)