d4e8026aa8
Revert recent py3 changes under ryu/contrib, namely parts of the following commits: - commite2dfdbf580("Treatment was not enough") and - commit325c9ae9c3("Syntax level compatibility with Python 3") Because: - Some of them are broken (stream.py) - Changes like these should go to upstream Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
71 lines
2.0 KiB
Python
71 lines
2.0 KiB
Python
# Copyright (c) 2009, 2010, 2011 Nicira, Inc.
|
|
#
|
|
# 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 re
|
|
import uuid
|
|
|
|
from ovs.db import error
|
|
import ovs.db.parser
|
|
|
|
uuidRE = re.compile("^xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx$"
|
|
.replace('x', '[0-9a-fA-F]'))
|
|
|
|
|
|
def zero():
|
|
return uuid.UUID(int=0)
|
|
|
|
|
|
def is_valid_string(s):
|
|
return uuidRE.match(s) is not None
|
|
|
|
|
|
def from_string(s):
|
|
if not is_valid_string(s):
|
|
raise error.Error("%s is not a valid UUID" % s)
|
|
return uuid.UUID(s)
|
|
|
|
|
|
def from_json(json, symtab=None):
|
|
try:
|
|
s = ovs.db.parser.unwrap_json(json, "uuid", [str, unicode], "string")
|
|
if not uuidRE.match(s):
|
|
raise error.Error("\"%s\" is not a valid UUID" % s, json)
|
|
return uuid.UUID(s)
|
|
except error.Error, e:
|
|
if not symtab:
|
|
raise e
|
|
try:
|
|
name = ovs.db.parser.unwrap_json(json, "named-uuid",
|
|
[str, unicode], "string")
|
|
except error.Error:
|
|
raise e
|
|
|
|
if name not in symtab:
|
|
symtab[name] = uuid.uuid4()
|
|
return symtab[name]
|
|
|
|
|
|
def to_json(uuid_):
|
|
return ["uuid", str(uuid_)]
|
|
|
|
|
|
def to_c_assignment(uuid_, var):
|
|
"""Returns an array of strings, each of which contain a C statement. The
|
|
statements assign 'uuid_' to a "struct uuid" as defined in Open vSwitch
|
|
lib/uuid.h."""
|
|
|
|
hex_string = uuid_.hex
|
|
return ["%s.parts[%d] = 0x%s;" % (var, x, hex_string[x * 8:(x + 1) * 8])
|
|
for x in range(4)]
|