Commit 42fda604 authored by Jose A. Lopes's avatar Jose A. Lopes
Browse files

Add 'instance_communication_network' to 'OpClusterSetParams'



... and update the unit tests.
Signed-off-by: default avatarJose A. Lopes <jabolopes@google.com>
Reviewed-by: default avatarHelga Velroyen <helgav@google.com>
parent fcafd191
...@@ -239,6 +239,7 @@ $(genOpCode "OpCode" ...@@ -239,6 +239,7 @@ $(genOpCode "OpCode"
, pClusterFileStorageDir , pClusterFileStorageDir
, pClusterSharedFileStorageDir , pClusterSharedFileStorageDir
, pClusterGlusterStorageDir , pClusterGlusterStorageDir
, pInstanceCommunicationNetwork
], ],
[]) [])
, ("OpClusterRedistConf", , ("OpClusterRedistConf",
......
...@@ -108,6 +108,7 @@ module Ganeti.OpParams ...@@ -108,6 +108,7 @@ module Ganeti.OpParams
, pClusterFileStorageDir , pClusterFileStorageDir
, pClusterSharedFileStorageDir , pClusterSharedFileStorageDir
, pClusterGlusterStorageDir , pClusterGlusterStorageDir
, pInstanceCommunicationNetwork
, pVgName , pVgName
, pEnabledHypervisors , pEnabledHypervisors
, pHypervisor , pHypervisor
...@@ -587,6 +588,10 @@ pClusterGlusterStorageDir = ...@@ -587,6 +588,10 @@ pClusterGlusterStorageDir =
renameField "ClusterGlusterStorageDir" $ renameField "ClusterGlusterStorageDir" $
optionalStringField "gluster_storage_dir" optionalStringField "gluster_storage_dir"
pInstanceCommunicationNetwork :: Field
pInstanceCommunicationNetwork =
optionalStringField "instance_communication_network"
-- | Volume group name. -- | Volume group name.
pVgName :: Field pVgName :: Field
pVgName = pVgName =
......
...@@ -207,6 +207,7 @@ instance Arbitrary OpCodes.OpCode where ...@@ -207,6 +207,7 @@ instance Arbitrary OpCodes.OpCode where
<*> genMaybe genName -- file_storage_dir <*> genMaybe genName -- file_storage_dir
<*> genMaybe genName -- shared_file_storage_dir <*> genMaybe genName -- shared_file_storage_dir
<*> genMaybe genName -- gluster_file_storage_dir <*> genMaybe genName -- gluster_file_storage_dir
<*> arbitrary -- instance_communication_network
"OP_CLUSTER_REDIST_CONF" -> pure OpCodes.OpClusterRedistConf "OP_CLUSTER_REDIST_CONF" -> pure OpCodes.OpClusterRedistConf
"OP_CLUSTER_ACTIVATE_MASTER_IP" -> "OP_CLUSTER_ACTIVATE_MASTER_IP" ->
pure OpCodes.OpClusterActivateMasterIp pure OpCodes.OpClusterActivateMasterIp
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment