From 2644f55ba6617124d8e3c0513da020cc27ec77f9 Mon Sep 17 00:00:00 2001
From: javier <javier.garcial.external@atos.net>
Date: Tue, 17 Jun 2014 18:33:59 +0200
Subject: [PATCH] SLA code updated and new image for SmartSantander Application
 Service added

---
 .../img/servicedirectory/smartsantander.png   | Bin 5263 -> 5413 bytes
 sla/slaclient/restclient.py                   |   9 --
 sla/slaclient/wsag_model.py                   |  12 ++-
 sla/slicetabsla.py                            |  25 +++--
 sla/templates/slice-tab-sla.html              |  96 +++++++++++++-----
 5 files changed, 99 insertions(+), 43 deletions(-)

diff --git a/portal/static/img/servicedirectory/smartsantander.png b/portal/static/img/servicedirectory/smartsantander.png
index 806e459ee34e7643a36ab375bb7431b39c946798..73197627388e30f89d5388e5be791fe50fecb6d8 100755
GIT binary patch
literal 5413
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

literal 5263
zcmV;A6maW_P)<h;3K|Lk000e1NJLTq003D4003DC1^@s6RSSr(00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1pojPIY~r8RCr$Por!Z)*OkWohX9s<c&bw6%v1=*AYnEq
zh9nFSz)76UIGIc;F=7{DGXep!EijvLVT_FsU_cv4MoVi&Vn_SNB5Z^}AR!6CpuP7#
zbG~!?3AOZEQWGsL(5w3DzU98#uYd2nbMHO(zV6q$F0TirO=2Bnm9tDN8Z4#$c#j+w
zGua$=ve|4bD>>{AC7YeFXzSX3<U?w;n8<9kP;FDQZrOt%@B+6<PL%qKGm~BcgQ8&$
zxw8&Bk-9E?Af-#jL04*d71<b+)oK;cj8fJ$pnAe$w=-z7oh&wn+}x^L_7Et=iB>JV
zV@NGnQ|b>2vRJVbvSz8B)p=jXO<>4YSaM5?ZrMX5WzoC>AFP*Q(3QlH?N%GZf>p9L
zGfbqA0C%W;SZo$RwUU{SU?1ECZcue|n{L@ds7YR9#ZcxCm1H+J2`meItb?uE-p1R;
z4h!$FW`~(9uy&hSU|V>fiMJnkmnB070U5QT-oZiF@$1zB43=!OnmA>!0BlnL1ulbD
zzM5|Y`(T@ep|kZ{>?X3CTBxGY>nyn(kO#Gy)|1}a5>N4ERg_g(P3M1nL>KNoq>Rc2
zx^nkEwVRA$wVEZv%FkEaqjQzDoYqtNy#`9-bl$;Bx@8ZcOn|I+z^gQV^(ng7)S}!2
zTQMLvu=MhJqlN`!==$SEsT4I!zVq~%Za#0+uz{Rk{aAdnKqd?2RMqO{^F|FD$k*;X
zluie%nY$l!Chv}JK5vxQL!Q1Xi%RRCN|Q}%S-_f`x%>UMlbO2bc$>T$@_&b4rdDf{
zG}X|wLoZPC$woBWEEd{%{-*A^-XyPv{MckCGq;ml9SoK&*UoUYo}iUGDJDxhduJ;x
z{^o-2`Q9S0g}mZqhIBBj7NevZTv#z&hRwoVY8!W2%x!e4$h-Zs*Fyd-@2<E9bf?h?
zQLaJ-js&z-fkw~o=95O<GQ34z3pu{z0b4A0n*o|F*u{#m&HDk^%2xj4Gp~ptyOq~M
z-kMZO7WT&yf#XW9qmAs8mA9qE!LYOL)aaJsE%I8((|2Z3v$QJMT?k}N>>}8jC6I(j
z9j^z+=IWN=E%I8((B~I!NXNr$ML5$UmW|YGHj>?J5_ghS^+fkvZ<1F-hW4Zs(-Tv>
zv?3%x@32bPv(09rq}#PLc15J_dEO+ihYU^GnL(RkuTpIBLy9Y}rcW}8XwLp*-MrqY
zVF7u#%c~#<o-LriMx56@))#$vDv!o2JF0tZDCISf10t_TOTpx@(N;sTZXS1<5RyO#
zuHEK3(m~nxp6ccqN_hq35JQ2q7>wL<Ko1Y`irVIO+MSj||Gp|*_Z(=#h8X%LuY#Vm
zw{gqk8F#a}v%=+Esc)ij%Z}@wGZgX)$XWMlrRyx64{rN9EX@KOy}LG6VeM0jFZ_WH
zU%EvR7fUIr>>k~E(#-8;;-eT)wNe|mI_#VxVn=*rTh=Yz&l(DOjk`E>tz5du?G^@w
zF0-B6#N4A(af?QYx&bI6ani*`m)nXPVv?R;J3^t{%xg9_(aQJ|-Om^*=|f(2l6;rO
zlFvucG-hcejb3t!#somTy(G%Ht~C0iNSEy~OQXq$Q{8eqX<zOg`o-2nmwj^&T;MKp
zC0n9JS*TS_V1cD_OIf<p0F2;}k%hSy=w2h-39F7Rx=a4MF1nQIiF|^-q_Hc%BHz{f
zl>+y=YV{uSU8B~=uGvFlSM3-1E<eEAJ9Nv0x<U3?5lxZY$ZzDYsi~RO!fNWGMz*-F
z`;hmM(Mt2bOmQi<Lu*db&WnX)Vc(ha;IVF=`TLS(sK2JAl`XSHEEaG9RVKXf=UN;_
zYBsgfgH{urzImUfe;TJ-7WC8g-_hjlJ-4gp?A|~p3f`sIf>{((IFq7^X3BbO{<{=e
zG>f8&d7aakeBNKk`FI^^B<G7Sm`P^}X3(~jKhx`h-CH-^Ade3`C6A<xr!g=|5n{w6
z3d<2Yv&xt4DiaIG5X=dV*N-Rc&%92pMx*K)bFZzm{u%jgbG7Ksn!YcKK8(0ZLEo2A
zXhu1OoV!D-;)>{lh#Z>wdAja7oi%fJ230(HLiH`pG<*L!-8@i0<X^~8IE9k(CsRtn
z6iUsXLdm?H%1Yt&qym46FZQRzVn0eM@*@K)vBXdEB=Ek>d_Ri3K9k06{JLA&-5`$(
zislEC1ga*$mY_L&pqYK7vlReIxUthV<lqWyOWZY=ay9MEE~l23CNkN%qC>F9(oR)o
z6D{~6NjLw$qW=j`qelJ=vxT1kzOF{Ih32qJ(#snV^(RUNGzM%a0#ubI@V*p=2-wL*
z{sI^4>8v!)la@DG_GRYzQOu1QG;YH;-OAR1tSq^6SP`|h_(rzA$3_#?wVOG$P<^Mg
zuFdM)Hqo6XGyQ6Bs!O?@btvaH`_fi{jA122)6kkoxqY7|ZvI~P98WYk%s`i`8o0&5
zPoJ5+Ic~nGP2wKkUMkW(XKB<QDUD&lG65Rvu<SIp(8L@+ip`tOno6;`Qz@Dil{1xM
zSkXDt=xFIQI-NV6LK6bXcV%q1vb#YZ8+cM&0<2f7Xi(F)a#sQE*~y{qA8k)`BEP~J
z@X><us)94KuMNLgLbLaHJ`z2De-=d-@(tu?QAO-jO9jz7RGde+1*3N!v^09rbI2@1
zp>hYGW-g>jJ6F-aZ8=Oo`8b;1*mRWM`1l0txacRFSi!t+{VDQU_nmIpZXqixcKTw*
z5m9i@C0~E&pC>QTGdn|ImtnNC+hOYl7=gn6y1K<g@jq12@|epsEv&mc`PE(nZHT`@
znRn~tDKc|84z^mfIIL!69BtgZGxB%%@L12Sj%Be61v30`g42p4^M6BcZu(p|zbDdx
z9N7UGi%RV@J9J<|ic@zaQT#2u#-J)w?G*;;{lN-(o5-lHg|DOCh8u!y^?Cz39;hqe
zbJ6<H>JUaQ`%dNDr3qnYbw9ha0%CqgDNaj<1)t;f?b+|^=Jix=A!Cu(1lTIDyuIm!
zOTPZr?A`HHP~S*xR`mSZrD8N&Y-9pdla)+tnNrc>of1xsIBv5`tOKnY@w?n%L5HS=
zpMtCRACv#qc-_y^Q$Wl@1(_`wpwro11g9+2&FiUpv}DaHuuKdYSjd`Y?9Qf74MkM&
zu$I~wZW~vm?Iv~~NExu1yUiws2#d#PHLTphew?dM%6(8rn-lVB#;)F*c3q`GhMPc(
zB9mc<q%PLY>#4jBa#t-ne4ai@FQMq-2V}Ta&HlH6vhO$0g^EXHD1St|vv1HJ!e2Z*
zs;MjFjKPA88Sly`6HVHpUvs`J8ZyYzjB~y}H*xFGSn^;=gN)uCAfvMplD<ecuczuW
z<O#0`WK?`Z2KiO7<PpdNs1eA6prMD%>-`ORX>=}aPcEj=)Kc1>dV{v6mD0BKGS-bg
zD>Ur}ZO^!=du)5^bqY;^IG^D<txdeHdmWlyI>>*I$&)~k!-^hS8*!gaB4kK0<kXX7
z&N8QnZ*)DTNy~#W%?LViFS4D_2>QNM_j;g!*hMaoGr7k%Xpqq%!SaiKY$vZhTgD|C
zWx5ptLN?4b#z-@Nrp(sl&&0MI!@A@{v`*!dP7<f+R?B`w@>puPN~L)BTDsb}fzsVJ
zQZQSz-t|Bou?vR$ed!=tGK7oA@>X#F4Y991dy{XUS>g_eH6V~9fq%9-z`%&Jh>u~A
z)a+2*XwD`3H7mur5=3H@*p~OP?d{HUoaLDj_Eg|ECAlBL*0top=!}Rp^Mzu0dvpIm
z4opyx5orT7{EPxZl8B~Vu6atk&lR#SEu;e%i>b2J!rltt7!+TNyvD%L@lp<M4Bmn|
zm2;E*a{+~=l~CG`m^|)Kp;Lygo(#ARJ8enq0W$k!^!5aDu|K63O`+iQ|I*Ftsk%d6
z9o;c9B9A4fSf*_1KX<Vv={jSuD}TwrFxCg_Je*%eqnAay<Q@A_IAv7Svj66r0M}tr
z&=7lWXfx8}P}fM?sAZ9~Ix0(o^?3PRMza|<z;8*s;gYwr0%DcBKs-66kRccQ(WZ<6
za~IFY_^_zdP7C+-9+T~>02y&$K$c31UBshSBaIK#uUzNuPnOW9ggW7G0g!Lb-;cT(
z5oeV*G>hdU#w?II?HRHf83AOB?WGm?(HB?d(d#REpWe`$bRc77#OW%ukr8eMq&;YI
z$@i~FgDmcXtqqk^!2|b`x&LEpB0Xb|EEdd=F&zu%P7HA$FD`me$L@m5cDk8fA$M-V
z$>{SGiYj}D-r5nWo8J@ZK>kjAa>tYayh^}UgGN(cZ6mEuDx-ymuF`^Ua%tY799nSb
z63yprXx>+sY5u`0^xoc{$LBgMnah;Qiy`FI)amAh-rSxnBhJVt*6f7*R!D+weyF7S
zG2al?I)U%@1hS0r$%wTdohY0^%VR#E-|h>fcXw{2X}h-3^gSW;&K^$p2Gg|N8)@p7
zK{Rz=2)(f>Ot)-Z$Z!x^#ix8T+cx_|_)b(<BKDz30ZR$35G4!m|H~2gFEFl2DwT7z
z)<y4-Q`j1v*TEGXS_*I<eSs`KnJd@6Le|`c45;!t=3ihaDz$7XrQPtS%u;{KD0{BV
z8}Cpy`|vEb{zJLH>+9r}6M|7H8EzJ7E(2c>`_ZU}FI7!0=P|DF)jM^Z!e4T`G&s)v
zz$JQLo>=nFLJa~-HPz63>m71wO+&}^;96lUJwaX;vzU?@lt5;{m|G!pEqGr7x0{hd
zGF5<Yf_7ZyVX(z#U*rAx)5&+;p>Ab&hrA{l13C(xR4`6(ELg<zZSGz1#f!fKbcTT5
zA<n~1*c_MdQf_B;br-miy}1hwvfNz$d_bPGr6)^%;sUw%iti7U1#k=u5Dmo&Fs23=
zcwcIsvTnqilX)B90XRKZ4ZLFC>AYDqc6}cpL%S}P(Iak$))=kyh#$>5_J?(5E7h88
zRByCVjm0LDTK=z{I~1mNd4$D(J8urA0EV1#-@AGdpX{k6clhK!LZ0wR812uWPlrkt
z($U=aS&N-oM91?M(6QY4oc<?8mHd(tF_VaI0&YkO1BOLsF#O1ZndG~^4>O1~janM3
zv?Q8F1;i+6`<9&~pOuj`@w2lOQFv3V8BHZXP}XdvEyE15XeIXrR-UBMtB=y?z+;>q
zXYuwb=md>gb&STXJxX)G*g!D_(*&%z42UiLMDDvZcI~&_%5@9b6Fp<AMh{G^n7<4_
z3`@v;kk3ZdS^6M+C1t=zvo&Lqq9JDr9nX1>eAaY-GoW7}U#z?@eiiNlmW(g;vO?B0
ze*FQ;xIR?|Tw%#c*QQX!)n7B@Bi-`$3*_|j3V{qOR;`g?>MlHx@4BNMkl`{CxpndF
z<=-&mh;DiN1#-siyW%RO@_R)f`vfs$ZabfILQY`Fhc5kgU?Bs*t7OSO>mtOG5qFlk
z8dm{%?m$C+-aC91e6nWAfGqJ2hJ08od4PQKD{IM4$g1M=r|>ItMj#I)WCQp7BCetd
zHv(BV?~AA_<P?T{Jm;4T`Ea+qBamNEdXP`$&m!NT5y-lEUqoFYBY=e1#kh3?)U6(Y
ztRP1f&S1zM1c*G*2xJ90x@ZLQfJ2U9$m2Z;b$TK|76j;8dk9&*H~oT;x4M6^vZzKu
zmbn@X83r({A!n8=OMVf^FJj4<Q{hdPEMtKTIktEJA)mWl`5dw{9eQ_x;U_+WuVp|W
z2Oa5%T?`83N6pP*UE-7F*9d#I<iKPNG9G1y?C=aS)-h9aC@p!`XQ7l<>Muci&0Q$S
z1JF+X-(#8bex3L}ShCF1czH)gpr39yMhCbHjp3&>47$FEPxjv)Ln}_7r&V#6X;u6M
zS{-+Rf>`U$IMdVFw8M~3sdpa9kA7gZTAR{}H&`7G3vE7K)~#GkK?#72-^Z}2*_RA1
zkD=)0g*3<jhR=ZI8y!Z5?EYo?;_5mzg_h63JP^zb2~Ki<P2+-MX~9>^X<<YFy&oPx
zi;r;n?Gk$b$Vc@1@PE)BBbLzbkNk~R#(hACuTB@h$p!u$(*!VztswWol6_Z4Qw>*M
zYNAS)g{?sngf*S7+R8i7fGfw8%YcP$K2zXQZf6CZy(tx>Oqq3Ba(=b@e_O!h7R+Uq
zc_8vODxb^eOxofea%puvUmI=+ZVW#)HakOhZ^?gVnCblZr@#f2D5Ww$Ogv04@}~@z
zT4$?e7lCO2m=b{ByiijG{3up>eEL%YT>dd<+}cP+$PcqTp6bU$#1%N_Ti}sZ^Mm;@
zM9RlhKEQ@WtGrv{uDE<qXRSM1#%JIs%J_z08Z4Jp@USO$kxngq>*N=~SpbIf-rn2;
z<OlWC3ZD<lXTOhY4Ni9d`}a$t7gG|0mAMvh0W847sE3S5JNKnBR7`-uJ^;p?46$a0
zoKWx%joomtYuWOTIWGVGG;U3l{7e{TTEZqV4^B19l(lvi7Fp*n?Q)Ef1f9w2{6Q{S
z9#<rgQLg;e5TAd!st3rM6R43Ndi){`o*)RnW<Oz@``;D1_V6)ZODh|Iaz}vtaS!i}
z{NuzwDfPNPoy$|!3l{*P^`NbH6~_0H%hU{_EX=zoevf>Ex{X%Le?PhWi`kf!v9u)e
z8lAh_Kv|Vf<UQu>$~s<uL|J!hU34C4m;KrIYUx-}6}`E!=U-qsQdCK4&T|v))X|^5
z*3YMDZE`N9bN-Bq8p`0$2+ML044U(`feaOo>3l^4rQWTf)3@vC=RN!?%+I!NrC`Hi
z`ZRSOg{97=9cjHQEMqQxmN|#QGH25#DGO-cmw|d^%fFa;&HwTBMWdE=|M?j&m-^3C
zUh$g$<a^2F`d_KMW61v_^(B+*f23*)9~iOd{*nH_{b~zm7_$GZ9_DiMztyk3_Ww-s
VILTrK=GFiJ002ovPDHLkV1h)_P7eS8

diff --git a/sla/slaclient/restclient.py b/sla/slaclient/restclient.py
index 9d1306b1..c00ca2f5 100755
--- a/sla/slaclient/restclient.py
+++ b/sla/slaclient/restclient.py
@@ -281,19 +281,10 @@ class Agreements(object):
         path = _buildpath_(agreementid, "guaranteestatus")
         r = self.res.client.get(path, headers={'accept': 'application/json'})
 
-        print "---- JSON Response ----"
-        print r.text
-
         json_obj = r.json()
-        print "-- json_obj() --"
-        print type(json_obj)
-        print json_obj
         
         status = wsag_model.AgreementStatus.json_decode(json_obj)
 
-        print "---- STATUS ----"
-        print status
-
         return status, r
     
     def create(self, agreement):
diff --git a/sla/slaclient/wsag_model.py b/sla/slaclient/wsag_model.py
index 1c9bd41a..f141d6ad 100755
--- a/sla/slaclient/wsag_model.py
+++ b/sla/slaclient/wsag_model.py
@@ -30,6 +30,11 @@ class Agreement(object):
         def testbed_formatted(self):
             return self.template_id.replace('Service', ' - ')
 
+        def time_formatted(self):
+            import dateutil.parser
+            time = dateutil.parser.parse(self.expirationtime)
+            return time.strftime('%d-%m-%Y at %H:%M:%S')
+
     class Property(object):
         def __init__(self):
             self.servicename = ""
@@ -187,7 +192,7 @@ class Violation(object):
         self.contract_uuid = ""
         self.service_scope = ""
         self.metric_name = ""
-        self.datetime = datetime.now()
+        self.datetime = datetime.utcnow()
         self.actual_value = 0
 
     def __repr__(self):
@@ -201,6 +206,11 @@ class Violation(object):
                 self.actual_value)
         )
 
+    def format_time(self):
+        # return datetime.strptime(self.datetime.datetime.utcnow,'%Y-%m-%d %H:%M:%S')
+        # return str(datetime.fromtimestamp(self.datetime))
+        return str(self.datetime)
+
 
 class Provider(object):
     def __init__(self):
diff --git a/sla/slicetabsla.py b/sla/slicetabsla.py
index 6b350d41..19655404 100755
--- a/sla/slicetabsla.py
+++ b/sla/slicetabsla.py
@@ -92,6 +92,7 @@ class SLAView (FreeAccessView, ThemeView):
         consumer_id = None
         agreement_id = None
         enforcements = {}
+        violations = {}
 
         filter_ = None
         form = FilterForm(request.GET)
@@ -100,15 +101,21 @@ class SLAView (FreeAccessView, ThemeView):
              filter_ = _get_filter_from_form(form)
 
         consumer_id = _get_consumer_id(request)
-
+        
         agreements = _get_agreements(agreement_id, consumer_id=consumer_id, filter_=filter_)
-
+        
         for agreement in agreements:
             enf = _get_enforcement(agreement.agreement_id)
-            enforcements[agreement.agreement_id] = enf.enabled
-        
-        for key, value in enforcements.items():
-            print key + ": " + value
+            if enf.enabled == 'true':
+                enforcements[agreement.agreement_id] = "ACTIVE"
+            else:
+                enforcements[agreement.agreement_id] = "UNACTIVE"
+            violations_list = _get_agreement_violations(agreement.agreement_id, "GT_Performance")
+            
+            if len(violations_list):
+                violations[agreement.agreement_id] = float(violations_list[0]["actualValue"])*100
+            else:
+                violations[agreement.agreement_id] = 100
 
         template_env = {}
        # write something of our own instead
@@ -118,6 +125,7 @@ class SLAView (FreeAccessView, ThemeView):
         template_env['username'] = request.user
         template_env['slicename'] = slicename
         template_env['enforcements'] = enforcements
+        template_env['last_violation_list'] = violations
        
        # the prelude object in page contains a summary of the requirements() for all plugins
        # define {js,css}_{files,chunks}
@@ -224,12 +232,17 @@ def agreement_term_violations(request, agreement_id, guarantee_name):
         # If page is out of range (e.g. 9999), deliver first page.
         violation_page = paginator.page(1)
     
+    print "\n******************"
+    print violations[-1]
+    print "******************\n"
+
     context = {
         'agreement_id': agreement_id,
         'guarantee_term': agreement.guaranteeterms[guarantee_name],
         'violations': violation_page,
         'agreement': agreement,
         'slicename': slicename,
+        'last_violation': violations[-1].actual_value
     }
     
     context.update(prelude_env)
diff --git a/sla/templates/slice-tab-sla.html b/sla/templates/slice-tab-sla.html
index c605b6d3..f09aa8de 100755
--- a/sla/templates/slice-tab-sla.html
+++ b/sla/templates/slice-tab-sla.html
@@ -2,7 +2,7 @@
 <div class="col-md-2">
 </div>
 
- <div class="col-md-8">
+ <div class="col-md-9">
    <div class="row" id="agreements">
     <table class="table dataTable" id="sla_table" >
         <thead>
@@ -48,14 +48,14 @@
                  <dd>{{ a.agreement_id|default:"&nbsp;" }}</dd>
                  <dt>Provider</dt>
                  <dd>{{ a.context.provider|default:"&nbsp;" }}</dd>
-                 <dt>Consumer</dt>
+                 <dt>Experimenter</dt>
                  <dd>{{ a.context.consumer|default:"&nbsp;" }}</dd>
                  <dt>Service</dt>
                  <dd>Testbed guarantees 0.99 Uptime rate for 0.99 rate of the resources during the sliver lifetime</dd>
                  <dt>Testbed</dt>
                  <dd>{{ a.context.testbed_formatted }}</dd>
                  <dt>Accepted on:</dt>
-                 <dd>{{ a.context.expirationtime|default:"&nbsp;" }}</dd>
+                 <dd>{{ a.context.time_formatted|default:"&nbsp;" }}</dd>
 			</div>
 			<div class="modal-footer">
  				<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
@@ -67,47 +67,89 @@
        <tr>
        		{% if a.guaranteestatus == "VIOLATED" %}
        		<td class="glyphicon glyphicon-remove-sign" style="color:red;"></td>
-        	{% else %}
+        	{% elif a.guaranteestatus == "FULFILLED" %}
         	<td class="glyphicon glyphicon-ok-sign" style="color:green;"></td>
+          {% else %}
+          <td></td>
         	{% endif %}
-    		<td>{{ a.context.template_id }}</td>
-            <td>{{ a.context.expirationtime }}</td>
-            <td>
-                {% with a.agreement_id as key %}
-                {% if enforcements.key == false %}
-                  Disabled
-                {% else %}
-                  Enabled
-                {% endif %}
-                {% endwith %}
-            </td>
-            <!-- <td>{{slicename}}</td> -->
-            <td>
-                <!-- <a class="agreement-detail" href="{% url "agreement_details" a.agreement_id %}" data-toggle="modal" data-target="#agreementModal">View Agreement</a> -->
-                <!-- <a class="agreement-detail" href="#" data-agreement="{{ a.agreement_id }}">View Agreement</a> -->
-                <a class="agreement-detail" data-toggle="modal" data-target="#agreementModal{{a.agreement_id}}">View Agreement</a>
-            </td>
+    		  <td>{{ a.context.template_id }}</td>
+          <td>{{ a.context.time_formatted }}</td>
+          
+          {% with a.agreement_id as key %}
+          
+          <td>
+              <!-- <a class="agreement-detail" href="{% url "agreement_details" a.agreement_id %}" data-toggle="modal" data-target="#agreementModal">View Agreement</a> -->
+              <!-- <a class="agreement-detail" href="#" data-agreement="{{ a.agreement_id }}">View Agreement</a> -->
+              <a class="agreement-detail" data-toggle="modal" data-target="#agreementModal{{a.agreement_id}}">View Agreement</a>
+          </td>
+
+          {% for k,v in enforcements.items %}
+            {% if key == k %}
+              <td>
+              {% if v == "ACTIVE" %}
+                In progress
+              {% elif v == "UNACTIVE" %}
+                Disabled
+              {% endif %}
+              </td>
+
+              {% if a.guaranteestatus == "VIOLATED" and v == "UNACTIVE" %}
+              <td style="font-weight: bold">
+                Result: 99% uptime for
+                {% for vi, value in last_violation_list.items %}
+                  {% if a.agreement_id == vi %}
+                      {{ value }}%
+                  {% endif %}
+                {% endfor %}
+                resources
+              </td>
+              {% elif a.guaranteestatus == "FULFILLED" and v == "UNACTIVE" %}
+              <td style="font-weight: bold">
+                Result: 99% uptime for
+                {% for vi, value in last_violation_list.items %}
+                  {% if a.agreement_id == vi %}
+                      {{ value }}%
+                  {% endif %}
+                {% endfor %}
+                resources
+              </td>
+              {% endif %}
+            {% endif %}
 
-            {% for tname,t in a.guaranteeterms.items %}
+          {% endfor %}
+          
+          <!-- <td>{{slicename}}</td> -->
+
+          
+
+          
+              
+
+            {% endwith %}
+            <!-- {% for tname,t in a.guaranteeterms.items %}
             <td> {{ t.servicelevelobjective.kpiname }}</td>
             <td>
                 {% if t.status == "VIOLATED" %}
 
-                  <!-- <a class="violation-detail" href="{% url "agreement_term_violations" a.agreement_id t.name %}" data-toggle="modal" data-target="#violationModal">View Violations</a>
+                  <a class="violation-detail" href="{% url "agreement_term_violations" a.agreement_id t.name %}" data-toggle="modal" data-target="#violationModal">View Violations</a>
                   <a class="violation-detail" href="#"
                   			data-agreement="{{ a.agreement_id }}" 
-                  			data-violation="{{ t.name }}">View Violations</a> -->
-                  <a class="violation-detail" href="#" data-agreement="{{ a.agreement_id }}" data-violation="{{ t.name }}">View Violations</a>
+                  			data-violation="{{ t.name }}">View Violations</a>
+                  <a class="violation-detail" href="#" data-agreement="{{ a.agreement_id }}" data-violation="{{ t.name }}">{{last_violation_list}}</a>
+                  {{ t.name }}
 
                 {% endif %}
             </td>
             <td id="status" style="display:none;">
                 {{ a.statusclass }}
             </td>
-            {% endfor %}
+            {% endfor %} -->
+
+
+            
         </tr>
         
-        {% empty %}
+        
         {% endfor %}
         </tbody>
 
-- 
2.43.0