From ad4945ad8b4ceeb7e96da19e8c1f4c4df35d0dc1 Mon Sep 17 00:00:00 2001 From: James Adams Date: Thu, 28 Nov 2024 16:51:06 +0000 Subject: [PATCH] ncm-ceph: Cleanup lint from test templates --- ncm-ceph/src/test/resources/basic_cluster.pan | 8 ++++---- ncm-ceph/src/test/resources/basic_crushmap.pan | 14 +++++++------- .../src/test/resources/basic_crushmap_tt.pan | 14 +++++++------- ncm-ceph/src/test/resources/labeled_crushmap.pan | 16 ++++++++-------- 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/ncm-ceph/src/test/resources/basic_cluster.pan b/ncm-ceph/src/test/resources/basic_cluster.pan index 78fe803e95..9cfa1a01ab 100644 --- a/ncm-ceph/src/test/resources/basic_cluster.pan +++ b/ncm-ceph/src/test/resources/basic_cluster.pan @@ -1,7 +1,7 @@ object template basic_cluster; -variable OSDS = dict( +variable CEPH_OSDS = dict( 'ceph001', dict( 'fqdn', 'ceph001.cubone.os', 'osds', dict( @@ -21,7 +21,7 @@ variable OSDS = dict( ) ); -variable MDSS = dict( +variable CEPH_MDSS = dict( 'ceph002', dict( 'fqdn', 'ceph002.cubone.os', 'up', true @@ -49,8 +49,8 @@ prefix '/software/components/ceph/clusters'; 'ceph' = dict( 'config', CONFIG, - 'osdhosts', OSDS, - 'mdss', MDSS, + 'osdhosts', CEPH_OSDS, + 'mdss', CEPH_MDSS, 'monitors', dict( 'ceph001', MONITOR1, 'ceph002', MONITOR2, diff --git a/ncm-ceph/src/test/resources/basic_crushmap.pan b/ncm-ceph/src/test/resources/basic_crushmap.pan index 74777d0db5..0dbb42996a 100644 --- a/ncm-ceph/src/test/resources/basic_crushmap.pan +++ b/ncm-ceph/src/test/resources/basic_crushmap.pan @@ -9,7 +9,7 @@ variable CEPH_OSD_DISKS = list('sdc', 'sdd', 'sde', 'sdf', 'sdg', 'sdh', 'sdi', variable CEPH_JOURNAL_DISKS = list('sda4', 'sdb'); variable CEPH_DEFAULT_OSD_WEIGHT = 1.0; -variable MDSS = dict( +variable CEPH_MDSS = dict( 'ceph001.cubone.os', dict( 'fqdn', 'ceph001.cubone.os', ), @@ -59,7 +59,7 @@ variable BASE_STEPS = list( ), ); -prefix "/software/components/ceph/clusters/ceph/crushmap/"; +prefix "/software/components/ceph/clusters/ceph/crushmap"; 'types' = list('osd', 'host', 'root'); @@ -103,11 +103,11 @@ prefix "/software/components/ceph/clusters/ceph/crushmap/"; prefix '/software/components/ceph/clusters/ceph'; 'config' = CONFIG; 'osdhosts' = { - t=dict(); - foreach(idx;host;CEPH_HOSTS) { + t = dict(); + foreach(idx; host; CEPH_HOSTS) { d = dict(); - foreach(odx;disk;CEPH_OSD_DISKS) { - jdx= odx % length(CEPH_JOURNAL_DISKS); ## RR over journal disks + foreach(odx; disk; CEPH_OSD_DISKS) { + jdx = odx % length(CEPH_JOURNAL_DISKS); ## RR over journal disks d[disk] = dict( 'journal_path', format('/var/lib/ceph/log/%s/osd-%s/journal', CEPH_JOURNAL_DISKS[jdx], disk), 'crush_weight', CEPH_DEFAULT_OSD_WEIGHT @@ -121,7 +121,7 @@ prefix '/software/components/ceph/clusters/ceph'; t; }; -'mdss' = MDSS; +'mdss' = CEPH_MDSS; 'monitors' = dict( 'ceph001', MONITOR1, 'ceph002', MONITOR2, diff --git a/ncm-ceph/src/test/resources/basic_crushmap_tt.pan b/ncm-ceph/src/test/resources/basic_crushmap_tt.pan index 46a147cae9..e6097eaa66 100644 --- a/ncm-ceph/src/test/resources/basic_crushmap_tt.pan +++ b/ncm-ceph/src/test/resources/basic_crushmap_tt.pan @@ -8,7 +8,7 @@ variable CEPH_OSD_DISKS = list('sdc', 'sdd', 'sde', 'sdf', 'sdg', 'sdh', 'sdi', variable CEPH_JOURNAL_DISKS = list('sda4', 'sdb'); variable CEPH_DEFAULT_OSD_WEIGHT = 1.0; -variable MDSS = dict ( +variable CEPH_MDSS = dict ( 'ceph001.cubone.os', dict( 'fqdn', 'ceph001.cubone.os', ), @@ -57,7 +57,7 @@ variable BASE_STEPS = list( ); -prefix "/software/components/ceph/clusters/ceph/crushmap/"; +prefix "/software/components/ceph/clusters/ceph/crushmap"; 'types' = list('osd', 'host', 'root'); @@ -94,11 +94,11 @@ prefix "/software/components/ceph/clusters/ceph/crushmap/"; prefix '/software/components/ceph/clusters/ceph'; 'config' = CONFIG; 'osdhosts' = { - t=dict(); - foreach(idx;host;CEPH_HOSTS) { + t = dict(); + foreach(idx; host; CEPH_HOSTS) { d = dict(); - foreach(odx;disk;CEPH_OSD_DISKS) { - jdx= odx % length(CEPH_JOURNAL_DISKS); ## RR over journal disks + foreach(odx; disk; CEPH_OSD_DISKS) { + jdx = odx % length(CEPH_JOURNAL_DISKS); ## RR over journal disks d[disk] = dict( 'journal_path', format('/var/lib/ceph/log/%s/osd-%s/journal', CEPH_JOURNAL_DISKS[jdx], disk), 'crush_weight', CEPH_DEFAULT_OSD_WEIGHT @@ -112,7 +112,7 @@ prefix '/software/components/ceph/clusters/ceph'; t; }; -'mdss' = MDSS; +'mdss' = CEPH_MDSS; 'monitors' = dict ( 'ceph001', MONITOR1, 'ceph002', MONITOR2, diff --git a/ncm-ceph/src/test/resources/labeled_crushmap.pan b/ncm-ceph/src/test/resources/labeled_crushmap.pan index cd4973eaee..ca1ebf62f2 100644 --- a/ncm-ceph/src/test/resources/labeled_crushmap.pan +++ b/ncm-ceph/src/test/resources/labeled_crushmap.pan @@ -10,7 +10,7 @@ variable CEPH_OSD_DISKS = list('sdc', 'sdd', 'sde', 'sdf', 'sdg', 'sdh', 'sdi', variable CEPH_JOURNAL_DISKS = list('sda4', 'sdb'); variable CEPH_DEFAULT_OSD_WEIGHT = 1.0; -variable MDSS = dict ( +variable CEPH_MDSS = dict ( 'ceph001.cubone.os', dict( 'fqdn', 'ceph001.cubone.os', ), @@ -60,7 +60,7 @@ variable BASE_STEPS = list( ), ); -prefix "/software/components/ceph/clusters/ceph/crushmap/"; +prefix "/software/components/ceph/clusters/ceph/crushmap"; 'types' = list('osd', 'host', 'root'); @@ -104,13 +104,13 @@ prefix "/software/components/ceph/clusters/ceph/crushmap/"; prefix '/software/components/ceph/clusters/ceph'; 'config' = CONFIG; 'osdhosts' = { - t=dict(); - foreach(idx;host;CEPH_HOSTS) { + t = dict(); + foreach(idx; host; CEPH_HOSTS) { d = dict(); - foreach(odx;disk;CEPH_OSD_DISKS) { - jdx= odx % length(CEPH_JOURNAL_DISKS); ## RR over journal disks + foreach(odx; disk; CEPH_OSD_DISKS) { + jdx = odx % length(CEPH_JOURNAL_DISKS); ## RR over journal disks if (host == 'ceph003') { - jdx=0; # Empty bucket tst-1 on ceph003 + jdx = 0; # Empty bucket tst-1 on ceph003 }; d[disk] = dict( 'journal_path', format('/var/lib/ceph/log/%s/osd-%s/journal', CEPH_JOURNAL_DISKS[jdx], disk), @@ -126,7 +126,7 @@ prefix '/software/components/ceph/clusters/ceph'; t; }; -'mdss' = MDSS; +'mdss' = CEPH_MDSS; 'monitors' = dict ( 'ceph001', MONITOR1, 'ceph002', MONITOR2,