Add new *message builders to flow, group, meter and port
YANG models to allow us to serialize and deserialize them
properly.
Add dependency on openflowjava for model-flow-base
Update set-tp-src and set-tp-dst yang with ip-protocol
See also: bug 7137
Change-Id: Ie552e5b06778ec0d0d803e34b9628fb1c627d1ab
Signed-off-by: Tomas Slusny <tomas.slusny@pantheon.tech>
description="OpenDaylight :: OpenflowPlugin :: NSF :: Model">
<!-- general models -->
<feature version='${mdsal.model.version}'>odl-mdsal-models</feature>
description="OpenDaylight :: OpenflowPlugin :: NSF :: Model">
<!-- general models -->
<feature version='${mdsal.model.version}'>odl-mdsal-models</feature>
- <bundle>mvn:org.opendaylight.controller.model/model-inventory/{{VERSION}}</bundle>
- <bundle>mvn:org.opendaylight.controller.model/model-topology/{{VERSION}}</bundle>
+ <bundle>mvn:org.opendaylight.controller.model/model-inventory/{{VERSION}}</bundle>
+ <bundle>mvn:org.opendaylight.controller.model/model-topology/{{VERSION}}</bundle>
<!-- openflow specific models -->
<!-- openflow specific models -->
+ <feature version ="${openflowjava.version}">odl-openflowjava-protocol</feature>
<bundle>mvn:org.opendaylight.openflowplugin.model/model-flow-base/{{VERSION}}</bundle>
<bundle>mvn:org.opendaylight.openflowplugin.model/model-flow-statistics/{{VERSION}}</bundle>
<bundle>mvn:org.opendaylight.openflowplugin.model/model-flow-service/{{VERSION}}</bundle>
<bundle>mvn:org.opendaylight.openflowplugin.model/model-flow-base/{{VERSION}}</bundle>
<bundle>mvn:org.opendaylight.openflowplugin.model/model-flow-statistics/{{VERSION}}</bundle>
<bundle>mvn:org.opendaylight.openflowplugin.model/model-flow-service/{{VERSION}}</bundle>
<bundle>mvn:org.opendaylight.controller.model/model-inventory/{{VERSION}}</bundle>
<bundle>mvn:org.opendaylight.controller.model/model-topology/{{VERSION}}</bundle>
<!-- openflow specific models -->
<bundle>mvn:org.opendaylight.controller.model/model-inventory/{{VERSION}}</bundle>
<bundle>mvn:org.opendaylight.controller.model/model-topology/{{VERSION}}</bundle>
<!-- openflow specific models -->
+ <feature version="${openflowjava.version}">odl-openflowjava-protocol</feature>
<bundle>mvn:org.opendaylight.openflowplugin.model/model-flow-base/{{VERSION}}</bundle>
<bundle>mvn:org.opendaylight.openflowplugin.model/model-flow-statistics/{{VERSION}}</bundle>
<bundle>mvn:org.opendaylight.openflowplugin.model/model-flow-service/{{VERSION}}</bundle>
<bundle>mvn:org.opendaylight.openflowplugin.model/model-flow-base/{{VERSION}}</bundle>
<bundle>mvn:org.opendaylight.openflowplugin.model/model-flow-statistics/{{VERSION}}</bundle>
<bundle>mvn:org.opendaylight.openflowplugin.model/model-flow-service/{{VERSION}}</bundle>
<groupId>org.opendaylight.mdsal.model</groupId>
<artifactId>opendaylight-l2-types</artifactId>
</dependency>
<groupId>org.opendaylight.mdsal.model</groupId>
<artifactId>opendaylight-l2-types</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.opendaylight.openflowjava</groupId>
+ <artifactId>openflow-protocol-api</artifactId>
+ </dependency>
leaf port {
type inet:port-number;
}
leaf port {
type inet:port-number;
}
+ leaf ip-protocol {
+ description "IP protocol.";
+ type uint8;
+ default 0;
+ }
leaf port {
type inet:port-number;
}
leaf port {
type inet:port-number;
}
+ leaf ip-protocol {
+ description "IP protocol.";
+ type uint8;
+ default 0;
+ }
import opendaylight-match-types {prefix match; revision-date "2013-10-26";}
import opendaylight-action-types {prefix action;}
import opendaylight-meter-types {prefix meter; revision-date "2013-09-18";}
import opendaylight-match-types {prefix match; revision-date "2013-10-26";}
import opendaylight-action-types {prefix action;}
import opendaylight-meter-types {prefix meter; revision-date "2013-09-18";}
+ import openflow-protocol { prefix ofproto; revision-date "2013-07-31"; }
+ import openflow-types { prefix oft; revision-date "2013-07-31"; }
revision "2013-10-26" {
description "Initial revision of flow service";
revision "2013-10-26" {
description "Initial revision of flow service";
+
+ container flow-message {
+ uses flow;
+ uses ofproto:ofHeader;
+
+ leaf command {
+ type oft:flow-mod-command;
+ }
+ }
import ietf-yang-types {prefix yang; revision-date "2013-07-15";}
import opendaylight-action-types {prefix action;}
import ietf-yang-types {prefix yang; revision-date "2013-07-15";}
import opendaylight-action-types {prefix action;}
+ import openflow-protocol { prefix ofproto; revision-date "2013-07-31"; }
+ import openflow-types { prefix oft; revision-date "2013-07-31"; }
revision "2013-10-18" {
description "Initial revision of group service";
revision "2013-10-18" {
description "Initial revision of group service";
grouping group-statistics-reply {
list group-stats {
grouping group-statistics-reply {
list group-stats {
+
+ container group-message {
+ uses group;
+ uses ofproto:ofHeader;
+
+ leaf command {
+ type oft:group-mod-command;
+ }
+ }
prefix meter;
import ietf-yang-types {prefix yang; revision-date "2013-07-15";}
prefix meter;
import ietf-yang-types {prefix yang; revision-date "2013-07-15";}
+ import openflow-protocol { prefix ofproto; revision-date "2013-07-31"; }
+ import openflow-types { prefix oft; revision-date "2013-07-31"; }
grouping meter-features-reply {
uses meter-features;
}
grouping meter-features-reply {
uses meter-features;
}
+
+ container meter-message {
+ uses meter;
+ uses ofproto:ofHeader;
+
+ leaf command {
+ type oft:meter-mod-command;
+ }
+ }
import ietf-yang-types {prefix yang; revision-date "2013-07-15";}
import opendaylight-queue-types {prefix queue-types; revision-date "2013-09-25";}
import ietf-yang-types {prefix yang; revision-date "2013-07-15";}
import opendaylight-queue-types {prefix queue-types; revision-date "2013-09-25";}
+ import openflow-protocol { prefix ofproto; revision-date "2013-07-31"; }
+
revision "2013-09-25" {
description "Initial revision of Port Inventory model";
}
revision "2013-09-25" {
description "Initial revision of Port Inventory model";
}
+
+ container port-message {
+ uses common-port;
+ uses ofproto:ofHeader;
+ }