Merge pull request #138 from stmcginnis/updatenames

Handle json name being different than property name

common/types.go

@@ -64,6 +64,10 @@ func (e *Entity) Update(originalEntity, currentEntity reflect.Value, allowedUpda
 			continue
 		}
 		fieldName := originalEntity.Type().Field(i).Name
+		jsonName := originalEntity.Type().Field(i).Tag.Get("json")
+		if jsonName != "" {
+			fieldName = jsonName
+		}
 		originalValue := originalEntity.Field(i).Interface()
 		currentValue := currentEntity.Field(i).Interface()
 		if originalValue == nil && currentValue == nil {
@@ -72,11 +76,9 @@ func (e *Entity) Update(originalEntity, currentEntity reflect.Value, allowedUpda
 			payload[fieldName] = currentValue
 		} else if reflect.TypeOf(originalValue).Kind() != reflect.Map {
 			if originalValue != currentValue {
-				// TODO: Handle JSON name being different than field name
 				payload[fieldName] = currentValue
 			}
 		} else if !reflect.DeepEqual(originalValue, currentValue) {
-			// TODO: Handle JSON name being different than field name
 			payload[fieldName] = currentValue
 		}
 	}

redfish/manageraccount_test.go

@@ -73,6 +73,7 @@ func TestManagerAccountUpdate(t *testing.T) {
 	result.Enabled = false
 	result.Locked = false
 	result.Password = "Test"
+	result.RoleID = "Administrator"
 	err = result.Update()
 
 	if err != nil {
@@ -92,4 +93,8 @@ func TestManagerAccountUpdate(t *testing.T) {
 	if !strings.Contains(calls[0].Payload, "Password:Test") {
 		t.Errorf("Unexpected Password update payload: %s", calls[0].Payload)
 	}
+
+	if !strings.Contains(calls[0].Payload, "RoleId:Administrator") {
+		t.Errorf("Unexpected Role ID update payload: %s", calls[0].Payload)
+	}
 }