Changes between Version 33 and Version 34 of OpenFlow/FOAM/Testing


Ignore:
Timestamp:
08/02/12 17:33:16 (12 years ago)
Author:
Josh Smift
Comment:

Automated a few more things.

Legend:

Unmodified
Added
Removed
Modified

  • OpenFlow/FOAM/Testing

    v33 v34  
    110110(That should generate a "sliver created" and a "sliver approved" e-mail message, one of each to the experimenter and one of each to the FOAM admin.)
    111111
    112 Get the sliver URN and FlowVisor slicename from FOAM, and put them into $sliver_urn and $fv_slicename:
     112Get the sliver URN from FOAM, and put it into $sliver_urn:
    113113
    114114{{{
    115115sliver_urn=$(ssh $foamserver foamctl geni:list-slivers --passwd-file=/opt/foam/etc/foampasswd | egrep sliver_urn.+$slice_urn_egrep | sed -e 's/ *"sliver_urn": "\(.*\)".*/\1/')
    116 fv_slicename=$(echo $sliver_urn | awk -F : '{print $NF}')
    117116}}}
    118117
    … …  
    129128{{{
    130129ssh $foamserver foamctl geni:disable-sliver -u $sliver_urn --passwd-file=/opt/foam/etc/foampasswd
    131 ssh $foamserver foam-confirm-sliver $sliver_urn status pending
    132 ssh $fvserver flowvisor-confirm-fvslice-exists $fv_slicename false
    133 ssh $fvserver flowvisor-confirm-flowspace-rule-count $fv_slicename 0
     130foam-verify-sliver -q $foamserver $fvserver $sliver_urn status pending false 0
    134131}}}
    135132
    … …  
    156153{{{
    157154ssh $foamserver foamctl geni:approve-sliver -u $sliver_urn --passwd-file=/opt/foam/etc/foampasswd
    158 ssh $foamserver foam-confirm-sliver $sliver_urn status approved
    159 ssh $fvserver flowvisor-confirm-fvslice-exists $fv_slicename true
    160 ssh $fvserver flowvisor-confirm-flowspace-rule-count $fv_slicename 2
     155foam-verify-sliver -q $foamserver $fvserver $sliver_urn status approved true 2
    161156}}}
    162157
    … …  
    165160{{{
    166161ssh $foamserver foamctl geni:reject-sliver -u $sliver_urn --passwd-file=/opt/foam/etc/foampasswd
    167 ssh $foamserver foam-confirm-sliver $sliver_urn status rejected
    168 ssh $fvserver flowvisor-confirm-fvslice-exists $fv_slicename false
    169 ssh $fvserver flowvisor-confirm-flowspace-rule-count $fv_slicename 0
     162foam-verify-sliver -q $foamserver $fvserver $sliver_urn status rejected false 0
    170163}}}
    171164
    … …  
    174167{{{
    175168ssh $foamserver foamctl geni:disable-sliver -u $sliver_urn --passwd-file=/opt/foam/etc/foampasswd
    176 ssh $foamserver foam-confirm-sliver $sliver_urn status pending
    177 ssh $fvserver flowvisor-confirm-fvslice-exists $fv_slicename false
    178 ssh $fvserver flowvisor-confirm-flowspace-rule-count $fv_slicename 0
     169foam-verify-sliver -q $foamserver $fvserver $sliver_urn status pending false 0
    179170}}}
    180171
    … …  
    183174{{{
    184175ssh $foamserver foamctl geni:reject-sliver -u $sliver_urn --passwd-file=/opt/foam/etc/foampasswd
    185 ssh $foamserver foam-confirm-sliver $sliver_urn status rejected
    186 ssh $fvserver flowvisor-confirm-fvslice-exists $fv_slicename false
    187 ssh $fvserver flowvisor-confirm-flowspace-rule-count $fv_slicename 0
     176foam-verify-sliver -q $foamserver $fvserver $sliver_urn status rejected false 0
    188177}}}
    189178
    … …  
    192181{{{
    193182ssh $foamserver foamctl geni:approve-sliver -u $sliver_urn --passwd-file=/opt/foam/etc/foampasswd
    194 ssh $foamserver foam-confirm-sliver $sliver_urn status approved
    195 ssh $fvserver flowvisor-confirm-fvslice-exists $fv_slicename true
    196 ssh $fvserver flowvisor-confirm-flowspace-rule-count $fv_slicename 2
     183foam-verify-sliver -q $foamserver $fvserver $sliver_urn status approved true 2
    197184}}}
    198185
    … …  
    201188{{{
    202189ssh $foamserver foamctl geni:delete-sliver -u $sliver_urn --passwd-file=/opt/foam/etc/foampasswd
    203 ssh $foamserver foam-confirm-sliver $sliver_urn deleted true
    204 ssh $fvserver flowvisor-confirm-fvslice-exists $fv_slicename false
    205 ssh $fvserver flowvisor-confirm-flowspace-rule-count $fv_slicename 0
     190foam-verify-sliver -q $foamserver $fvserver $sliver_urn deleted true false 0
    206191}}}
    207192