From 1eea12d39c67f96772ef6425154ffb7c9225b83a Mon Sep 17 00:00:00 2001 From: Deepthi V V Date: Mon, 20 Jan 2014 16:09:54 +0530 Subject: [PATCH] Updated port-types yang file to adhere to pyang validation. OF Plugin review: https://git.opendaylight.org/gerrit/#/c/4434/ Signed-off-by: Deepthi V V Change-Id: I4e1d0dd355864d7ed3f6f9ce4251d20db40a5a05 --- .../sal/compatibility/NodeMapping.xtend | 16 ++++++------- ...ypes.yang => opendaylight-port-types.yang} | 23 +++++++++---------- 2 files changed, 19 insertions(+), 20 deletions(-) rename opendaylight/md-sal/model/model-flow-base/src/main/yang/{port-types.yang => opendaylight-port-types.yang} (92%) diff --git a/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/NodeMapping.xtend b/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/NodeMapping.xtend index 4378e7dffe..a3be5dd970 100644 --- a/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/NodeMapping.xtend +++ b/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/NodeMapping.xtend @@ -234,21 +234,21 @@ public class NodeMapping { public static def toAdBandwidth(PortFeatures pf) { var Bandwidth bw = null - if (pf.is_10mbHd || pf.is_10mbFd) { + if (pf.isTenMbHd || pf.isTenMbFd) { bw = new Bandwidth(Bandwidth.BW10Mbps) - } else if (pf.is_100mbHd || pf.is_100mbFd) { + } else if (pf.isHundredMbHd || pf.isHundredMbFd) { bw = new Bandwidth(Bandwidth.BW100Mbps) - } else if (pf.is_1gbHd || pf.is_1gbFd) { + } else if (pf.isOneGbHd || pf.isOneGbFd) { bw = new Bandwidth(Bandwidth.BW1Gbps) - } else if (pf.is_1gbFd) { + } else if (pf.isOneGbFd) { bw = new Bandwidth(Bandwidth.BW10Gbps) - } else if (pf.is_10gbFd) { + } else if (pf.isTenGbFd) { bw = new Bandwidth(Bandwidth.BW10Gbps) - } else if (pf.is_40gbFd) { + } else if (pf.isFortyGbFd) { bw = new Bandwidth(Bandwidth.BW40Gbps) - } else if (pf.is_100gbFd) { + } else if (pf.isHundredGbFd) { bw = new Bandwidth(Bandwidth.BW100Gbps) - } else if (pf.is_1tbFd) { + } else if (pf.isOneTbFd) { bw = new Bandwidth(Bandwidth.BW1Tbps) } return bw; diff --git a/opendaylight/md-sal/model/model-flow-base/src/main/yang/port-types.yang b/opendaylight/md-sal/model/model-flow-base/src/main/yang/opendaylight-port-types.yang similarity index 92% rename from opendaylight/md-sal/model/model-flow-base/src/main/yang/port-types.yang rename to opendaylight/md-sal/model/model-flow-base/src/main/yang/opendaylight-port-types.yang index 2554fffadb..f1cbd8dc29 100644 --- a/opendaylight/md-sal/model/model-flow-base/src/main/yang/port-types.yang +++ b/opendaylight/md-sal/model/model-flow-base/src/main/yang/opendaylight-port-types.yang @@ -2,7 +2,6 @@ module opendaylight-port-types { namespace "urn:opendaylight:flow:types:port"; prefix port-types; - import ietf-inet-types {prefix inet; revision-date "2010-09-24";} import ietf-yang-types {prefix yang; revision-date "2010-09-24";} import opendaylight-queue-types {prefix queue-types; revision-date "2013-09-25";} @@ -41,16 +40,16 @@ module opendaylight-port-types { typedef port-features { type bits { - bit 10mb-hd; - bit 10mb-fd; - bit 100mb-hd; - bit 100mb-fd; - bit 1gb-hd; - bit 1gb-fd; - bit 10gb-fd; - bit 40gb-fd; - bit 100gb-fd; - bit 1tb-fd; + bit ten-mb-hd; + bit ten-mb-fd; + bit hundred-mb-hd; + bit hundred-mb-fd; + bit one-gb-hd; + bit one-gb-fd; + bit ten-gb-fd; + bit forty-gb-fd; + bit hundred-gb-fd; + bit one-tb-fd; bit other; bit copper; bit fiber; @@ -171,4 +170,4 @@ module opendaylight-port-types { } } } -} \ No newline at end of file +} -- 2.36.6