Changes between Version 6 and Version 7 of GEC21Agenda/ChoiceNet/topology


Ignore:
Timestamp:
10/16/14 15:37:37 (10 years ago)
Author:
Hussamuddin Nasir
Comment:

--

Legend:

Unmodified
Added
Removed
Modified

  • GEC21Agenda/ChoiceNet/topology

    v6 v7  
    1414  {{{
    1515#!xml
    16 <rspec type="request" generated_by="Flack" generated="2014-10-13T17:23:06Z" xsi:schemaLocation="http://www.geni.net/resources/rspec/3 http://www.geni.net/resources/rspec/3/request.xsd  " xmlns:flack="http://www.protogeni.net/resources/rspec/ext/flack/1" xmlns:client="http://www.protogeni.net/resources/rspec/ext/client/1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.geni.net/resources/rspec/3">
     16<rspec type="request" generated_by="Flack" generated="2014-10-13T17:23:06Z" xsi:schemaLocation="http://www.geni.net/resources/rspec/3 http://www.geni.net/resources/rspec/3/request.xsd  " xmlns:flack="http://www.protogeni.net/resources/rspec/ext/flack/1" xmlns:client="http://www.protogeni.net/resources/rspec/ext/client/1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <rspec type="request" generated_by="Flack" generated="2014-10-13T17:23:06Z" xsi:schemaLocation="http://www.geni.net/resources/rspec/3 http://www.geni.net/resources/rspec/3/request.xsd  " xmlns:flack="http://www.protogeni.net/resources/rspec/ext/flack/1" xmlns:client="http://www.protogeni.net/resources/rspec/ext/client/1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.geni.net/resources/rspec/3">
    1717  <node client_id="srcr"  exclusive="false" xmlns:color="http://www.geni.net/resources/rspec/ext/color/2">
    1818    <color:resource_color color="gemini" xmlns:gemini="http://www.geni.net/resources/rspec/ext/gemini/1" xmlns="http://www.geni.net/resources/rspec/ext/color/2">
    … …  
    3636    </services>
    3737    <interface client_id="srcr:if1">
    38       <ip address="10.10.7.1" netmask="255.255.255.0" type=""/>
     38      <ip address="10.10.7.1" netmask="255.255.255.0" type="ipv4"/>
    3939    </interface>
    4040    <interface client_id="srcr:if2">
    41       <ip address="10.10.5.2" netmask="255.255.255.0" type=""/>
     41      <ip address="10.10.5.2" netmask="255.255.255.0" type="ipv4"/>
    4242    </interface>
    4343    <interface client_id="srcr:if4">
    44       <ip address="10.10.2.1" netmask="255.255.255.0" type=""/>
     44      <ip address="10.10.2.1" netmask="255.255.255.0" type="ipv4"/>
    4545    </interface>
    4646    <interface client_id="srcr:if0">
    47       <ip address="10.10.1.2" netmask="255.255.255.0" type=""/>
     47      <ip address="10.10.1.2" netmask="255.255.255.0" type="ipv4"/>
    4848    </interface>
    4949  </node>
    … …  
    6868      <install install_path="/tmp" url="http://gemini.netlab.uky.edu/ovs_start.tgz"/>
    6969    </services>
    70 
    7170    <interface client_id="LB:if0">
    72       <ip address="10.10.5.1" netmask="255.255.255.0" type=""/>
     71      <ip address="10.10.5.1" netmask="255.255.255.0" type="ipv4"/>
    7372    </interface>
    7473    <interface client_id="LB:if1">
    75       <ip address="10.10.6.1" netmask="255.255.255.0" type=""/>
     74      <ip address="10.10.6.1" netmask="255.255.255.0" type="ipv4"/>
    7675    </interface>
    7776  </node>
    … …  
    9392    </sliver_type>
    9493    <interface client_id="dstr:if2">
    95       <ip address="10.10.8.2" netmask="255.255.255.0" type=""/>
     94      <ip address="10.10.8.2" netmask="255.255.255.0" type="ipv4"/>
    9695    </interface>
    9796    <interface client_id="dstr:if3">
    98       <ip address="10.10.6.2" netmask="255.255.255.0" type=""/>
     97      <ip address="10.10.6.2" netmask="255.255.255.0" type="ipv4"/>
    9998    </interface>
    10099    <interface client_id="dstr:if4">
    101       <ip address="10.10.3.1" netmask="255.255.255.0" type=""/>
     100      <ip address="10.10.3.1" netmask="255.255.255.0" type="ipv4"/>
    102101    </interface>
    103102    <interface client_id="dstr:if0">
    104       <ip address="10.10.4.2" netmask="255.255.255.0" type=""/>
     103      <ip address="10.10.4.2" netmask="255.255.255.0" type="ipv4"/>
    105104    </interface>
    106105        <services>
    … …  
    108107      <install install_path="/tmp" url="http://gemini.netlab.uky.edu/ovs_start.tgz"/>
    109108    </services>
    110 
    111109  </node>
    112110  <node client_id="H2"  exclusive="false" xmlns:emulab="http://www.protogeni.net/resources/rspec/ext/emulab/1" xmlns:color="http://www.geni.net/resources/rspec/ext/color/2">
    … …  
    128126    <sliver_type name="emulab-xen"/>
    129127    <interface client_id="H2:if0">
    130       <ip address="10.10.4.1" netmask="255.255.255.0" type=""/>
    131      
    132     </interface>
     128      <ip address="10.10.4.1" netmask="255.255.255.0" type="ipv4"/>
     129    </interface>
     130    <services>
     131      <execute command="sudo apt-get -y update;sudo apt-get -y install iperf" shell="sh"/>
     132    </services>
    133133  </node>
    134134  <node client_id="H1"  exclusive="false" xmlns:emulab="http://www.protogeni.net/resources/rspec/ext/emulab/1" xmlns:color="http://www.geni.net/resources/rspec/ext/color/2">
    … …  
    150150    <sliver_type name="emulab-xen"/>
    151151    <interface client_id="H1:if0">
    152       <ip address="10.10.1.1" netmask="255.255.255.0" type=""/>
    153     </interface>
     152      <ip address="10.10.1.1" netmask="255.255.255.0" type="ipv4"/>
     153    </interface>
     154       <services>
     155      <execute command="sudo apt-get -y update;sudo apt-get -y install iperf" shell="sh"/>
     156    </services>
    154157  </node>
    155158  <node client_id="HLHB"  exclusive="false" xmlns:color="http://www.geni.net/resources/rspec/ext/color/2">
    … …  
    170173    </sliver_type>
    171174    <interface client_id="HLHB:if0">
    172       <ip address="10.10.2.2" netmask="255.255.255.0" type=""/>
     175      <ip address="10.10.2.2" netmask="255.255.255.0" type="ipv4"/>
    173176    </interface>
    174177    <interface client_id="HLHB:if1">
    175       <ip address="10.10.3.2" netmask="255.255.255.0" type=""/>
     178      <ip address="10.10.3.2" netmask="255.255.255.0" type="ipv4"/>
    176179    </interface>
    177180        <services>
    … …  
    179182      <install install_path="/tmp" url="http://gemini.netlab.uky.edu/ovs_start.tgz"/>
    180183    </services>
    181 
    182   </node>
     184   </node>
    183185  <node client_id="HB"  exclusive="false" xmlns:color="http://www.geni.net/resources/rspec/ext/color/2">
    184186    <color:resource_color color="gemini" xmlns:gemini="http://www.geni.net/resources/rspec/ext/gemini/1" xmlns="http://www.geni.net/resources/rspec/ext/color/2">
    … …  
    198200    </sliver_type>
    199201    <interface client_id="HB:if0">
    200       <ip address="10.10.7.2" netmask="255.255.255.0" type=""/>
     202      <ip address="10.10.7.2" netmask="255.255.255.0" type="ipv4"/>
    201203    </interface>
    202204    <interface client_id="HB:if1">
    203       <ip address="10.10.8.1" netmask="255.255.255.0" type=""/>
     205      <ip address="10.10.8.1" netmask="255.255.255.0" type="ipv4"/>
    204206    </interface>
    205207        <services>