Skip to content

Commit

Permalink
2018-10-19 Updated ETH service
Browse files Browse the repository at this point in the history 
Updated ETH service model (ietf-eth-tran-service.yang):
- restructure the named and value bandwidth profile configuration
- replaced the te-topology-identifier grouping by the te-types:te-topology-identifier grouping

Model compiled and tree uploaded
  • Loading branch information
@italobusi
italobusi authored Oct 19, 2018
1 parent 9ed8350 commit c6dbcb8
Show file tree
Hide file tree
Showing 2 changed files with 114 additions and 105 deletions.
99 changes: 71 additions & 28 deletions YANG/ccamp/Client-signal-yang/ietf-eth-tran-service.tree
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module: ietf-eth-tran-service
+--rw etht-svc
+--rw globals
| +--rw etht-svc-bandwidth-profiles* [bandwidth-profile-name]
| +--rw named-bandwidth-profiles* [bandwidth-profile-name]
| +--rw bandwidth-profile-name string
| +--rw bandwidth-profile-type? etht-types:bandwidth-profile-type
| +--rw CIR? uint64
Expand All @@ -11,17 +11,21 @@ module: ietf-eth-tran-service
| +--rw color-aware? boolean
| +--rw coupling-flag? boolean
+--rw etht-svc-instances* [etht-svc-name]
+--rw etht-svc-name string
+--rw etht-svc-descr? string
+--rw etht-svc-type? etht-types:service-type
+--rw access-provider-id? te-types:te-global-id
+--rw access-client-id? te-types:te-global-id
+--rw access-topology-id? te-types:te-topology-id
+--rw etht-svc-name string
+--rw etht-svc-id? yang:uuid
+--rw etht-svc-descr? string
+--rw etht-svc-customer? string
+--rw etht-svc-type? etht-types:service-type
+--rw etht-svc-lifecycle? etht-types:lifecycle-status
+--rw te-topology-identifier
| +--rw provider-id? te-types:te-global-id
| +--rw client-id? te-types:te-global-id
| +--rw topology-id? te-types:te-topology-id
+--rw etht-svc-access-ports* [access-port-id]
| +--rw access-port-id uint16
| +--rw access-node-id? te-types:te-node-id
| +--rw access-ltp-id? te-types:te-tp-id
| +--rw service-classification-type? identityref
| +--rw access-port-id uint16
| +--rw access-node-id? te-types:te-node-id
| +--rw access-ltp-id? te-types:te-tp-id
| +--rw service-classification-type? identityref
| +--rw (service-classification)?
| | +--:(port-classification)
| | +--:(vlan-classification)
Expand All @@ -39,45 +43,84 @@ module: ietf-eth-tran-service
| | | +--rw vlan-value? etht-types:vlanid
| | +--:(vlan-bundling)
| | +--rw vlan-range? etht-types:vid-range-type
| +--rw split-horizon-group? string
| +--rw split-horizon-group? string
| +--rw (direction)?
| | +--:(symmetrical)
| | | +--rw ingress-egress-bandwidth-profile-name? string
| | | +--rw ingress-egress-bandwidth-profile
| | | +--rw (style)?
| | | +--:(named)
| | | | +--rw bandwidth-profile-name? string
| | | +--:(value)
| | | +--rw bandwidth-profile-type? etht-types:bandwidth-profile-type
| | | +--rw CIR? uint64
| | | +--rw CBS? uint64
| | | +--rw EIR? uint64
| | | +--rw EBS? uint64
| | | +--rw color-aware? boolean
| | | +--rw coupling-flag? boolean
| | +--:(asymmetrical)
| | +--rw ingress-bandwidth-profile-name? string
| | +--rw egress-bandwidth-profile-name? string
| | +--rw ingress-bandwidth-profile
| | | +--rw (style)?
| | | +--:(named)
| | | | +--rw bandwidth-profile-name? string
| | | +--:(value)
| | | +--rw bandwidth-profile-type? etht-types:bandwidth-profile-type
| | | +--rw CIR? uint64
| | | +--rw CBS? uint64
| | | +--rw EIR? uint64
| | | +--rw EBS? uint64
| | | +--rw color-aware? boolean
| | | +--rw coupling-flag? boolean
| | +--rw egress-bandwidth-profile
| | +--rw (style)?
| | +--:(named)
| | | +--rw bandwidth-profile-name? string
| | +--:(value)
| | +--rw bandwidth-profile-type? etht-types:bandwidth-profile-type
| | +--rw CIR? uint64
| | +--rw CBS? uint64
| | +--rw EIR? uint64
| | +--rw EBS? uint64
| | +--rw color-aware? boolean
| | +--rw coupling-flag? boolean
| +--rw vlan-operations
| +--rw (direction)?
| +--:(symmetrical)
| | +--rw symmetrical-operation
| | +--rw pop-tags? uint8
| | +--rw push-tags
| | +--rw outer-tag!
| | | +--rw tag-type? etht-types:eth-tag-type
| | | +--rw vlan-value? etht-types:vlanid
| | | +--rw tag-type? etht-types:eth-tag-type
| | | +--rw vlan-value? etht-types:vlanid
| | | +--rw default-pcp? uint8
| | +--rw second-tag!
| | +--rw tag-type? etht-types:eth-tag-type
| | +--rw vlan-value? etht-types:vlanid
| | +--rw tag-type? etht-types:eth-tag-type
| | +--rw vlan-value? etht-types:vlanid
| | +--rw default-pcp? uint8
| +--:(asymmetrical)
| +--rw asymmetrical-operation
| +--rw ingress
| | +--rw pop-tags? uint8
| | +--rw push-tags
| | +--rw outer-tag!
| | | +--rw tag-type? etht-types:eth-tag-type
| | | +--rw vlan-value? etht-types:vlanid
| | | +--rw tag-type? etht-types:eth-tag-type
| | | +--rw vlan-value? etht-types:vlanid
| | | +--rw default-pcp? uint8
| | +--rw second-tag!
| | +--rw tag-type? etht-types:eth-tag-type
| | +--rw vlan-value? etht-types:vlanid
| | +--rw tag-type? etht-types:eth-tag-type
| | +--rw vlan-value? etht-types:vlanid
| | +--rw default-pcp? uint8
| +--rw egress
| +--rw pop-tags? uint8
| +--rw push-tags
| +--rw outer-tag!
| | +--rw tag-type? etht-types:eth-tag-type
| | +--rw vlan-value? etht-types:vlanid
| | +--rw tag-type? etht-types:eth-tag-type
| | +--rw vlan-value? etht-types:vlanid
| | +--rw default-pcp? uint8
| +--rw second-tag!
| +--rw tag-type? etht-types:eth-tag-type
| +--rw vlan-value? etht-types:vlanid
| +--rw tag-type? etht-types:eth-tag-type
| +--rw vlan-value? etht-types:vlanid
| +--rw default-pcp? uint8
+--rw etht-svc-tunnels* [tunnel-name]
| +--rw tunnel-name string
| +--rw (svc-multiplexing-tag)?
Expand All @@ -93,7 +136,7 @@ module: ietf-eth-tran-service
| +--rw sending-rate-low? uint64
| +--rw receiving-rate-high? uint64
| +--rw receiving-rate-low? uint64
+--rw admin-status? identityref
+--rw admin-status? identityref
+--ro state
+--ro operational-state? identityref
+--ro provisioning-state? identityref
Expand Down
120 changes: 43 additions & 77 deletions YANG/ccamp/Client-signal-yang/ietf-eth-tran-service.yang
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module ietf-eth-tran-service {

namespace "urn:ietf:params:xml:ns:yang:ietf-eth-tran-svc";
namespace "urn:ietf:params:xml:ns:yang:ietf-eth-tran-service";

prefix "ethtsvc";

Expand Down Expand Up @@ -169,6 +169,32 @@ module ietf-eth-tran-service {
}
}

grouping named-or-value-bandwidth-profile {
description
"A grouping to configure a bandwdith profile either by
referencing a named bandwidth profile or by
configuring the values of the bandwidth profile attributes.";
choice style {
description
"Whether the bandwidth profile is named or defined by value";

case named {
description
"Named bandwidth profile.";
leaf bandwidth-profile-name {
type "string";
description
"Name of the bandwidth profile.";
}
}
case value {
description
"Bandwidth profile configured by value.";
uses etht-types:etht-bandwidth-profiles;
}
}
}

grouping bandwidth-profiles {
description
"A grouping which represent bandwidth profile configuration.";
Expand All @@ -179,71 +205,26 @@ module ietf-eth-tran-service {
asymmetrical";
case symmetrical {
description
"The same bandwidth profile is used to describe the ingress
and the egress bandwidth profile.";

choice style {
"The same bandwidth profile is used to describe both
the ingress and the egress bandwidth profile.";
container ingress-egress-bandwidth-profile {
description
"Whether the bandwidth profile used in
both the ingress and egress direction
is named or defined by value"

case named {
leaf ingress-egress-bandwidth-profile-name {
type "string";
description
"Name of the bandwidth profile used in
both the ingress and egress direction.";
}
}
case value {
container ingress-egress-bandwidth-profile {
uses etht-types:etht-bandwidth-profiles;
}
}
"The bandwdith profile used in both directions.";
uses named-or-value-bandwidth-profile;
}
}
case asymmetrical {
description
"Ingress and egress bandwidth profiles can be specified.";
/* Ingress bandwdith profile */
choice style {
container ingress-bandwidth-profile {
description
"Whether the bandwidth profile used in the ingress
direction is named or defined by value"

case named {
leaf ingress-bandwidth-profile-name {
type "string";
description
"Name of the bandwidth profile used in
the ingress direction.";
}
}
case value {
container ingress-bandwidth-profile {
uses etht-types:etht-bandwidth-profiles;
}
}
"The bandwdith profile used in the ingress direction.";
uses named-or-value-bandwidth-profile;
}
/* Egress bandwidth profile */
choice style {
container egress-bandwidth-profile {
description
"Whether the bandwidth profile used in the egress
direction is named or defined by value"
case named {
leaf egress-bandwidth-profile-name {
type "string";
description
"Name of the bandwidth profile used in
the egress direction.";
}
}
case value {
container egress-bandwidth-profile {
uses etht-types:etht-bandwidth-profiles;
}
}
"The bandwdith profile used in the egress direction.";
uses named-or-value-bandwidth-profile;
}
}
}
Expand Down Expand Up @@ -332,6 +313,8 @@ module ietf-eth-tran-service {
uses bandwidth-profiles;

container vlan-operations {
description
"Configuration of VLAN operations.";
choice direction {
description
"Whether the VLAN operations are symmetrical or
Expand Down Expand Up @@ -413,25 +396,6 @@ module ietf-eth-tran-service {
}
}

grouping te-topology-identifier {
leaf access-provider-id {
type te-types:te-global-id;
description
"An identifier to uniquely identify a provider.";
}
leaf access-client-id {
type te-types:te-global-id;
description
"An identifier to uniquely identify a client.";
}
leaf access-topology-id {
type te-types:te-topology-id;
description
"Identifies the topology the
service access ports belong to.";
}
}

grouping etht-svc-pm-threshold_config {
description
"Configuraiton parameters for Ethernet service PM thresholds.";
Expand Down Expand Up @@ -526,7 +490,7 @@ module ietf-eth-tran-service {
/* Add default as installed */
}

uses te-topology-identifier;
uses te-types:te-topology-identifier;

list etht-svc-access-ports {
key access-port-id;
Expand Down Expand Up @@ -614,6 +578,8 @@ module ietf-eth-tran-service {
"ETH transport services.";

container globals {
description
"Globals Ethernet configuration data container";
list named-bandwidth-profiles {
key bandwidth-profile-name;
description
Expand Down

0 comments on commit c6dbcb8

Please sign in to comment.