Merge pull request #59 from huangpeng5/roce

protocol support config nvmeof

Author: huangpeng5

Cinder/Pike/constants.py

@@ -77,7 +77,8 @@
 CLONE_PAIR_SYNC_COMPLETE = 1073798176
 CLONE_PAIR_SYNC_NOT_EXIST = 1073798172
 HOST_ALREADY_IN_HOSTGROUP = 1077937501
-OBJECT_ALREADY_EXIST = LUN_ALREADY_IN_LUNGROUP = 1077948997
+OBJECT_ALREADY_EXIST = 1077948997
+LUN_ALREADY_IN_LUNGROUP = 1077948997
 HOSTGROUP_ALREADY_IN_MAPPINGVIEW = 1073804556
 LUNGROUP_ALREADY_IN_MAPPINGVIEW = 1073804560
 HOST_NOT_EXIST = 1077937498
@@ -152,7 +153,7 @@
                 'Thin': THIN_LUNTYPE}
 
 VALID_PRODUCT = ['V3', 'V5', '18000', 'Dorado', 'V6']
-VALID_PROTOCOL = ['FC', 'iSCSI']
+VALID_PROTOCOL = ['FC', 'iSCSI', 'nvmeof']
 VALID_WRITE_TYPE = ['1', '2']
 VOLUME_NOT_EXISTS_WARN = 'warning'
 VOLUME_NOT_EXISTS_RAISE = 'raise'