mbuil

nsh-patch

Jun 1st, 2016
73
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 8.13 KB | None | 0 0
  1. [6/1/2016 5:23 PM] Ferenc Cserepkei:
  2. ubuntu@build:~/repos/fpob/ofjavansh/patches$ cat openflowplugin_modify_nsh_subtype.patch
  3. diff -ruN a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/SetNshc1Codec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/SetNshc1Codec.java
  4. --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/SetNshc1Codec.java 2015-09-30 10:48:23.542944040 +0800
  5. +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/SetNshc1Codec.java 2015-09-30 10:52:57.218939666 +0800
  6. @@ -29,7 +29,7 @@
  7. private static final Logger LOG = LoggerFactory.getLogger(SetNshc1Codec.class);
  8.  
  9. public static final int LENGTH = 16;
  10. - public static final byte NXAST_SET_NSC_SUBTYPE = 34;
  11. + public static final byte NXAST_SET_NSC_SUBTYPE = 107;
  12. public static final NiciraActionSerializerKey SERIALIZER_KEY =
  13. new NiciraActionSerializerKey(EncodeConstants.OF13_VERSION_ID, ActionSetNshc1.class);
  14. public static final NiciraActionDeserializerKey DESERIALIZER_KEY =
  15. diff -ruN a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/SetNshc2Codec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/SetNshc2Codec.java
  16. --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/SetNshc2Codec.java 2015-09-30 10:48:23.542944040 +0800
  17. +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/SetNshc2Codec.java 2015-09-30 10:53:04.550939549 +0800
  18. @@ -24,7 +24,7 @@
  19. */
  20. public class SetNshc2Codec extends AbstractActionCodec {
  21. public static final int LENGTH = 16;
  22. - public static final byte NXAST_SET_NSC_SUBTYPE = 35;
  23. + public static final byte NXAST_SET_NSC_SUBTYPE = 108;
  24. public static final NiciraActionSerializerKey SERIALIZER_KEY =
  25. new NiciraActionSerializerKey(EncodeConstants.OF13_VERSION_ID, ActionSetNshc2.class);
  26. public static final NiciraActionDeserializerKey DESERIALIZER_KEY =
  27. diff -ruN a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/SetNshc3Codec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/SetNshc3Codec.java
  28. --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/SetNshc3Codec.java 2015-09-30 10:48:23.542944040 +0800
  29. +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/SetNshc3Codec.java 2015-09-30 10:53:11.622939436 +0800
  30. @@ -24,7 +24,7 @@
  31. */
  32. public class SetNshc3Codec extends AbstractActionCodec {
  33. public static final int LENGTH = 16;
  34. - public static final byte NXAST_SET_NSC_SUBTYPE = 36;
  35. + public static final byte NXAST_SET_NSC_SUBTYPE = 109;
  36. public static final NiciraActionSerializerKey SERIALIZER_KEY =
  37. new NiciraActionSerializerKey(EncodeConstants.OF13_VERSION_ID, ActionSetNshc3.class);
  38. public static final NiciraActionDeserializerKey DESERIALIZER_KEY =
  39. diff -ruN a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/SetNshc4Codec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/SetNshc4Codec.java
  40. --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/SetNshc4Codec.java 2015-09-30 10:48:23.542944040 +0800
  41. +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/SetNshc4Codec.java 2015-09-30 10:53:18.511939325 +0800
  42. @@ -24,7 +24,7 @@
  43. */
  44. public class SetNshc4Codec extends AbstractActionCodec {
  45. public static final int LENGTH = 16;
  46. - public static final byte NXAST_SET_NSC_SUBTYPE = 37;
  47. + public static final byte NXAST_SET_NSC_SUBTYPE = 110;
  48. public static final NiciraActionSerializerKey SERIALIZER_KEY =
  49. new NiciraActionSerializerKey(EncodeConstants.OF13_VERSION_ID, ActionSetNshc4.class);
  50. public static final NiciraActionDeserializerKey DESERIALIZER_KEY =
  51. diff -ruN a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/SetNsiCodec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/SetNsiCodec.java
  52. --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/SetNsiCodec.java 2015-09-30 10:48:23.542944040 +0800
  53. +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/SetNsiCodec.java 2015-09-30 10:52:47.236939825 +0800
  54. @@ -25,7 +25,7 @@
  55. */
  56. public class SetNsiCodec extends AbstractActionCodec {
  57. public static final int LENGTH = 16;
  58. - public static final byte NXAST_SET_NSI_SUBTYPE = 33;
  59. + public static final byte NXAST_SET_NSI_SUBTYPE = 106;
  60. public static final NiciraActionSerializerKey SERIALIZER_KEY =
  61. new NiciraActionSerializerKey(EncodeConstants.OF13_VERSION_ID, ActionSetNsi.class);
  62. public static final NiciraActionDeserializerKey DESERIALIZER_KEY =
  63. diff -ruN a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/SetNspCodec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/SetNspCodec.java
  64. --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/SetNspCodec.java 2015-09-30 10:48:23.541944040 +0800
  65. +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/action/SetNspCodec.java 2015-09-30 10:52:39.654939947 +0800
  66. @@ -25,7 +25,7 @@
  67. */
  68. public class SetNspCodec extends AbstractActionCodec {
  69. public static final int LENGTH = 16;
  70. - public static final byte NXAST_SET_NSP_SUBTYPE = 32;
  71. + public static final byte NXAST_SET_NSP_SUBTYPE = 105;
  72. public static final NiciraActionSerializerKey SERIALIZER_KEY =
  73. new NiciraActionSerializerKey(EncodeConstants.OF13_VERSION_ID, ActionSetNsp.class);
  74. public static final NiciraActionDeserializerKey DESERIALIZER_KEY =
  75. diff -ruN a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/Nshc1Codec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/Nshc1Codec.java
  76. --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/Nshc1Codec.java 2015-09-30 10:48:23.542944040 +0800
  77. +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/Nshc1Codec.java 2015-09-30 10:52:05.113940499 +0800
  78. @@ -27,7 +27,7 @@
  79. public class Nshc1Codec extends AbstractMatchCodec {
  80.  
  81. private static final int VALUE_LENGTH = 4;
  82. - private static final int NXM_FIELD_CODE = 39;
  83. + private static final int NXM_FIELD_CODE = 107;
  84. public static final MatchEntrySerializerKey<Nxm1Class, NxmNxNshc1> SERIALIZER_KEY = new MatchEntrySerializerKey<>(
  85. EncodeConstants.OF13_VERSION_ID, Nxm1Class.class, NxmNxNshc1.class);
  86. public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey(
  87. diff -ruN a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/Nshc2Codec.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/Nshc2Codec.java
  88. --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/Nshc2Codec.java 2015-09-30 10:48:23.542944040 +0800
  89. +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/Nshc2Codec.java 2015-09-30 10:52:03.282940528 +0800
  90. @@ -27,7 +27,7 @@
  91. public class Nshc2Codec extends AbstractMatchCodec {
  92.  
  93. private static final int VALUE_LENGTH = 4;
  94. - private st
Add Comment
Please, Sign In to add comment