Merge "Use validate_legacy"

manifests/backend/dellemc_isilon.pp

@@ -69,7 +69,7 @@ define manila::backend::dellemc_isilon (
 
   include ::manila::deps
 
-  validate_string($emc_nas_password)
+  validate_legacy(String, 'validate_string', $emc_nas_password)
 
   $dellemc_isilon_share_driver = 'manila.share.drivers.dell_emc.driver.EMCShareDriver'
 

manifests/backend/dellemc_unity.pp

@@ -94,7 +94,7 @@ define manila::backend::dellemc_unity (
 
   include ::manila::deps
 
-  validate_string($emc_nas_password)
+  validate_legacy(String, 'validate_string', $emc_nas_password)
 
   $unity_share_driver = 'manila.share.drivers.dell_emc.driver.EMCShareDriver'
 

manifests/backend/dellemc_vmax.pp

@@ -73,7 +73,7 @@ define manila::backend::dellemc_vmax (
 
   include ::manila::deps
 
-  validate_string($emc_nas_password)
+  validate_legacy(String, 'validate_string', $emc_nas_password)
 
   $vmax_share_driver = 'manila.share.drivers.dell_emc.driver.EMCShareDriver'
 

manifests/backend/dellemc_vnx.pp

@@ -93,7 +93,7 @@ define manila::backend::dellemc_vnx (
 
   include ::manila::deps
 
-  validate_string($emc_nas_password)
+  validate_legacy(String, 'validate_string', $emc_nas_password)
 
   $vnx_share_driver = 'manila.share.drivers.dell_emc.driver.EMCShareDriver'
 

manifests/backend/hitachi_hnas.pp

@@ -63,7 +63,7 @@ define manila::backend::hitachi_hnas (
 
   include ::manila::deps
 
-  validate_string($hitachi_hnas_password)
+  validate_legacy(String, 'validate_string', $hitachi_hnas_password)
 
   $hitachi_share_driver = 'manila.share.drivers.hitachi.hds_hnas.HDSHNASDriver'
 

manifests/backend/netapp.pp

@@ -122,7 +122,7 @@ define manila::backend::netapp (
 
   include ::manila::deps
 
-  validate_string($netapp_password)
+  validate_legacy(String, 'validate_string', $netapp_password)
 
   $netapp_share_driver = 'manila.share.drivers.netapp.common.NetAppDriver'
 

manifests/config.pp

@@ -34,8 +34,8 @@ class manila::config (
 
   include ::manila::deps
 
-  validate_hash($manila_config)
-  validate_hash($api_paste_ini_config)
+  validate_legacy(Hash, 'validate_hash', $manila_config)
+  validate_legacy(Hash, 'validate_hash', $api_paste_ini_config)
 
   create_resources('manila_config', $manila_config)
   create_resources('manila_api_paste_ini', $api_paste_ini_config)

manifests/db.pp

@@ -66,8 +66,8 @@ class manila::db (
   $database_retry_interval_real = pick($::manila::database_retry_interval, $database_retry_interval)
   $database_max_overflow_real = pick($::manila::database_max_overflow, $database_max_overflow)
 
-  validate_re($database_connection_real,
-    '^(sqlite|mysql(\+pymysql)?|postgresql):\/\/(\S+:\S+@\S+\/\S+)?')
+  validate_legacy(Oslo::Dbconn, 'validate_re', $database_connection_real,
+    ['^(sqlite|mysql(\+pymysql)?|postgresql):\/\/(\S+:\S+@\S+\/\S+)?'])
 
   oslo::db { 'manila_config':
     connection     => $database_connection_real,

manifests/db/mysql.pp

@@ -47,7 +47,7 @@ class manila::db::mysql (
 
   include ::manila::deps
 
-  validate_string($password)
+  validate_legacy(String, 'validate_string', $password)
 
   ::openstacklib::db::mysql { 'manila':
     user          => $user,

manifests/policy.pp

@@ -31,7 +31,7 @@ class manila::policy (
   include ::manila::deps
   include ::manila::params
 
-  validate_hash($policies)
+  validate_legacy(Hash, 'validate_hash', $policies)
 
   Openstacklib::Policy::Base {
     file_path  => $policy_path,

spec/defines/manila_backend_dellemc_isilon_spec.rb

@@ -60,7 +60,7 @@ describe 'manila::backend::dellemc_isilon' do
         })
       end
 
-      it { is_expected.to raise_error(Puppet::Error, /true is not a string.  It looks to be a TrueClass/) }
+      it { is_expected.to raise_error(Puppet::Error) }
     end
   end
 

spec/defines/manila_backend_dellemc_unity_spec.rb

@@ -69,7 +69,7 @@ describe 'manila::backend::dellemc_unity' do
         })
       end
 
-     it { is_expected.to raise_error(Puppet::Error, /true is not a string.  It looks to be a TrueClass/) }
+     it { is_expected.to raise_error(Puppet::Error) }
     end
   end
 

spec/defines/manila_backend_dellemc_vmax_spec.rb

@@ -63,7 +63,7 @@ describe 'manila::backend::dellemc_vmax' do
        })
       end
 
-      it { is_expected.to raise_error(Puppet::Error, /true is not a string.  It looks to be a TrueClass/) }
+      it { is_expected.to raise_error(Puppet::Error) }
     end
   end
 

spec/defines/manila_backend_dellemc_vnx_spec.rb

@@ -69,7 +69,7 @@ describe 'manila::backend::dellemc_vnx' do
         })
       end
 
-      it { is_expected.to raise_error(Puppet::Error, /true is not a string.  It looks to be a TrueClass/) }
+      it { is_expected.to raise_error(Puppet::Error) }
     end
   end
 

spec/defines/manila_backend_hitachi_hnas_spec.rb

@@ -42,7 +42,7 @@ describe 'manila::backend::hitachi_hnas' do
         })
       end
 
-      it { is_expected.to raise_error(Puppet::Error, /true is not a string.  It looks to be a TrueClass/) }
+      it { is_expected.to raise_error(Puppet::Error) }
     end
   end
 

spec/defines/manila_backend_netapp_spec.rb

@@ -68,7 +68,7 @@ describe 'manila::backend::netapp' do
         })
       end
 
-      it { is_expected.to raise_error(Puppet::Error, /true is not a string.  It looks to be a TrueClass/) }
+      it { is_expected.to raise_error(Puppet::Error) }
     end
   end