From ae1080c568ca7841d3c88d570de5f73782425ffa Mon Sep 17 00:00:00 2001
From: Cedric Ollivier <cedric.ollivier@orange.com>
Date: Thu, 8 Feb 2018 20:48:09 +0000
Subject: Update git submodules

* Update docs/submodules/functest from branch 'master'
  - Merge "Refactor tempest resource manager"
  - Refactor tempest resource manager

    Split resource creation into several methods.

    Implements partly JIRA: FUNCTEST-913

    Change-Id: Ic0dd5782c604498066c636deef10b0c18c1cb48d
    Signed-off-by: Juha Kosonen <juha.kosonen@nokia.com>
---
 docs/submodules/functest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/submodules/functest b/docs/submodules/functest
index 89bb80232..57539ef2f 160000
--- a/docs/submodules/functest
+++ b/docs/submodules/functest
@@ -1 +1 @@
-Subproject commit 89bb80232f777b0619d4168b292338c16a0a704c
+Subproject commit 57539ef2f4633db2a31a27bad5c622f5aaef1ea7
-- 
cgit 

d>
<td class='main'><a href='/'>index</a> : <a title='yardstick' href='/yardstick/'>yardstick</a></td><td class='form'><form method='get'>
<input type='hidden' name='id' value='009140f8947fc42f4d049c6d414ad7b18f32be35'/><select name='h' onchange='this.form.submit();'>
<option value='master'>master</option>
<option value='stable/brahmaputra'>stable/brahmaputra</option>
<option value='stable/colorado'>stable/colorado</option>
<option value='stable/danube'>stable/danube</option>
<option value='stable/euphrates'>stable/euphrates</option>
<option value='stable/fraser'>stable/fraser</option>
<option value='stable/gambia'>stable/gambia</option>
<option value='stable/hunter'>stable/hunter</option>
<option value='stable/iruya'>stable/iruya</option>
</select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'></td><td class='sub right'>Grokmirror user</td></tr></table>
<table class='tabs'><tr><td>
<a href='/yardstick/about/?h=danube.1.0'>about</a><a href='/yardstick/?h=danube.1.0'>summary</a><a href='/yardstick/refs/?h=danube.1.0&amp;id=009140f8947fc42f4d049c6d414ad7b18f32be35'>refs</a><a href='/yardstick/log/tools/yardstick-img-dpdk-finalize.sh?h=danube.1.0'>log</a><a class='active' href='/yardstick/tree/tools/yardstick-img-dpdk-finalize.sh?h=danube.1.0&amp;id=009140f8947fc42f4d049c6d414ad7b18f32be35'>tree</a><a href='/yardstick/commit/tools/yardstick-img-dpdk-finalize.sh?h=danube.1.0&amp;id=009140f8947fc42f4d049c6d414ad7b18f32be35'>commit</a><a href='/yardstick/diff/tools/yardstick-img-dpdk-finalize.sh?h=danube.1.0&amp;id=009140f8947fc42f4d049c6d414ad7b18f32be35'>diff</a><a href='/yardstick/stats/tools/yardstick-img-dpdk-finalize.sh?h=danube.1.0'>stats</a></td><td class='form'><form class='right' method='get' action='/yardstick/log/tools/yardstick-img-dpdk-finalize.sh'>
<input type='hidden' name='h' value='danube.1.0'/><input type='hidden' name='id' value='009140f8947fc42f4d049c6d414ad7b18f32be35'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/yardstick/tree/?h=danube.1.0&amp;id=009140f8947fc42f4d049c6d414ad7b18f32be35'>root</a>/<a href='/yardstick/tree/tools?h=danube.1.0&amp;id=009140f8947fc42f4d049c6d414ad7b18f32be35'>tools</a>/<a href='/yardstick/tree/tools/yardstick-img-dpdk-finalize.sh?h=danube.1.0&amp;id=009140f8947fc42f4d049c6d414ad7b18f32be35'>yardstick-img-dpdk-finalize.sh</a></div><div class='content'>blob: d8214d52fe35990cad610b2585e518dad14111ef (<a href='/yardstick/plain/tools/yardstick-img-dpdk-finalize.sh?h=danube.1.0&amp;id=009140f8947fc42f4d049c6d414ad7b18f32be35'>plain</a>)
<table summary='blob content' class='blob'>
<tr><td class='linenumbers'><pre><a id='n1' href='#n1'>1</a>
<a id='n2' href='#n2'>2</a>
<a id='n3' href='#n3'>3</a>
<a id='n4' href='#n4'>4</a>
<a id='n5' href='#n5'>5</a>
<a id='n6' href='#n6'>6</a>
<a id='n7' href='#n7'>7</a>
<a id='n8' href='#n8'>8</a>
<a id='n9' href='#n9'>9</a>
<a id='n10' href='#n10'>10</a>
<a id='n11' href='#n11'>11</a>
<a id='n12' href='#n12'>12</a>
<a id='n13' href='#n13'>13</a>
<a id='n14' href='#n14'>14</a>
<a id='n15' href='#n15'>15</a>
<a id='n16' href='#n16'>16</a>
<a id='n17' href='#n17'>17</a>
<a id='n18' href='#n18'>18</a>
<a id='n19' href='#n19'>19</a>
<a id='n20' href='#n20'>20</a>
<a id='n21' href='#n21'>21</a>
<a id='n22' href='#n22'>22</a>
<a id='n23' href='#n23'>23</a>
<a id='n24' href='#n24'>24</a>
<a id='n25' href='#n25'>25</a>
<a id='n26' href='#n26'>26</a>
<a id='n27' href='#n27'>27</a>
<a id='n28' href='#n28'>28</a>
<a id='n29' href='#n29'>29</a>
<a id='n30' href='#n30'>30</a>
<a id='n31' href='#n31'>31</a>
<a id='n32' href='#n32'>32</a>
<a id='n33' href='#n33'>33</a>
<a id='n34' href='#n34'>34</a>
<a id='n35' href='#n35'>35</a>
<a id='n36' href='#n36'>36</a>
<a id='n37' href='#n37'>37</a>
<a id='n38' href='#n38'>38</a>
<a id='n39' href='#n39'>39</a>
<a id='n40' href='#n40'>40</a>
<a id='n41' href='#n41'>41</a>
<a id='n42' href='#n42'>42</a>
<a id='n43' href='#n43'>43</a>
<a id='n44' href='#n44'>44</a>
<a id='n45' href='#n45'>45</a>
<a id='n46' href='#n46'>46</a>
<a id='n47' href='#n47'>47</a>
<a id='n48' href='#n48'>48</a>
<a id='n49' href='#n49'>49</a>
<a id='n50' href='#n50'>50</a>
<a id='n51' href='#n51'>51</a>
</pre></td>
<td class='lines'><pre><code><style>.highlight .hll { background-color: #ffffcc }
.highlight .c { color: #888888 } /* Comment */
.highlight .err { color: #a61717; background-color: #e3d2d2 } /* Error */
.highlight .k { color: #008800; font-weight: bold } /* Keyword */
.highlight .ch { color: #888888 } /* Comment.Hashbang */
.highlight .cm { color: #888888 } /* Comment.Multiline */
.highlight .cp { color: #cc0000; font-weight: bold } /* Comment.Preproc */
.highlight .cpf { color: #888888 } /* Comment.PreprocFile */
.highlight .c1 { color: #888888 } /* Comment.Single */
.highlight .cs { color: #cc0000; font-weight: bold; background-color: #fff0f0 } /* Comment.Special */
.highlight .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */
.highlight .ge { font-style: italic } /* Generic.Emph */
.highlight .gr { color: #aa0000 } /* Generic.Error */
.highlight .gh { color: #333333 } /* Generic.Heading */
.highlight .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */
.highlight .go { color: #888888 } /* Generic.Output */
.highlight .gp { color: #555555 } /* Generic.Prompt */
.highlight .gs { font-weight: bold } /* Generic.Strong */
.highlight .gu { color: #666666 } /* Generic.Subheading */
.highlight .gt { color: #aa0000 } /* Generic.Traceback */
.highlight .kc { color: #008800; font-weight: bold } /* Keyword.Constant */
.highlight .kd { color: #008800; font-weight: bold } /* Keyword.Declaration */
.highlight .kn { color: #008800; font-weight: bold } /* Keyword.Namespace */
.highlight .kp { color: #008800 } /* Keyword.Pseudo */
.highlight .kr { color: #008800; font-weight: bold } /* Keyword.Reserved */
.highlight .kt { color: #888888; font-weight: bold } /* Keyword.Type */
.highlight .m { color: #0000DD; font-weight: bold } /* Literal.Number */
.highlight .s { color: #dd2200; background-color: #fff0f0 } /* Literal.String */
.highlight .na { color: #336699 } /* Name.Attribute */
.highlight .nb { color: #003388 } /* Name.Builtin */
.highlight .nc { color: #bb0066; font-weight: bold } /* Name.Class */
.highlight .no { color: #003366; font-weight: bold } /* Name.Constant */
.highlight .nd { color: #555555 } /* Name.Decorator */
.highlight .ne { color: #bb0066; font-weight: bold } /* Name.Exception */
.highlight .nf { color: #0066bb; font-weight: bold } /* Name.Function */
.highlight .nl { color: #336699; font-style: italic } /* Name.Label */
.highlight .nn { color: #bb0066; font-weight: bold } /* Name.Namespace */
.highlight .py { color: #336699; font-weight: bold } /* Name.Property */
.highlight .nt { color: #bb0066; font-weight: bold } /* Name.Tag */
.highlight .nv { color: #336699 } /* Name.Variable */
.highlight .ow { color: #008800 } /* Operator.Word */
.highlight .w { color: #bbbbbb } /* Text.Whitespace */
.highlight .mb { color: #0000DD; font-weight: bold } /* Literal.Number.Bin */
.highlight .mf { color: #0000DD; font-weight: bold } /* Literal.Number.Float */
.highlight .mh { color: #0000DD; font-weight: bold } /* Literal.Number.Hex */
.highlight .mi { color: #0000DD; font-weight: bold } /* Literal.Number.Integer */
.highlight .mo { color: #0000DD; font-weight: bold } /* Literal.Number.Oct */
.highlight .sa { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Affix */
.highlight .sb { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Backtick */
.highlight .sc { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Char */
.highlight .dl { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Delimiter */
.highlight .sd { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Doc */
.highlight .s2 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Double */
.highlight .se { color: #0044dd; background-color: #fff0f0 } /* Literal.String.Escape */
.highlight .sh { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Heredoc */
.highlight .si { color: #3333bb; background-color: #fff0f0 } /* Literal.String.Interpol */
.highlight .sx { color: #22bb22; background-color: #f0fff0 } /* Literal.String.Other */
.highlight .sr { color: #008800; background-color: #fff0ff } /* Literal.String.Regex */
.highlight .s1 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Single */
.highlight .ss { color: #aa6600; background-color: #fff0f0 } /* Literal.String.Symbol */
.highlight .bp { color: #003388 } /* Name.Builtin.Pseudo */
.highlight .fm { color: #0066bb; font-weight: bold } /* Name.Function.Magic */
.highlight .vc { color: #336699 } /* Name.Variable.Class */
.highlight .vg { color: #dd7700 } /* Name.Variable.Global */
.highlight .vi { color: #3333bb } /* Name.Variable.Instance */
.highlight .vm { color: #336699 } /* Name.Variable.Magic */
.highlight .il { color: #0000DD; font-weight: bold } /* Literal.Number.Integer.Long */</style><div class="highlight"><pre><span></span><span class="ch">#!/bin/bash</span>
<span class="c1">##############################################################################</span>
<span class="c1"># Copyright (c) 2017 ZTE corporation and others.</span>
<span class="c1">#</span>
<span class="c1"># All rights reserved. This program and the accompanying materials</span>
<span class="c1"># are made available under the terms of the Apache License, Version 2.0</span>
<span class="c1"># which accompanies this distribution, and is available at</span>
<span class="c1"># http://www.apache.org/licenses/LICENSE-2.0</span>
<span class="c1">##############################################################################</span>


<span class="c1"># installs dpdk and pktgen packages on modified image</span>

<span class="c1"># PREREQUISITES</span>
<span class="c1"># modified image (yardstick-wily-server) must be uploaded to OpenStack</span>
<span class="c1"># heat must be installed: apt-get install python-heatclient, python-glanceclient, python-nova</span>
<span class="c1"># must have a public yardstick-key uploaded in openstack</span>
<span class="c1"># must have a proper flavor for the image (i.e. m1.small)</span>


<span class="nv">stackname</span><span class="o">=</span><span class="s2">&quot;yardstick-modify-stack&quot;</span>
<span class="nv">template</span><span class="o">=</span>dpdk_install.yml
<span class="nv">new_image_name</span><span class="o">=</span><span class="s2">&quot;yardstick-image-pktgen-ready&quot;</span>

openstack stack create <span class="nv">$stackname</span> -f yaml -t <span class="nv">$template</span>
<span class="nv">progress</span><span class="o">=</span><span class="s2">&quot;WARMING_UP&quot;</span>

<span class="k">while</span> <span class="o">[</span> <span class="s2">&quot;</span><span class="nv">$progress</span><span class="s2">&quot;</span> !<span class="o">=</span> <span class="s2">&quot;CREATE_COMPLETE&quot;</span> <span class="o">]</span>
<span class="k">do</span>
  sleep <span class="m">10</span>
  <span class="nb">echo</span> <span class="s2">&quot;check stack status.......&quot;</span>
  <span class="nv">show_output</span><span class="o">=</span><span class="k">$(</span>openstack stack show <span class="nv">$stackname</span><span class="k">)</span>
  <span class="nv">progress</span><span class="o">=</span><span class="k">$(</span><span class="nb">echo</span> <span class="nv">$show_output</span> <span class="p">|</span> sed <span class="s1">&#39;s/^.*stack_status . \([^ ]*\).*$/\1/&#39;</span><span class="k">)</span>
  <span class="nb">echo</span> <span class="s2">&quot;</span><span class="nv">$progress</span><span class="s2">&quot;</span>
  <span class="k">if</span> <span class="o">[</span> <span class="s2">&quot;</span><span class="nv">$progress</span><span class="s2">&quot;</span> <span class="o">==</span> <span class="s2">&quot;CREATE_FAILED&quot;</span> <span class="o">]</span><span class="p">;</span><span class="k">then</span>
    <span class="nb">echo</span> <span class="s2">&quot;create </span><span class="nv">$stackname</span><span class="s2"> failed&quot;</span>
    <span class="nb">exit</span> <span class="m">1</span>
  <span class="k">fi</span>
<span class="k">done</span>

<span class="c1"># workaround: Without wait time, the file size of pktgen is zero in the snapshot.</span>
sleep <span class="m">60</span>

<span class="nv">status</span><span class="o">=</span><span class="k">$(</span>nova image-create --poll <span class="nv">$stackname</span> <span class="nv">$new_image_name</span><span class="k">)</span>
<span class="k">if</span> <span class="o">[[</span> <span class="s2">&quot;</span><span class="nv">$status</span><span class="s2">&quot;</span> <span class="o">=</span>~ <span class="s2">&quot;Finished&quot;</span> <span class="o">]]</span><span class="p">;</span><span class="k">then</span>
  <span class="nb">echo</span> <span class="s2">&quot;</span><span class="nv">$new_image_name</span><span class="s2"> finished&quot;</span>
<span class="k">fi</span>

nova delete <span class="nv">$stackname</span>
sleep <span class="m">10</span>
openstack stack delete --yes <span class="nv">$stackname</span>
</pre></div>
</code></pre></td></tr></table>
</div> <!-- class=content -->
<div id="lfcollabprojects-footer">
  <div class="gray-diagonal">
    <div class="footer-inner">
      <p>
        &copy; 2015
        <a href="https://opnfv.org/">Open Platform for NFV Project, Inc</a>., a
        Linux Foundation Collaborative Project. All Rights Reserved.
      </p>
      <p>
        Open Platform for NFV and OPNFV are trademarks of the Open Platform for
        NFV Project, Inc.
      </p>
      <p>
        Linux Foundation is a registered trademark of The Linux Foundation.
        Linux is a registered
        <a
          href="http://www.linuxfoundation.org/programs/legal/trademark"
          title="Linux Mark Institute"
          >trademark</a
        >
        of Linus Torvalds.
      </p>
      <p>
        Please see our
        <a href="https://opnfv.org/about/bylaws-and-policies/terms-use"
          >terms of use</a
        >,
        <a href="https://opnfv.org/about/bylaws-and-policies/trademarks"
          >trademark policy</a
        >, and
        <a href="https://opnfv.org/about/bylaws-and-policies/privacy-policy"
          >privacy policy</a
        >.
      </p>
    </div>
  </div>
</div>
</div> <!-- id=cgit -->
</body>
</html>
