IntOrString for use in JSON/YAML

Specifying an API type as IntOrString will allow JSON and YAML to accept
either ints or strings with the same name.  For example, port names or
numbers.
+1

Any time you find yourself writing the same block in a test more than once, it's a good sign a table driven test should be used instead.