diff --git a/neutronclient/neutron/v2_0/port.py b/neutronclient/neutron/v2_0/port.py
index 74c713c8d..e98e0f00d 100644
--- a/neutronclient/neutron/v2_0/port.py
+++ b/neutronclient/neutron/v2_0/port.py
@@ -239,12 +239,12 @@ class CreatePort(neutronV20.CreateCommand, UpdatePortSecGroupMixin,
             '--mac_address',
             help=argparse.SUPPRESS)
         parser.add_argument(
-            '--vnic-type', metavar='<direct | macvtap | normal>',
-            choices=['direct', 'macvtap', 'normal'],
+            '--vnic-type', metavar='<direct | macvtap | normal | baremetal>',
+            choices=['direct', 'macvtap', 'normal', 'baremetal'],
             help=_('VNIC type for this port.'))
         parser.add_argument(
             '--vnic_type',
-            choices=['direct', 'macvtap', 'normal'],
+            choices=['direct', 'macvtap', 'normal', 'baremetal'],
             help=argparse.SUPPRESS)
         parser.add_argument(
             '--binding-profile',
diff --git a/neutronclient/tests/unit/test_cli20_port.py b/neutronclient/tests/unit/test_cli20_port.py
index db873c1e5..ad9b2b89d 100644
--- a/neutronclient/tests/unit/test_cli20_port.py
+++ b/neutronclient/tests/unit/test_cli20_port.py
@@ -173,6 +173,26 @@ class CLITestV20PortJSON(test_cli20.CLITestV20Base):
         self._test_create_resource(resource, cmd, name, myid, args,
                                    position_names, position_values)
 
+    def test_create_port_vnic_type_baremetal(self):
+        """Create port: --vnic_type baremetal netid."""
+        resource = 'port'
+        cmd = port.CreatePort(test_cli20.MyApp(sys.stdout), None)
+        name = 'myname'
+        myid = 'myid'
+        netid = 'netid'
+        args = ['--vnic_type', 'baremetal', netid]
+        position_names = ['binding:vnic_type', 'network_id']
+        position_values = ['baremetal', netid]
+        self._test_create_resource(resource, cmd, name, myid, args,
+                                   position_names, position_values)
+
+        # Test dashed options
+        args = ['--vnic-type', 'baremetal', netid]
+        position_names = ['binding:vnic_type', 'network_id']
+        position_values = ['baremetal', netid]
+        self._test_create_resource(resource, cmd, name, myid, args,
+                                   position_names, position_values)
+
     def test_create_port_with_binding_profile(self):
         resource = 'port'
         cmd = port.CreatePort(test_cli20.MyApp(sys.stdout), None)