Revert "tests: Separate test files from Ryu module"

This reverts commit a67ed2858417b9d795460f05126c01fb0cd344f9.

The commit breaks OpenStack neutron dynamic routing.

1 files changed, 0 insertions, 92 deletions

diff --git a/tests/unit/packet/test_mpls.py b/tests/unit/packet/test_mpls.py
deleted file mode 100644
index e3f9bccf..00000000
--- a/tests/unit/packet/test_mpls.py
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright (C) 2013 Nippon Telegraph and Telephone Corporation.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# 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.
-
-
-import unittest
-import logging
-import inspect
-
-from nose.tools import eq_
-from ryu.lib.packet import mpls
-
-
-LOG = logging.getLogger(__name__)
-
-
-class Test_mpls(unittest.TestCase):
-
-    label = 29
-    exp = 6
-    bsb = 1
-    ttl = 64
-    mp = mpls.mpls(label, exp, bsb, ttl)
-
-    def setUp(self):
-        pass
-
-    def tearDown(self):
-        pass
-
-    def test_to_string(self):
-        mpls_values = {'label': self.label,
-                       'exp': self.exp,
-                       'bsb': self.bsb,
-                       'ttl': self.ttl}
-        _mpls_str = ','.join(['%s=%s' % (k, repr(mpls_values[k]))
-                              for k, v in inspect.getmembers(self.mp)
-                              if k in mpls_values])
-        mpls_str = '%s(%s)' % (mpls.mpls.__name__, _mpls_str)
-
-        eq_(str(self.mp), mpls_str)
-        eq_(repr(self.mp), mpls_str)
-
-    def test_json(self):
-        jsondict = self.mp.to_jsondict()
-        mp = mpls.mpls.from_jsondict(jsondict['mpls'])
-        eq_(str(self.mp), str(mp))
-
-    def test_label_from_bin_true(self):
-        mpls_label = 0xfffff
-        is_bos = True
-        buf = b'\xff\xff\xf1'
-        mpls_label_out, is_bos_out = mpls.label_from_bin(buf)
-
-        eq_(mpls_label, mpls_label_out)
-        eq_(is_bos, is_bos_out)
-
-    def test_label_from_bin_false(self):
-        mpls_label = 0xfffff
-        is_bos = False
-        buf = b'\xff\xff\xf0'
-        mpls_label_out, is_bos_out = mpls.label_from_bin(buf)
-
-        eq_(mpls_label, mpls_label_out)
-        eq_(is_bos, is_bos_out)
-
-    def test_label_to_bin_true(self):
-        mpls_label = 0xfffff
-        is_bos = True
-        label = b'\xff\xff\xf1'
-        label_out = mpls.label_to_bin(mpls_label, is_bos)
-
-        eq_(label, label_out)
-
-    def test_label_to_bin_false(self):
-        mpls_label = 0xfffff
-        is_bos = False
-        label = b'\xff\xff\xf0'
-        label_out = mpls.label_to_bin(mpls_label, is_bos)
-
-        eq_(label, label_out)