From 98f7bb3b6ef5bf56a2fd58656f0bf20a38f609e0 Mon Sep 17 00:00:00 2001
From: Cotton <cotton@cottonbeckfield.com>
Date: Mon, 20 Jan 2020 02:25:56 -0800
Subject: [PATCH] Adding pytests

---
 .github/workflows/pythonapp.yml               |  11 +----
 .gitignore                                    |   3 ++
 README.md                                     |   3 +-
 csr_tools/csrgen.py => csrgen.py              |   7 ++--
 csrgen.pyc                                    | Bin 0 -> 12678 bytes
 csrgen_test.py                                |  39 ++++++++++++++++++
 .../csr-sample-unattended.yaml                |   0
 sample.yaml => samples/sample-file.yaml       |   0
 8 files changed, 50 insertions(+), 13 deletions(-)
 rename csr_tools/csrgen.py => csrgen.py (97%)
 create mode 100644 csrgen.pyc
 create mode 100644 csrgen_test.py
 rename csr-sample.yaml => samples/csr-sample-unattended.yaml (100%)
 rename sample.yaml => samples/sample-file.yaml (100%)

diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml
index 5639973..bc97854 100644
--- a/.github/workflows/pythonapp.yml
+++ b/.github/workflows/pythonapp.yml
@@ -12,19 +12,12 @@ jobs:
     - name: Set up Python 3.7
       uses: actions/setup-python@v1
       with:
-        python-version: 3.7
+        python-version: 2.7
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
         pip install -r requirements.txt
-    - name: Lint with flake8
-      run: |
-        pip install flake8
-        # stop the build if there are Python syntax errors or undefined names
-        flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
-        # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
-        flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
     - name: Test with pytest
       run: |
         pip install pytest
-        pytest
+        pytest csrgen_test.py
diff --git a/.gitignore b/.gitignore
index fde6770..e05d2f3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
 dist/*
+__*
 CSR_Generator.egg-info/*
 *.log
+*.csr
+*.key
diff --git a/README.md b/README.md
index 2a5a91b..812b265 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,8 @@
 Generate a key, self-signed certificate, and certificate request.
 
 ## Information
-You'll notice there is only one version of python scripts. This can be used with both python(2.7) and python(3.5).
+This script is for Python 2.7. Due to how the input() function has changed between python2 and python3, this
+script is not backwards compatible at this time.
 
 ## Installation / Dependencies
 The following modules are required:
diff --git a/csr_tools/csrgen.py b/csrgen.py
similarity index 97%
rename from csr_tools/csrgen.py
rename to csrgen.py
index c156093..989683a 100755
--- a/csr_tools/csrgen.py
+++ b/csrgen.py
@@ -8,14 +8,14 @@
 # Usage: csrgen -n <hostname> -s <san0> <san1>
 #
 # If you want to generate multiple CSRs, you can use the -f command to
-# feed in a .yaml file via the CLI. See the example sample.yaml in this
+# feed in a .yaml file via the CLI. See the example samples/sample-file.yaml in this
 # repository for examples.
 #
 # If you want to predefine some of your CSR attributes, you can use the -u command
-# to feed in a .yaml file via the CLI. See the example csr.yaml in this repository
+# to feed in a .yaml file via the CLI. See the example samples/csr-sample-unattended.yaml in this repository
 # for examples.
 #
-# Author: Courtney Cotton <cotton@cottoncourtney.com> 06-25-2014, Updated 8-9-2017
+# Author: Cotton Beckfield <cotton@cottonbeckfield.com> 06-25-2014, Updated 01-20-2020
 # Author: Ben Mz <bmz@prohacktive.io> Updated 06-15-2018
 
 # Libraries/Modules
@@ -295,6 +295,7 @@ def initialize(self):
 
 
 def main(argv):
+    print(argv)
     # Define default values
     VERBOSE = False
     LOG_FILE = "./certGen.log"
diff --git a/csrgen.pyc b/csrgen.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..1bb239ccceef8834bcda154af5d9cbf7e053285a
GIT binary patch
literal 12678
zcmcIq&2Jn>cCVfpQk)SfQQx9ITaslDZE+-j+qA5hq9~bJdMNiurbI;<H>aCqlQTV|
zt{zEai2-6cUME?=huzBpxdg~*u?UhJf?$E%HkbSXK~C9oZVM!r1X*l;zgOKoL)lIc
z$&o$9>Z(_-s$RW%pOyc&vC`g$XMew;l7D&p{Qy7xw<tXPZ>gqI%URu0%U0T+Q_H!u
zo>$BHv|dolg|t4D)^n;ktXezN@($G+QOhIB@-U{Tyn<Q<_969!Qcsk+y<Ae>u<}c4
z74z)KT6ZdMgdfYJ${$l+QElc_^f$`Kr&1fc)Duftp)9vnE@A1xZ}G2M&Y>C)qi96E
zPTY>Uy;^NS58>~tl~*el;+?3?`cWLL1`Rj%w-Mqp`ZN~BIk4?OsPF|yfNfi{8tgeI
zm4fnzlsBrdsV_j69o!d}JCbaTI~|r5>`%6}Jg_C~hrrlaNh-UPzgumLD{rUbbbFLj
zE019v4X(d{AJ;#NpZ<GGsmGRjtW;fgkL6$qYk6t0RGd>Arj8RSNaGL*Liimj9+3)`
zHl#L6tZ!JPBzt$N-eL6^*oM^vzl+Jo`%B>-RftE`W=Tb#E6cJ%OWjIfcNkbqgn>KM
zHrT(+VBc2pm_UrE3C!m0QJcdm`j_pkoO4LwNQr8Ms7__m{)eFAGIq%_idcnN#*%tC
zFC%uUi7R*CS6kS;>>nH3+@Ycmt#~(&iL}KU@?bd&OZePMXTmtM`+JA2B~HC_`!3>i
zD)bR>k5Fx|@^*2<B=<g0(6Z3CfmU;h;{vpYlWha?z>MX+IL4~pgYrtS7Q}ATt_5qM
z8+RjL?`B^+v>m_G^#V5z+Mymt+YkJnJr_2D&blA9{4fsG2>2YVpw7iRP~P{WmA3X{
zvPsjw?>A#IjSfEZ1F}z`fJ8dG+FkSYL3GZC_uXdT*_%Kut<(0S?v~)}Y8wD|UcPHD
z`S!Yd-?!an<hx$a#uRqDBg>lB<jqHIGo)SSS27vaCNq}zqfORVZ?@OgaOt>Kx7lnz
z@I9%sISALJzBJ=h=d0J`_SVfNiU6-;fpzXg)_>J)Vhx<Dj@!#k-iW$B_!<o<5!kxX
z4nl{sNf*dB7e(zz1_ogqQ(}DLHoLxQ<~(x`8@}vJ7O>imT5c>8V82@0+TFO*jb#~E
z<}Tm7R^~*8(0+4OK+HCsBj}LX%cv+R^sA_yUvIbk^Nn^Kx5M*S+Kn#HQlF3fPFtVv
z^y2k)IMvY6dHmM=u!0uZSUm`XxL!XF4EjT2w2Ic={3uHPcOaLy#;l$A74n0%gVsT5
zWm^F-d#v5oQIvqp6>>%NHpoEyQEG~GAy<-<MYQ0aSROf+-BtY#%3`rnnVz-><fkw%
zju0$+uj}jBF3;ASN&A`~`jH#ABYS$fQYn==i*po(sc|dMO&cC>eI0!1M<1c8xlGmH
z6sLS@QxOENrD~9wHR0E);UMScoMEn+h1#51APMn3E|vGP9_ZPb>!_p)CHt@=qyE?U
zc=(lym5Tm^w;OUEXRsyGHCmvsd0b%2U>*C}%(I2ZCfbR|b}vu)mJNW0*c?&OmlS|F
zQP#K80fI3ZfNso&k=KD>36s^zTwpce67~Bi?wq=7*V<9kv*YzZ+YljL-$o@!q)Az?
zx4TWxUh(btLECQnaqLIhZimg@WCi*ZXionRXj*RQk!yMtnb@JMjCngF_W^DJuOIJz
z(+`E2<oF;jeFIIdlKz%9BBjyphH=yr@#6WbZntU1<H9{R_wn@VuHLNSuRe@|w{p~a
z0k>_~+KU?h7OkONgN(QfKk}<E<WcOQXB3HCw23WCErrLS-f)=EvKOfCaCqQT942)Y
zG%lC{$9QN9On_PewLCYwQQ(oSDYZ4EdT*+SmGu4&Q6ZjGThRSb_OMlk)y6P&*5lzs
z30n7jwPdurnfK39jSc;~0l*<)KiChLW(0%O78=2pJJd#zpY@XJMd^G+DAKHBXWCjC
zY#mKosdO_~sAVH@Mh9DWrLALwt-H6;=@xY}=_KZ0LZ{x5bmZ>Ak>eOi1H$a|OO7N}
zxwSpY8&~mO83tu;$cn~2Z1naD+4f2Ae(stU1T3zc+JZGTqPB`EK9JBV`i+$!+%E`0
zK-?%8T1B3~;}YpftCgES$X0%H_lJ11Svjnp05Ql1hza$0r-8r+b_M(K0J~+xQRN+!
zm0>8@M64R=IL2=b9{@a@0;c9q3J6OHGxRY|2%sS#R$`Do+(-zzah%(~a`(3SJ*;t5
zZQ<l#0E42CC;y(~^0BI;f&;5S*KzfD3}bTK=DlB}5GTGHVhIbcl~3ZLR7Lfzw{;x4
zEnmOJyCae%Y{xc~BejcfH~NOW{UC_fZNJrtdv-RAm$U+Hs-*%;!l-LE)S8<0O0@>7
z$2TU7FLL>uEhf+`*b1uehI}kYxhPGGH}wnX`6$quS}zk=+m<3?@f2)kcoHo)XwG;Z
zj5{q`!Xj?c2#aagt++a9%)-cvBNujw)^uHFXQm%D%$gc7cp+Z8D;s_zo@vHa&_WCi
zz3#sD=3APE#+_I0rs~$Wp?vMtpy^{<s|LmDH-TUd^?~#Uz)>QS+wE>72q1*FZKwQ5
zZ`mtBtS4<Z^6jwwAUgq1$UZFu(wZ(y@y=}ZZm~FZ$$oU-tYA}m?`v+Qc<0gPR@PlU
zfhJ=u9bk=O)WOeKZ8vUTpQ}5y8QHMg>G+}NOb{Y7D{sAd;a%7r;?sem^@LDzP_tEO
zPE>#pZXX8g7<{uBU60!LgRtRCJI|@vZonLld(yz8X-8{r7<?u+xHQse9&B`*H({2s
z%XtG`aB-C4g61B^eyCx&J47R9pmT<`vxFiMT+gffDU?oDZ#Wu9<Io8Z3l)}bz0+OE
z*cNVrQG1*!y#rTq+FHz)Aog3j%n2OPgyitB?fD^@hRO#QfxIDgAZ6XTgm$49*ps>*
z1}PL~9<>OBO?cF=H~KsZhYDs2HafTmVN*98fD;^;#kmM@hql9Wt6aM7>9)b>4SecP
zQ7DVn?U*&5FIlBrF+Ys&{njbkz1HsBDD2)mtX=cp5rNBF{97m-uwKp$!;(H=jpxSl
z2iTXJu*NO?a>uM=(Bh|aXN(3XNiq%IgHDIwGtM`ZG5l%h*R^2<P5yA%f|9&)*Ri0h
zd+#Q~6GC|+x+@<T2Z1hLt`Xgc22gF#60@uaCux8!g|9<d4T(AMW2$9JR}3tD_dqcc
zfYr$3e~_u5@S!yziDCHeqAT{q5-BXJzj*JYxXw8d;J;1>h`$Vth{bSHfaX*RYV63P
z(gEC1lEA%p05qS076j|n6m*|}LV;#j3mGW32@Qh9U^-wuAfN{aK!*er%U$y5j~v2L
zRGsrEoeM1JS~=7Z&g(4Bq0p2O^kA<BKFrZa;TEk_Tqu!6p+i;|tL+;w)x{fx(-lC>
zg|J@jp2$UGO4_{dcKNl$vb7tyUz7Hoo3*>swlj$#a+hw_95TCpdpnLAWseP?D3w0;
z#no=JY4d_!vhU170KxAJ0~g3d0Q6h*Tia2U7ZQ1uEXZFwXEz|eu$Gz|+E*hN(E{CQ
z1CvPQZH;2d5A1DmK-3N5YqvUXNR(G^EFt^=T6Cg7`^3rnzP(kG_TPaNF%HT~yUb;3
zs4_@Lpq;<LjZ)Fh-zZaB8C5_x(Fl49X6G0SQ4g=MMwdXGHzVYzFjslTMtn*2xdjb(
z2Ymt=Q!}bp{|qhqMHI?9oEx+9_?@;&kQb-nTaQ|2At_D{{2JU8mnQlgfAz0Wz&=lI
zlqHv0OnJtLU~)>_j`yDsumz3lmxCZUnF)eVlm(;Tf>>Z6EAtE<{voe1Zq5^0XIiW?
zcm;rx7$EP~Pk8r@Jr7Yuhw&%so+mzH);=t^@aIW;?~p_b#RcG!5DvtJUBaMLEd3M3
z625QYXYM7%V^z~UqB-HfGpC7^I9|qA)P2LlnFgR-M7hf1V~U3;@mx`KPjP|ViF(J4
zw10c%qXlCwREb4YD<w1xDPf{A3Ex+P(0p}KeS~SOu8DH;qv(57PR59Ey(`Ag)W76v
z$h*`|r>%X^LewoM#5){DJmwI%C*u=x|13uopjrN(_$1*y<M2QH=^)em=>XG6lwksF
z!oVopK-4aRzi|8$j15PBCk{sPm4FPZiy>4Dc*zXGcQPA1NvJJwPl{^-IxK^lNSp&U
zh=*z2yO%H%m3>uH77Q{I?U`@oAx%?qn<+ft8(>5`nij?2OaTrN7LfW(GJ@U$?B(^X
zbBJ?7$RQRBBNsARqg5LlcHMao&}D`qzKt^-mmOlh3O`B!@HR*E`H(S3S-x<h15KtJ
zpT$KM-;067<u%)`S0$DH86RT%4>I5wOq&DNE)il=hW!eF%fu8#ET{wV13Lnq;nxQh
ztQaUw*ef(v5RO7*2o}M|w;+Q|6iw6oz0O-{^IFOcx9LMfK7!hz-4^e~PAxaDWGDYb
z7e`f*=Hi&OVdG1s=eC*>_tEaEkKnQENwC#iXzr2#=0<brxb?o<5|Tcz?3a`LSK=gM
zmEQ|;Wmy<X54ojeBJ!-*QS@#Ng`OZpA_)lQU=Sz)!RTC*P*ez-X8E<$cfB43_sMB6
z`7?@S!ZU*!;9_V_-y?XXQZeKZO$nSP3Vj`2;&Y~yX6Sr?ZanC?*YSnIbmyE~XnAge
z{VtIF8b9%<RelWWa6FfhEE8;BarQyZ(xeqQ34~%g=zS_R$O@wgSxVd!1SEaK8AiVn
z(DeaOM5mqxMPvm>14B~mawtBE7U-%ah_8=tp{SLqsq`rn8J!s=I1hRW_v%V^BEq8&
zO#EOlkdTEjufo5_vBYh=0Vc$G!fH5=lQ4)xzg3OgXp#anJRd}G)r_A@k>Pb)o%+Bz
z*Wr0FlrCp^b$($^9O3J8ABpEB(6GbEJ6NxgMpQn6dd_hcoq;na6Sp?$BZ}9TU>4Q;
z+z0;=aQ`QMnzQq!BsP#aeBKpuoZJ@+S`D`W=g+(xGP$SajKt`{p~?yWMG67W0T5SG
z2-q<R#OEmlOcg+^rVtX96da$X5F-NdRSE(9li;|NLX-sJXDI|iZV3cJS6C*NhBPVU
z9vmFu(SZ=#n2LTwG=xJ!a)_Te8{`-nO9U4`H73Lvr?GT>4m8QQ&ZLycJhKb)A~TUe
z63)pOFk`edVJE3EDl{7!ijgE}sg}`FE#Xsqm8z0vba*nxfTs2l4)Oez?wW{z`Rdh0
zsRZF_+hI&Wc;tZ#7bIMBK1)ZyPD1KTF0wO!V}5pKK|UJbVx-WU#z<pq#i89Srj_oQ
zl$nk_Y|*)o_P)*TyhK=Dgy&{K3cw-omeF%VyT#0+sg?cm$MT0QLk(GVy-v+uuNzyk
z-fDZ@CO#d;937j*85RtDI4`mgr-Q28`IN;f3&?$CR6d2D!;4@@O(M#T?C(r!&zAjj
zs5Fk@C!XrCHF}|#FXnfT7q1nM6!#bR6n7L$#hs!jXSzrp;y`*0fXhEnMP0^ENCP{=
zJmdHR6^RkBlIJr6&XGxLiVL~0E-Jm_ys!{};B$y!S^$|&TMFNRBY<!K(iOGDErB%0
zeSy$5Hv=IN(S^puOQQ3L<pCR>B6xJ<DIcoZMk#q%+l`H<4qq{VGi-uyU~hlRSq6|(
zK_QN!aI)@p{K)xZcF5_8`NaUC^vXGlx9CVRk8_Fr;PiuzG{5>M^^AwaxsQ_vdBqeA
z`{Urhv)_`3<n5rykasU8v&uuNnmnUei~N>FKJTi8y_q%^I{Ih1KAyC)jB@xPC;Ezo
zknTsQ^{15DGg5=cag4K(-bjFrG`J_qAsY0;TkGfo9j<){?n1l_Op}?Ium}P)7Seba
z>Ja}Xe+9M$ho!ML_!>`gIV<VIs~dS)1m6PseS4n?fMML27zIcy!K6THBL`pGU`E6X
z&qDwK>5b7y`XE|`P!-NHfj~&=pg<f-Ar32VB7-ZWa7UQ`Af{s}955km(#Lc{c_#(J
z9)Q?3*D2+l7Kk(71@VIN&I-hf0<nz}FDb7qeUnf10SeT_^+O&I5rMBQQvvCro>(uc
z=+7<i4UU8@xa!!)%W&k-w^K#G6dM;QJhZ+7cMtMmO&kOGedok6z;hVf|6OWhH%aVG
zDX*fu^UAw`-W-x;>;;`)6<}y&xQ0lACP^?@X~@9QP=mpY4<y|3^05>?fuz|llBS)r
zkWI6YZ$tVFNi*-Y{*ijGOM=ZLn+SmudP6XTmw{kH5d77%Az=CyR5+rdf6SQ*sqm&y
zf!{|}^iH0YV=DTuTz`3Q$^6M;-ZqOd#6GT~v-v*YJA;79s$n#|tGsDu8adm0*=(5P
zGnoxYHU^Mf{B|Vot2J|$eGDg5^kczrLQr4IPy^%76V#mZcg#6^gu-=2gchb2;s+*0
ziT&Ct`c)n|#EnzJLUy)AG@T~H374Hw(NKX<F9_5b1BEaEn$8N;672gz{Gy!E>jl{A
zebRhjp!pc=C8KV(_s^Jq=5jN(xGZfRRSYFgRYIVZ^R%&HdR1U!i7=eHuZ!rOni_mL
zwC*=M@;Yl#p8MFXHd0=+kc>s+O7K#|tHwhGzaHcLk-_F^x)oDXVqpo2xzJr{`iOwR
z<N_i%<&?owO?i$uHN|yM86jj8gub1ces(ztnL+cdZcU1@ZU%<pluk`aaDpa^1d=_x
zwOIG<s~=yf8okJMNif=31B@A}lR32;%AB>CYV90jbDTL1djxpuCAbAo=tgT={GXQ%
zj?IKza69-QOJeMUE1>%%FSRK9U%T+eJ7!o{9E7Q<E&?k^jd{K&VVwnd^^$JvM7~*v
zm%c4C<5rX1GH@sHZyCX8jfnu^sZmvIX7eHqL1tt~lkiQI;hRaj830&l?rQ3vsVO%#
zlq98`8RD7!v_0{Oli{NglRJpOCX)tRL!8~IsYWwE#6mL_k)bke{~I2MG!i3NjBc{#
zS`z$tu#U<Ix?6!425alFWC&N>#%8yJ95`P8<<Y6nqBvW2H5jtxPip&YSv&)tpL`|W
z!K4;QKHRx!*b&|a11)`i1DA=BRT2X$5F><^pk~aA1CbfF8%Qf)g(mOb0#SkvSbM;2
zwHaHW35WMMHrG@!&xYonLc#>T?)Z&hwf9ZNGg<uXkOuK<O&?=+Amgu*5QV2ACp+sb
zfcNBEQm*>)|9#qTo}88psAt}3X3sSHfke3iC6Z|FA@UoEd+mD_d15IYwf1TZmkN|w
zffvOt%AC^Wo`1@IZ?aUTv1Qy1an{5Q<Kg4-Nu*mc#xv2HycLuvTO@%2CXoRn&EkTI
zOp+mN*W!mkq!>nH*2MV(7ROMC%YX#Of_at6>DCdjYvQR^Oe^{ZPS11NNLPWp3?6)F
zdS%>I^E49Yzy%{!)^DH%jCG~Z#Ebp~d5}u$cP5UbV5J+IXP3?&p~?A@1sz0jMSYM_
zF2wwzd74R)n#dcOJ!1`d6<|)xxSXyD9g_dWaT0p;WsdROK20a0P%(ZS4eyvP!Vmo3
zO52URd1ktzZpS<mt-+P`TRh$}_baOeeecUEKbdnbFV^Pdwk|AQt20_7%jCzx+$VDj
zl8unH%F#sWcr9*-e64%UNCv^D=c7|NHFQj*kN1llVyyFLv&jV!o}q-3w99`)Y<QM7
zEYH)13!_MLA47uTv{jb!G{1AB!+6YwN20|X66#2-=i$?wz;6uy@geDHB*|IsVK3qE
zJ)V^NvhVRc+X<1+4Ivd@wD#qRZ(nW~@a)5He=hOLxxRY6%(n%?7t-8mx-p63wAlPp
z7IFquePC@q9j;`IOHNsYT*GsJiLE)5V<I~1d>YIb8SwL|42;kC3)X(f;;&Kki7d5e
jq%=AHqKPS7;(HOzd-nn!1s==|=l1<pSqI08-l+B8ZQW!A

literal 0
HcmV?d00001

diff --git a/csrgen_test.py b/csrgen_test.py
new file mode 100644
index 0000000..b540e74
--- /dev/null
+++ b/csrgen_test.py
@@ -0,0 +1,39 @@
+import pytest
+import csrgen
+import logging
+
+def import_logging():
+    logger = logging.getLogger('certgen')
+    hdlr = logging.handlers.TimedRotatingFileHandler("csrgen_test.log", when="midnight", backupCount=3)
+    formatter = logging.Formatter('%(asctime)s %(levelname)s %(message)s')
+    hdlr.setFormatter(formatter)
+    logger.addHandler(hdlr)
+    logger.setLevel("WARN")
+
+    return logger
+
+# Test that if a file is supplied (../samples/sample-file.yaml) the code does #
+#   exit with an error.
+
+def test_load_nodes():
+    logger = import_logging()
+    cert = csrgen.Certificate(logger, {'verbose': False, 'size': '2048', 'C': 'Te', 'ST': 'PACA', 'L': 'Gap', 'O': 'ProHacktive SAS', 'OU': 'prohacktive.io'})
+    result = cert.loadNodes("samples/sample-file.yaml")
+
+def test_load_defaults():
+    logger = import_logging()
+    cert = csrgen.Certificate(logger, {'verbose': False, 'size': '2048'})
+    result = cert.loadDefaults("samples/csr-sample-unattended.yaml")
+
+def test_generate_csr():
+    logger = import_logging()
+    cert = csrgen.Certificate(logger, {'verbose': False, 'size': '2048', 'hostname': 'test-csr.edu', 'sans': 'test-csr-sans.edu',
+    'C': 'Te', 'ST': 'PACA', 'L': 'Gap', 'O': 'ProHacktive SAS', 'OU': 'prohacktive.io'})
+    result = cert.generateCSR()
+
+# Test that if a file is supplied and a ../samples/csr-sample-unattended.yaml is supplied
+#   that the code does not exit.
+
+# Test that if someone supplies -n the code does not exit.
+
+# Test that if someone supplies a -n and a -s that the code does not exit.
diff --git a/csr-sample.yaml b/samples/csr-sample-unattended.yaml
similarity index 100%
rename from csr-sample.yaml
rename to samples/csr-sample-unattended.yaml
diff --git a/sample.yaml b/samples/sample-file.yaml
similarity index 100%
rename from sample.yaml
rename to samples/sample-file.yaml