X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=src%2Femuvim%2Fdcemulator%2Fnet.py;h=ea9fd1c1d2548c7eb7a10bb18369a7c589b533fb;hb=4e5c81ecd37e7383c52dad55079f91b90dec22fe;hp=7efb3f0ff19d00a29073faea4ff3106babc35e79;hpb=b5e1c8935bcfbe76bdee4039d160031ba85d8016;p=osm%2Fvim-emu.git diff --git a/src/emuvim/dcemulator/net.py b/src/emuvim/dcemulator/net.py index 7efb3f0..ea9fd1c 100755 --- a/src/emuvim/dcemulator/net.py +++ b/src/emuvim/dcemulator/net.py @@ -14,7 +14,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. -Neither the name of the SONATA-NFV [, ANY ADDITIONAL AFFILIATION] +Neither the name of the SONATA-NFV, Paderborn University nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -113,7 +113,7 @@ class DCNetwork(Containernet): self.DCNetwork_graph = nx.MultiDiGraph() # initialize pool of vlan tags to setup the SDN paths - self.vlans = range(4096)[::-1] + self.vlans = range(1, 4095)[::-1] # link to Ryu REST_API ryu_ip = 'localhost' @@ -249,11 +249,11 @@ class DCNetwork(Containernet): try: self.DCNetwork_graph.remove_edge(node2.name, node1.name) except: - LOG.warning("%s not found in DCNetwork_graph." % ((node2.name, node1.name))) + LOG.warning("%s, %s not found in DCNetwork_graph." % ((node2.name, node1.name))) try: self.DCNetwork_graph.remove_edge(node1.name, node2.name) except: - LOG.warning("%s not found in DCNetwork_graph." % ((node1.name, node2.name))) + LOG.warning("%s, %s not found in DCNetwork_graph." % ((node1.name, node2.name))) def addDocker( self, label, **params ): """ @@ -568,7 +568,7 @@ class DCNetwork(Containernet): pass - cmd = kwargs.get('cmd') + cmd = kwargs.get('cmd', 'add-flow') if cmd == 'add-flow' or cmd == 'del-flows': ret = self._chainAddFlow(vnf_src_name, vnf_dst_name, vnf_src_interface, vnf_dst_interface, **kwargs) if kwargs.get('bidirectional'):