From f239617fd917c4a6677f6b713183ab581e9b4382 Mon Sep 17 00:00:00 2001
From: gifrerenom <lluis.gifre@cttc.es>
Date: Mon, 27 Oct 2025 12:00:27 +0000
Subject: [PATCH 1/7] Proto:

- Add directionality of ACL rules
---
 proto/context.proto | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/proto/context.proto b/proto/context.proto
index 9fde6a3c1..27e48122f 100644
--- a/proto/context.proto
+++ b/proto/context.proto
@@ -562,9 +562,16 @@ message ConfigRule_Custom {
   string resource_value = 2;
 }
 
+enum AclDirectionEnum {
+  ACLDIRECTION_BOTH    = 0;
+  ACLDIRECTION_INGRESS = 1;
+  ACLDIRECTION_EGRESS  = 2;
+}
+
 message ConfigRule_ACL {
-  EndPointId endpoint_id = 1;
-  acl.AclRuleSet rule_set = 2;
+  EndPointId       endpoint_id = 1;
+  AclDirectionEnum direction   = 2;
+  acl.AclRuleSet   rule_set    = 3;
 }
 
 message ConfigRule_IP_LINK {
-- 
GitLab


From c5b2c7e64ca48a08291713e5de992e1a2e4750c6 Mon Sep 17 00:00:00 2001
From: gifrerenom <lluis.gifre@cttc.es>
Date: Mon, 27 Oct 2025 12:00:42 +0000
Subject: [PATCH 2/7] Device component - gNMI OpenConfig:

- Support for ICMP protocol
- Directionality of ACL rules
- Manage cleanup of ACL rules while composing OpenConfig messages
---
 .../drivers/gnmi_openconfig/handlers/Acl.py   | 72 +++++++++++++++----
 1 file changed, 57 insertions(+), 15 deletions(-)

diff --git a/src/device/service/drivers/gnmi_openconfig/handlers/Acl.py b/src/device/service/drivers/gnmi_openconfig/handlers/Acl.py
index c3c52fa85..06061a0b8 100644
--- a/src/device/service/drivers/gnmi_openconfig/handlers/Acl.py
+++ b/src/device/service/drivers/gnmi_openconfig/handlers/Acl.py
@@ -12,12 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import json
-import logging
+import json, libyang, logging
 from typing import Any, Dict, List, Tuple
-
-import libyang
-
+from common.proto.context_pb2 import AclDirectionEnum
 from ._Handler import _Handler
 from .YangHandler import YangHandler
 
@@ -41,6 +38,20 @@ _OC_TFS_FWD_ACTION = {v: k for k, v in _TFS_OC_FWD_ACTION.items()}
 
 # ─────────────────────────────────────────────────────────────────────────
 
+DIRECTION_INGRESS = {
+    AclDirectionEnum.ACLDIRECTION_BOTH,
+    AclDirectionEnum.Name(AclDirectionEnum.ACLDIRECTION_BOTH),
+    AclDirectionEnum.ACLDIRECTION_INGRESS,
+    AclDirectionEnum.Name(AclDirectionEnum.ACLDIRECTION_INGRESS),
+}
+
+DIRECTION_EGRESS = {
+    AclDirectionEnum.ACLDIRECTION_BOTH,
+    AclDirectionEnum.Name(AclDirectionEnum.ACLDIRECTION_BOTH),
+    AclDirectionEnum.ACLDIRECTION_EGRESS,
+    AclDirectionEnum.Name(AclDirectionEnum.ACLDIRECTION_EGRESS),
+}
+
 
 class AclHandler(_Handler):
     def get_resource_key(self) -> str:
@@ -59,8 +70,9 @@ class AclHandler(_Handler):
         rs = resource_value['rule_set']
         rs_name = rs['name']
         oc_type = _TFS_OC_RULE_TYPE[rs['type']]
-        device = resource_value['endpoint_id']['device_id']['device_uuid']['uuid']
+        #device = resource_value['endpoint_id']['device_id']['device_uuid']['uuid']
         iface = resource_value['endpoint_id']['endpoint_uuid']['uuid']
+        direction = resource_value['direction']
 
         if delete:
             path = f'/acl/acl-sets/acl-set[name={rs_name}][type={oc_type}]'
@@ -77,11 +89,11 @@ class AclHandler(_Handler):
         y_entries = y_set.create_path('acl-entries')
         for entry in rs.get('entries', []):
             seq = int(entry['sequence_id'])
-            m_ = entry["match"]
+            m_ = entry['match']
             src_address = m_.get('src_address', '0.0.0.0/0')
             dst_address = m_.get('dst_address', '0.0.0.0/0')
-            src_port = m_.get("src_port")
-            dst_port = m_.get("dst_port")
+            src_port = m_.get('src_port')
+            dst_port = m_.get('dst_port')
             act = _TFS_OC_FWD_ACTION[entry['action']['forward_action']]
 
             y_e = y_entries.create_path(f'acl-entry[sequence-id="{seq}"]')
@@ -91,9 +103,12 @@ class AclHandler(_Handler):
             y_ipv4.create_path('config/source-address', src_address)
             y_ipv4.create_path('config/destination-address', dst_address)
 
+            proto = m_.get('protocol')
+            if proto is not None:
+                y_ipv4.create_path('config/protocol', int(proto))
+
             if src_port or dst_port:
-                proto = m_.get("protocol")
-                y_trans = y_e.create_path("transport")
+                y_trans = y_e.create_path('transport')
                 if src_port:
                     y_trans.create_path("config/source-port", int(src_port))
                 if dst_port:
@@ -106,14 +121,41 @@ class AclHandler(_Handler):
         # Interface binding
         y_intfs = yang_acl.create_path('interfaces')
         y_intf = y_intfs.create_path(f'interface[id="{iface}"]')
-        y_ing = y_intf.create_path('ingress-acl-sets')
-        y_ing_set = y_ing.create_path(f'ingress-acl-set[set-name="{rs_name}"][type="{oc_type}"]')
-        y_ing_set.create_path('config/set-name', rs_name)
-        y_ing_set.create_path('config/type', oc_type)
+
+        if direction in DIRECTION_INGRESS:
+            y_ingress = y_intf.create_path('ingress-acl-sets')
+            y_ingress_set = y_ingress.create_path(f'ingress-acl-set[set-name="{rs_name}"][type="{oc_type}"]')
+            y_ingress_set.create_path('config/set-name', rs_name)
+            y_ingress_set.create_path('config/type', oc_type)
+
+        if direction in DIRECTION_EGRESS:
+            y_egress = y_intf.create_path('egress-acl-sets')
+            y_egress_set = y_egress.create_path(f'egress-acl-set[set-name="{rs_name}"][type="{oc_type}"]')
+            y_egress_set.create_path('config/set-name', rs_name)
+            y_egress_set.create_path('config/type', oc_type)
 
         json_data = yang_acl.print_mem('json')
+        #json_data = str(node.print_mem(
+        #    fmt='json', with_siblings=True, pretty=True,
+        #    keep_empty_containers=True, include_implicit_defaults=True
+        #))
         LOGGER.debug('JSON data: %s', json_data)
         json_obj = json.loads(json_data)['openconfig-acl:acl']
+
+        # release generated nodes to prevent side effects
+        node_ifs : libyang.DNode = yang_acl.find_path('/openconfig-acl:acl/interfaces')
+        #if node is None: return None
+        LOGGER.info('node_ifs = {:s}'.format(str(node_ifs)))
+        node_ifs.unlink()
+        node_ifs.free()
+
+        # release generated nodes to prevent side effects
+        node_acls : libyang.DNode = yang_acl.find_path('/openconfig-acl:acl/acl-sets')
+        #if node is None: return None
+        LOGGER.info('node_acls = {:s}'.format(str(node_acls)))
+        node_acls.unlink()
+        node_acls.free()
+
         return '/acl', json.dumps(json_obj)
 
     def parse(  # pylint: disable=too-many-locals
-- 
GitLab


From 22842a888d0411ca608849e32cac7b682d5e27bb Mon Sep 17 00:00:00 2001
From: gifrerenom <lluis.gifre@cttc.es>
Date: Mon, 27 Oct 2025 12:00:54 +0000
Subject: [PATCH 3/7] WebUI component:

- Add firewall icon
---
 .../static/topology_icons/Acknowledgements.txt  |   3 +++
 .../static/topology_icons/emu-firewall.png      | Bin 0 -> 12605 bytes
 .../service/static/topology_icons/firewall.png  | Bin 0 -> 13242 bytes
 3 files changed, 3 insertions(+)
 create mode 100644 src/webui/service/static/topology_icons/emu-firewall.png
 create mode 100644 src/webui/service/static/topology_icons/firewall.png

diff --git a/src/webui/service/static/topology_icons/Acknowledgements.txt b/src/webui/service/static/topology_icons/Acknowledgements.txt
index 6398f34a7..2894d2b71 100644
--- a/src/webui/service/static/topology_icons/Acknowledgements.txt
+++ b/src/webui/service/static/topology_icons/Acknowledgements.txt
@@ -38,3 +38,6 @@ https://symbols.getvecta.com/stencil_240/16_atm-tag-switch-router.3149d7e933.png
 https://symbols.getvecta.com/stencil_241/46_atm-tag-sw-rtr.776719c0b0.png => emu-ip-sdn-controller.png
 
 https://onfstaging1.opennetworking.org/wp-content/uploads/2020/02/p4-transparent-logo.png => p4-switch.png
+
+https://symbols.getvecta.com/stencil_240/81_firewall.21bd3abec8.png => firewall.png
+https://symbols.getvecta.com/stencil_241/110_firewall.e262f4364e.png => emu-firewall.png
diff --git a/src/webui/service/static/topology_icons/emu-firewall.png b/src/webui/service/static/topology_icons/emu-firewall.png
new file mode 100644
index 0000000000000000000000000000000000000000..cccf0b55cb6e56c2ccf1c85faa0a10868eb83b60
GIT binary patch
literal 12605
zcmeAS@N?(olHy`uVBq!ia0y~yVAKI&4mJh`hRWK$QU(SE22U5qkczmsb1VP!m45qw
z{<eqE&0ni(mZ#2YG1?#KrWusjmg23oFmtxZ&!uXYwq)w4ZkgDrVmx(9n6S|{PY+ek
zz+1g$x=|V@FMX|@lWiwo`!3u1deOVr_u}5~pLM?W-tE_S=6&9`{`H>ohAnKYBBC2~
zRvQbN2Fq*`Xj|p)A}(-I|CE?@S4W-B@AvM#hS}VS!mS(Jf;qa6NO3zep5F9MX^}T~
z^467Widqbx{R&Cbn&`=}MyRmFY<p(pwMG|{$sK*Cp4qUPePc*I)4~*8d{1Bez^Q8S
zr{9@$Prq_-;TH}(`zJ1Q)#~aa5|@pyN_wXlF|2lxncJHiHO+KZ2U~jb8z%Y9%M8<s
z8{aGHPv=i~x-|Mzb>OtrxBf219WPkcPt}XvH6?G)N4HyBv%~B1RgS&-_wW1u%Lm!z
zb-uD}P-#u7<4ZUyvMywI<g}~PI+h7v{BL2pL8tpzkEHYUm}1|+Ls@@+eN9X_x``no
z@)tW(LaOJDB<X9L)_A#;FbjT+*8lgu=iA%u_k+&Qv(0>WXXnvvrPcQF^?yyTt_szD
zb1zFGc^`K+&+ZRg3=t2vYDIdV-t<j%(eaKKF8YFDYolCacb6^YxBs)@g-Mb}?WdFK
zTdv1d@BFr{_IKH@<M#g?#bZk*e%@T$V;J4#*JE=-pkXSz--+j{5z|U#1Z^E%{@gir
z_1&)5db>WI((e5KQ7qc}$pq&YbIb27JT+B&_qK0``RxNPFY|r5X7jm4iHF-P?T`B(
z(y5hXSfj%k&2u<vnrTaiTUf_~dwbWu-~WH!Iot0sRewGn?@nC3&UQ=2#inVx(QZ?<
zcGms9WzXMl^U34am&^Vyf4yGMz9Hxj8$*O<SFA>G<g~5+kvUg2<Ff1ie!af3`un>t
z?{>czJ2g#d?Pl-kdS9*t`%g4{S1-r2@-Uxu&$hg~S^b;|u9M6*8a7OgIP^&Bz@|0N
zQqQmE`*iDO?f1Lxe}8{pE?=*+Un@N3_w(n0lhu4bwOrj*`g(=uWHrfr2gWrefB6%Z
zt}c%|pB8y7)x~65$F~B#Df4f}R6J}oskL%95lNS}tFef!e!F$vhNyitma_GKKCbI!
zj(Axo&akHB>$%f6bxyDHbGh8HqWe12&x6MQeI5zBZQR-?Yklczc)TyKl*xj>-^=%h
zKe(~!xLkG5Ih)Tu=huR?D}%M~zNvFM%gN=x%A)v6-M;@DKOO%1Dc!7cdt(c?)%!i4
zGhSU;Id8GSn!Md_&7@2+CcM{S2y<e0dBd0BDzawA8Qs&57#0<}gk0UJU*}eOR5bj;
z-SYdfKG9`wpW6Tb$uC<n;di0z;a6?ac?$%U-B{kqAMpDAni1^ZGii}x%voH5Uq3}%
zXycWB<8UE7zSdO#+U&KiHGe)H57}?`{NCvtp4Fev+u!Honkv<xs=4I1Wy8|d>G%56
zBEuGMa=36TuKVwE`~RNL=M?kh-iz6DlFdS(<nl7#E$8iI_CCz}`|IoCPGR-7PpS=~
zUTUVw4Boz{{>Y!$v}W^Zzp!=HYS!iNmMA*6-8i4qwe#w_*xUQEg14@E9sc26u6f=a
zi!a=44BB_|xf`agyJtD`?4~ugof$TQJN5Q{Z2GbMV&?L>ZrWjMPMrL8Y1R~GyZbet
zeb28p6TQxmu=MG~7oQm-E}Ckukeik&8}v==gLxcx{Dy?azo+J{pDj{s{cJ{ZNAk)&
z>uy<m=S_I}-kkBksrdUUagmX%(tYb!J(TI0{JL<`-igZYLiQ<o&yFp3-}m`N>D9K&
zkFKnlIrFaMfm8SMnH#3=-`Ba<==3Iwy$9C19GUof-M6FS@d5pEwl8)*pVw{czOdv8
z`wL+;pARipZ|Cp#-F~Nt+jr(6eV_U~hOmEC;vg%JM1ib47hBqMo#DLw|2?&ZKR2JZ
z>o%=ZEdBL5{(n}y-#4qsy&n#7m)t2lJ~8}(M#I$oacmntT{oW?E*5gIt^V8Hn$Ks;
z3{niAMU{6Q-Ff~0kK^{c5{_CGsIj$~nKNjAx~{WamSN4DQ|pa)rbfmT&iEV_>*}I6
zzwYbR@NdmuTe-zw`OJ8}*yi&Y<171WtNkN-rOo^F_W${G*P3C&r#mzIo-#(XKGnaT
zrF;6;dL4l)bG;fm;;LS%TBkH7_j@f|8@c(I-@4~Hb>X=TYYzPiV~A*dy1wUX)U>O+
zbjqi$ZsL``S9o03q~b%uqXid&G78t-Vu)z{dX`}W*Xj6gS*Nvb6nvFhm-P75!`-Q;
z#a`XrZEpMb%VpLbyI**(3tGxm`|s!Tbst#dI_F<6eSNJr?d+_lmIe)?vF~HPF>EMW
zS=Y03DVN!teKU%~3wiejWt6_YwpID-_dAoDe;VKJleJ!vdU{%;;2(yt#9D8LHB6tT
zha7x1uln7>(|WttWLy@vjukDrns$3zZpoL6?zh7Wo1_{-9sV=yxu+p|?UQ%<)@i99
zr5);oU#zk`Dw<;<UTL^ozpQGOzn{#HSEX0m7GM8)(0cx!C2R?vTu-k*w@7?C-9BdZ
zM6DYiIGgI3#IjkX^}n;kZhhDgVOLrEJ$A>T(+pwr{xcWo@E<spTpu~@>XeQ&p^53N
zv)kpWPU!I*w6FJC`q4kG?)OX4z30Mnf24>$U8~U$8gXBSLEHatYUH*5`l}OykM49~
z6ZwC5u1#gpymfZgryo_<%Pf1ys@-R9{q07wvOiCP>ojPDzn>SgD&g}%cKI9jjFt|Y
zrbx|KtN!*zGj40=D$WMc(2aL)F-PpYYM)%TvWa)O{<9yeHk?oYl#$&z?U3c}TU#=P
zU#;@J(#f!9Mc317atBVW{kJ=PyUuI>)JVtJoz<4}I=p>9+U^L-&c42GsdAsip{;K>
zgyyR3Wzg|l_~)0*fm0jp4~1-acqjDeynQ!L^Zq%uK5lQ-ybX^G_|oN8TdZT*@My)f
z-F6IN@3uVGHfx`{RR7zWgu{{SKX&>WhHv;dX+F2hhtSzlrZJsCZ&#b8&naZH{rP0F
z);w>nHLl%a7f-6se-m^1zwxm>>oz&?Oj^j$Fm<uMOC+mw-P!Hii#h-Ff7<nW-QvK-
zZcj5xcg`-`|M#1+Uf!$ntIJAXUpsR0`<5u7gu+%uJ+s#r#iWz{E=4IH`x(i|p#3!8
z8DxgU)$7@>dZo>8oqW0@!D*%Gxi2Tn73)88`@Nrf^AITbB4ZLhp1;Vgx8p$mu6XI>
zd;Pn_Zk*;~h}h(oB^Jaw`)IfL?VZ>5|M}#-)sj0^;a}v@eCEk<TRV5%Uvc1(#0GY`
ziUW1g(igI%lDoDG<%UcYeaoohYS`SywJPEBWq<pN9fHao#S=c)Pmi*Gy=L>9>Ird-
z3j^2Ra=EI<wc*E;<5$afmA%#SWlr$qI{HWEK$m9Bjl5LRoMS>49oE||owo1BN=AF;
zU0<(7+a`X!SN%S4v0JZF>{ia#(~EX*IPhpr^c?PgQ-b|CjaeH+-Ihw2F@*74JXE$(
zXSJQ+$JaXdxy=3?TOD#q+`9B}`?WdocVDM$&AO^(ZR@iwS|Z_N^y$ja&n|MR&v_8V
zcR$|d&xgZv>)AJKdSbz#?R{uk=!S<%%S!hwldvw+iLL#5RW<P7vF!hUgeTN<RUORw
z_U7i5mBGt(D%FZ3I3upE3f<gYz9r-0p{?`W<!h%{Y?#V@$x5nWs_J{jh*Kc5BpqFx
z_k8LtT&LEzc9wPdx=&|Xjb)y1%(}X2>hsXqyWj7dt+)5fr7LE_EIR8r&Th!Mwq|Cw
z?d4^@i|uNE-6-X6=aptlSo*|}!8<TxWfSlJGY{Ff$=Cf@_-IY5=@n4rpLn=!o$KdN
z>3{9-3!_fHV*A^0v~jifG@Xxo#7gehe!rPnyMr+zva~<DfWg}_|MaFGTLr_Py>WE8
zx~J_4_vy#S`<K7Hy<PiE#0=*GuQ|82W>+8bdcDdwBy~^2(Ss{x(yuOXWWHWd!}R9<
z{{QdxGe-o9`ls<Hs9x@0e|<xncIS%~EzVO@%HOUw3v~U$B(|SrW&Hg6(^IxhRCd2*
zE}&)h@BZO-{_<Jxl6!6nmFjMoF3PYWrME`+l-3O!AD3KVp5RTfmfWn%dn0$1WS%qm
zz%=c8(vRF{bIb3&{Kav=>v}0en9p9_(~rDP_X}VAXV|XsGB0|2-d5w5XI6rV5(!^l
zU+-7*oActOzI?(}gJUh;TJe|eH@%q6zF|@JF?(iq!HY8_VlOWBY2*}EyU@VMT(r(z
zV8ahr2K$)#R;8=nTNNJiy57n#t?Ayh)VuC3&!_Wm&AhC3tNebgsGHtA#UJwZM~|K4
zVCVb7^UuHZ@}IOx@^h@E<0o1@pHtisY|L(IQ{sO$mL);+1#iMhrDw_;e*BbtF7r6s
zTvR&zuI1k^mpg-lym=2y61ntO=0MN|;RBOg&zL8azPNCZ?UG#en}<!J?B71AJ~!Y!
zz_obNJl=+-3sf6ayJz?xc(lryXUVCl#@!kJe?0ELvN75Hk<Ow-=?2j-O<8LOZ%20q
zZ!yF8hO4W?^{wYmHGY5X`~7<Vnpa&?NsI|6_g&w@utDSs%Z3!e&x{ez=hyF(J@{@<
z!CA}CmW>az*Y8ovKa$7@DqaKG8MG(X{C~>>a=cW;AGb-~cdT!l->-455p54PKAy=C
zCUf=Ccg78mvbXP62f55U;bZHoh0g7}#7;g`pY!<DS@Zi-%pW8(CLEon7v|2OJuPSE
zTn3%UBQcDxzunH?KAFWz`o6f$$0Nco@0Q=6DlVVEn4mgIzbKtSdsE6gK89&JNqP-W
z!*8Y?ZsRSp)9W>{XPEY;+LxQb+tC-~L*E3}&}}~-H1mThz%MVC&p*}8m&lmVD&TpM
z<v@@CC_H_*BOIsZ-m82rD;*YJ^Rac$g9%~`VIB*ooMF&mRb<qOJYv!y8gld5*6VSb
zoyB)}O-y6nU~+ZJai$F^y)N7g-cvf9?Tvc2=-ac0Zj0Pmw3K(XZuFPpSBw#x-ka(&
z=&+iCjL2cqUa{#cxBec7+}qn!&+VVu%a)Mp9QxmoQHOOeSOKH<icP%Y6Mr0*|L1Uf
zTkd3WiOWo&675VLLzvG)tup2fDT13B*I1Rl`VqG6;TFTYyGl=2UF2u*{<e1+Ys1n7
zY7MI0D|pv1^I0^A>Bqf^yqWgw%*--7ZM}ktZ`l%3qaU962(`<_H$k@ILF1QKtJe$7
z-!P|lwPCSq=JT3QT#q9eB0iRM-{wBhwK}G?j$xY4BC!p8)^7}cr#ua9Tb<MxT<K~h
z#xSj~FVUTG!yzrv1oniJN?8o63m+f*X1sb=>FX-L7e3O;>$P^WHcX8<tf9;h5qRa(
zM%E1}f|HqEzgXPAtd(0lXl>Ni8uinx8{X~xe(!GTYi*r3^*x61r&b+MTE)Z=7IM_)
z4JbfV4m|qR%Cma!_j}d_i?%c#6^PwevvYL^tKeCqV<po<8(l+KK{YaC#72>BZk=^G
z#@W|&Ze_3Ed!+I*i`e0;e}8_?<Nw#WqTBFUX5m4Djx`JoqLD`B>~l7x2tH;wy?zsK
zziIiq7^|mKf{oPtxFdR{Oc$k|p7!%#*Y%Lg5}PB#Sj7TG88$4^Y7-9AIl72xwR^vu
zN$sza@KkBJ<^J>Su58H+ma?fRcy++)$pq&YKcCN6?_=i9U<g~2-+71gz$8;4-GW0x
zs$C^NXKLTJ`SGB6U6No-@66;ia@B7PrEIH8UL8n^DCFD_|Myk+r8Y(#&xJGQGe;P<
zuD-#0V3I3O^`TFzb2cX*=X(?!UTOMlOXJr6|9;<A*H&L+F>79Nfu&S~YQ1VwBtyi;
zl+$lm5>6_$F;0t5m0r)ZJd>$A@u<3XAM@%PKaLz<zSsD?jqrg<`<b-F7^XG#fZ~)z
zXa6ZP`#&F==N2A}d|;xR0P1bj9eCFw`u@kFZoN(OQ+cJ$cu@2t32gYIb-Tbc?Of{D
zN8S3n)I69YWWFE0-Z0BF``N7e3kw`eUa#FQq;xm+es&Z?1XmVQ#HNnA1D{ss9A@>C
z46D03V>7Q#+toRi#cz~WpZhj_|DRU3Ua8dok_RT$uFqsl&|JZpa8jv?vHLyCw|94M
zU$yjUyqv?7ectx_lFHA|Di6Jy7M-_n_4<8P-)AxE-26TZ<d<0>zX(UX-~ZoEw(7;g
zb$#>e|Lu&u>84dMOE=-8w0)iM&5g<K*KZx`lYPy#lwm^(lG74D1s9s8wO#%7_4QH4
z&5Sy2SGQzdeiNaeKHH|!=<D0t*T0rCc$Z9F#n`Y^0aR>hFm`j#DSG*1!_^sE8;@SE
zve<NwJFMU46UW@zZ#U<8G9nx`Emc=x(YB|~g{{*JlaFci#Mn6V$XZ<~H!kFwlg0dc
zUiG_;hehV}CLTS1^Uoz+P{-FDlr42nSIzE_(%=a#a^Catm~_b@PIVW(f>oS4|Ln#2
zf(y**yl*V^o_^rY2Zpd+@sXffm_d79N6dpQvAfHTDDni(7TfUe+xGo|`|JM3T(<vy
zr?~8ZmitY1QwHr-&nMkvjyU;cb2W3sMb{?_0{VpdqkAKnBkC@G)ec*;LEH7S)KXB(
z{be0rg60d(1XuCGudl9_b<NnJtGU5q+N)=?^S{lRr+oV_Q`lTthBZ6ndam;y=vp4_
zroTsZitChjLZ_5dqEr~K&HwjB{gDCd{$t<SuCI+2&+=pl)0lashe3x`6O^B87{v}}
zU0UK9vNA}O!MiN_UL->VmmVXeikZXKmb|tp;i&aNPVaB&>vR}&Sf7G4#V~h&-v4>(
z>{C;<({-lZ53urXXN=fnU!2OApsB$Rs&s@Rcvh>=t7uvkwszLW3;y<hryT2-_cy;=
z5`64Fqt4CwJ2x?G5ShZhAw{s5Rfo^(=^1Xnh+0sGZ|_kt-KYy!Rt7Wb+-$8(WK7W9
z!3e5dSvN?8$*hgrTlKYvweI`f@^5=x`C={J@A=H2bF;QG8KjQsz$8~6>4=yYQ#Q9&
z9qbA|t`oWGNSsN7>TkXIAgAXuL~QEFWIDb6!pm*Bx8J-rd%A&XL(2ZAvsoLKJ`e;|
zOS%b$Yjzy!-F)HYxw+PFyU(1r`RsEnsqoOG+UfqFv~3Qm0!<o@nlkTQWn{d@!u3p#
zq;U*4>xPv3PbY&+;RTt(n@}j^kiIZ@o$QH|-}fZ6&TrXt|I=Bf13@1+KvgZ<hCN{i
zJ%7I2`#tVH>!TJF*X?8ot9*N4!BtQ#_30!?3mZs_*#@m^d@LJM{)=>hY|&)!77LV)
zsJptTQuW-eMuur`<~wa<*dSuV3M%)Ry1C~TJ?vuUx4B@tG5oCqgZDT8g%J!9T=SSV
zqzG<pIJ)6c_nEj>zrR`ROc9&vxsHOY5dl?GjB6IGI<trAT(Rm^`;v7c{C884y`{OK
ziEHk(^XJS0qk|F(pVYMT$<DbvFQ=!{>{V2PzP7;K!=GlTrZXm-)bnT3VG~?#`c13k
z*RR*>Z(FXla40!7Me~!BjF@M`(WeJ@_{?yho!w)p`YGvxV+g|mA=OE|3~K_UQYAoL
zdp159jdB&G{j1I-X0x;T3W-NJ<^A|?daOn$tJt7x2}6UZr(S+CD4^eQW?xwmXp(Y5
z;5rMBcHIZLWn~M@HaI<LTc6o;Q)e|(_X;kCh(OWL8$js{RJ&Zz4DWfyQsbF;bah|V
zp--oI-v=-pn6zJLqYlHGh)t<wpa5D7P9U@M_hl|O`}gbh`lp`G5iX3=;`1u{Ga1$h
z+&XT^xZ%-?XD^r&PAa)EUYi;o=PASRDu-vaS?;Y1$9kooaymz~uuhB5`=J}XEudG*
zbk1hR2*t1cS!@Zep*;4S$(mwf5p|(6ElbaQJTAYUYxM?u&cBy*ixs=s<!dJB?S5m#
zpnYw-Qk6P`_O7&bau$i;O630G9KGX5H$?5P+iMf(!u_)4=!RML^>$ZR2CFBhv|W8)
z|G(Pm>y_Zl8ygZC!d&h?p2ZwdICb>}{sWU-r!*YhFv~1=*6ItIhr8<8)<tjko2Sy|
zDzM>C(c$nlyNdsQz0MqASkix+^+4BZnFdkMoeBv*_f~4Jmz|*-!TML_Nt0;Y%V~34
zbr{xo#5W%~#t@do+4+7wmR9wjhNs^Rc0bZoo2^wbcf+l%+3qzHZ_Uh`nRs<?_4ghp
zF@`X+y^rOj4+LG1J}}Ak3)8jae%oi!FSaDTb*TLELoDvVuNRB^UrgWsC-vBZy3lfl
zH9u}0f619}H1O<2_5+h#OPI2MeR+9hXK{M?!r=9{8b7`GsJo}(sf_N5S9}ek@xLu>
z8P`~>VvLv=TFlgaFl1}i)qv$QPE2-vp}^?9Y8P{Yt3dQYkpn>j7dNfh-npXjP=Knn
z%LPrf*^4|5Oj`AhA>!s2zIlnMuCWZ-GuK?wRJ-}&;9mWGKayry6fRmGIAfJH$ob3(
z$O``LwY>Z3)z#H26A!oPE#3ffa!%#(>X<(&As3_%bm=F}2=@7N@ozQT(&%{xiA=l_
z1`1cUAj)6e(@_pCxu@H2?JCvol{9useDX-*(VETYl=`H~&Hf#?OFGhV#r))kM=Pr0
zriW+W*-`l7L=}T}?03cpt}5j<iV;VuzP`GcKEHNa;+IdS^@Be@J1csn-^^tOs5&z7
zy}X5OgUA)O4Jm?4cei}vIH}uIbolezmVWzxH|8yg-kx{lrs5%!IU5eGSdz}1pqT-x
z>7Ox!5{3Pz6UrsuZl=5I2_D<chEhTAWCLY{w$S(Y_GVsR7yC)g2Ap$_zGF!^I_=%_
zK5)ao@#%Ewx^r_ZuPpVReq+NSPVaBKw}G0%8la*~JK^Wkw(A;#YzZgpu5V-5AR+>4
zh88pG>@PVTrFw`#=jQucprUpW$f#QfK53V%id5n`FzN5QTu|l0m2gsN8K=(vJ0Ezo
z&mCSDiY~<plDhSk=X80`_7>!pzDdK=>C$%5s)q^=A)A#Z9Z|RQp=4N0sk$_}?PiTf
zH$0lL>ebcN={hR2zw&&X9Pq8u3{;bZf-1or#?$MyinqO%WQy2yelw`1S^;uh8goQl
ztKa1n=^P0s?asG>Jgx;QTzS`c>+L*p&hptG$r)j`&J5m2W`UaiMJE)uq@9(zRsDXi
zv07Th($Mn)2PW0d;|2AZLO}&Scf{}a`}fB>-HV($GyKA?((I^BDV=*HT)B@VYIaE`
zX)tKFcueAKP}Ou<7Zd#WSnuLSX7*FE+7Sk8#B`%v<_KO{UD&j5%k38z7iWHWaPVAa
zwp6m&^1ai7X6V=Qi!WToFzwBiCF*N#ZOy*CDfM(s;!$l6>4>daR~K!+SJiF7x@EC#
zQqN0Gv_f?<LwBNS{lA*5YilAOxMVVQd$*jOYdzi1>ZQth)30X7Y*gSHm^UP8iit=3
zNvQq!=%`-A#|l4(rK~#Zc747Q>>s$?Z|<Kh2mB93+!xv@+@PAR67`@()l1~Hq}cqV
zXJ==p+xwJntN;5t{>r}E-#zxr8Fl70d$$zw{b*oII2qp=A;u7<bJNJ0F=A6kpg*ML
zaR}5r)7!V}e%<e#a%IaI*I2*Xp?u~v6NC3ZuOpinHYA;7OK_d4%eA3tmC^L+6TVkj
zPtQ&GxitFQ1*QXCzgRgl`4d`2v`+A->qH*eaDYpzr0TTpb^+(+=vxPN{dm-!`RGXJ
zy51r)j{X@22qW8s!$NKzV$fc3;pL5u$;Nd|%Q)A}v#q{$eyvvMswo@aifV@m*n97O
zx9jzsB8G^-{R)b28P`m3de}16XN3VMty@)oN_lmAd;T$|OH9`~)#rI|i|H%?wX)9a
zFMAvHJN3ZQ>2Y3%+jyBbOschY`p&k&$@^)3$NZK}9YPy^C>h)Pl$*7Q{+B8K=Fc3l
z|M%VZZ%+J@GR;cSc|F<RPVrw)@QnvqeaQWAjtIxlnSZ@bq)SJ*%M`K{T5i}?`Z_Hq
z@A5L=Zzo^%n%~>-pATi+;cvs!@6UW!otopD@X`6pQt#<Oe}8>7HrtkZTFm<Hr_=iT
z_xyg3($&An9U*O&qfj^FT@KIccXxMR?zjK<!n$BvL+Elp*+=a!+vTb<j@`MvEq5`W
ztksRc@1oKTs=wndGaU#D0F45aFl9eH)OuxGZglwZ4XRHzGwS%UojAW{mU;fXjqB!G
zmj`XnyPNUt&CPXRnIe#~yNmjUJ@1&@G!@tLu32#U%paMz58LIx-BCd^`}9raEY3>b
z1lHIzz5X@dZ!4n6^Du?YS#>7rz@r=i84=Jl>UA|Ow`<H1oBA(rVAvoMvQ6i8u2R+l
zgOHQF2RA%2&zCmO>)BGSoA9w%b3OO98s6pc`|BRf0(CcoOc^$aJYm`JsB^}WmOX46
z{y1sPtNj)!z39^Uh<m0DqUXOCRx?5?>@K}W-`?H^)hHXiPpGqs-RGZUSG()^q59vq
z?_bJZzgH|P7*T^Tu6dzUwB*M`cR9(u$&vjk2SAO0w>=Bb{ce2P{ZL8#^|iI!Tg@1>
zr}$*KF-&Wk0`3Ogb#w)dv~|}k`n%@9g@w+>Pi9yaFO$73vi&HlSbW;Em^Y!T!@kay
zI?(lc>YMM(8$?WwMLR{hy!^D;#%Y<WOv2CDw6b%&39et=s=hHyYq|z1sn<0g{m%UJ
zRPSda<M8gXX}j4sq|`q<1&T#EQ0rZF1E0kMhTle;Ki4V5r|o;Y?e>YE#i9o${hg@|
zD&HzWt-0_6k4~Sdd3yY3!~Q=;#`E_q^P4+sBO?Q9$AjVYd!x_(_J3Vsca?0^H+ECK
zT*Sa2@B_3KV1D_%N``4~_U!>Rg<}{&6$P)(KKT<Xd-rM?#}}PcHOaiBQhkwO+MC@q
zpx(zGuoBKS3zC+fJADR27&LtQL*!{r-1M1@IycLIrZ6UGRxpFQ7~BzcKOg>-@>?Ib
z7fahew(zKE$?vz@cZ-3BKCD;OU0)Z=FzwB%J)p|&4ye_*j8UiV_j8@HQ!~Xa#CONn
zRm?%}KUjtzocMN*THE5Af2Gj6FU+t1e!suH+q35D)$qn{W>lTN35BW8!q!F!s&h;M
zO@&U0pU)h@^^XD6?r%KWIKTGyw^H9XYtHDb<vB1(<kb4}j5@6KpkC1|P}t95*bufh
zN>aEwG;LZKsO$Ok`g4Y9P4)~rkuJKRSbrw^!Bi$aH7zsMv+?LrExmm|lAfEeODCIo
z6hHp_f(taAS^O1bnQ6n(qkhwMA|I_f6Juu`f3ow|B!<@?4)ZU+x;nf%RX;YN=V$Ge
ztq0=56n3>gHS|8mbYN2KJdp^;qkhGVYpTA!y2;7NZ}mc9{aJIPV|!HLRS2XZKbb-M
zh0$m6_?nH@B?|)=yMekDg?^yn`o-e$H4|r<WIi&F_f0<Y>_oRCdmtl&_Y@B^h7C@c
zQxZ+`?pR1!6fC$ivE$v2$9(>`t>5pN44O#{Nd6(|$|^Sh3#hJPU&3a>pgl4Ck2P}y
z*CEh|Nuhs4-BG`vM#b;%?R6Hl=8cLCNjN*hu=$+DW1h^z4AYhboH@_9X2zk=H*5(f
zm5wor?XP{jz2KZ!$;`+&&t<M6358X&R<GNobw-3COk!%%4TcCqm*O%|AA2!Vx3;nW
zY%|?YscDs}9~-XjudknFkl2)6aW3oDx>)Py_Zio$=;MG@Mh7Oj_Au$_m7P*32utHD
z1{q(HQ2Or9%pD(A8|OR%%^ddI{px4~O)R*I+AXtf5Dm8Yqtc@m6Or&!)S9<?rsb_w
zPv*SSjo!AzwOcH3s#d5`+dSiRzS37$I@j%fXT_ks>ILT;#x*RDrj{S&^cFMZ+0bY4
zh-0_P^vyRir<^|X$?MSk4HgDpo=%Tn2C7&}svfqAzj!j)UrkT64BU|jboEc*Pf!)$
zKft9wk40x4|B0i1udlD4Z<ulA^qGg@U*f&@x4*kz_j@g`_VcQHwclf{Fa4XHzi;Dj
z#QekgcfG>Xbdm%%{HRl~pZ{sqnKK{#c=~co^%G39ul2}Py->`$u_5u;mie{cBxQ@w
z7;Z^CeEvEM<C>hxW7RR>F&J;Li~OJ{D}Q$<bAN4j)y&Aa&Oeh2o}QX|<ie^O`~Lr{
z&bqjWb#3Hkwa4#4Lz|PqLotUrwU^Yz9e6Zj+0NqUySnBU<(2Vq)&6+c?%XGL|IF)_
zr!u|W;al?W&lA&&c`=LQK-c=(IrBgx=`ytihrr#FKR-SmIluOY@9fQ?YtHEO&pD&S
zvjMccWY_<Hziri-HcWaczty}!G}Ms4n!#J_BIlaz_o_~R?dfnY3`?8l?w6*>*nL>c
ztxx8qHD|+ApZ_cNGOk(C1sX~%W;&fM(0lq!ptv}T4j<1~k8{%vSsO${Kc;+R2s8To
z<{qe<=yl-It}{C8RW3LA`(KYK?p+;SnXqC@9)tF(M<?Gfu1WbdmHBm{(yKVTE6>i(
zUYUJ;9hb8Bd4d1`zVEL!UtBrUvMb45u5yX2-^S~4)u|=bU$2J0-0`??GqW?&I8<ij
zwc9RN91>Sdl6G2kW{$4ojtNIsg|5!n|My$5Z{eGb$1i#7?-j|)LR2{nVK#!-*TrTZ
zH)9P=>oYGZSU<}&`<A5h+{T4Z_ez=P`GD#uQ&ZUD3r8;o?Oh$Wx92Z!=C_++mUl;D
zZ*h}c^_z|DwX7Y=*R;*{9|*|QV(<>~_+HH5?dT6u9TPrbzT(oG7Pe=C{cT-ica@x+
zVWwda5+x5?4YFW)YGlO=y%#TPUYu*3Av0lS+V1c7s$U-B)-Umu6p_$c%a54KN#xzs
z5wwl1vL!`KW<u3vU-O-86PcWsMl$MnD&7SZn6{wCe+*OidsREo__1pnC(qO}P;m(x
zsXM9kj4NVJM*hD)KaV`!skLoG<HAel7*Mq{tj@f=?3?t#z2EOyCpU^3x1G}F-^Q?E
zl9t3;`vy^8egAAwm6!{j5hzPoVSIO!aq@~iMGV?2-Ddq|gw9@=G#-`ou?+fqegD7G
zV~6$_wVl#t-!Lg_$xV4^>&b^ZqWaxVb=~-VbNZ}at>|$*%F8pgtZjbFB&S`VnxP6*
zx@9t~4qEDEQvEIG)rE!5$C@Uww0T)GZ%}D1v1i{P@&z>8beZ8AGrx^P?XNF|x@w*Y
zE4COTMS!=M;q3!bRwWvDD<1c*YgGYRff^iX!Vx!lFajx!J0j+6+x+NMZG(_olJKYk
zjq9%9)zOnb-}%iVT64eTnj0p}&P(SqMj$)dFF{q;!Z7oa%B$Pk*JmfaJrIzY{--DB
z$A^c0;B{k5_WiKg#l#R+ayG^mRDby<6ehf2m#=a7{bsZOu_HG*c&3&eJ8E3@?G0yw
zr;}zaUxFqFs0W<IxH@WU*0;Y7=?NO^ADHj|*}Hnmo;{m>h&i|MfGV3x-Ui{Ynn>nq
zCTQItb$)||!4zZtEt!{(6+4~Nm=*T=;$n8&UoRHNUH*GmqBt(<wZ_)UOP>n_wYd{c
zp1aC0Ej}UR=bKE%?%-=@W}EkGg|B;a=ZB2atDK&no?$Fvg(3{_;UzWJY4HaycNs5d
z)H&yTUbK9UW_HI5QKhWRo{8O(r-}|9a%W`lez+Rcj!|R0#ws4;5WLJsQ2nIY28&c)
z@wl%mQh&%RWu^7pRM8V+>l9(wAawHk{d1t^S`4VxxVf(6@cH#x+rHngpU-Fe<wDQ?
zRN;u2)1YE<-4s)oFRFrD4UX+mU(L|Hgo`1<Q<P<clcofF#M#;A+wXIPtqf94=Huf5
zEr5A>zW!ga)`3R{t~{SteJ=F$gpN9m-;z7Drf?W|tzl@G8sRi&!yyj|(TH~Wx*dPl
ztN^t#4o_!qiz_~BYEtpx!5Zdn|J*tM@6O!R)=@UqHlbea%)i9Niy0c0E>Nx$I;G^s
z7`C_S>zgmfzP`SGUSda5!iyId7Y8#=i`R8lvbru&ynjz|M1~dvbh@IAHSFuFt8aT2
z`pz;rDRE_{p$Tuo&#Oi%iyj`EA^jxwuv0W6gSTTKD1Y&6uy}lE^Lab(wNYD7NnFrQ
z&e+!2dLZED@}1xYKKq6g!NUyM$9g17j!CBPVEcSZVwP_LD@&W6!lG{+JX8P9)djU)
zBSF1$rfV|{lQS+Xa9r2;$EYohJHjd91?RCDYd_^BPSj;(&|ysl6&nf(U*F%KujVu3
zft1RMDK%ydAlv$Pf|`al3<)Qdeld14JExzU<9Tj@|H>(Q%r-DFIqz3n^o)aNYV92G
zSb|Z5YWE9Pow~HG85fn#9|)-H+mbu`|5h8{1kT2V>e9(^Q_4BIO+-Nb6VTAl+ykJx
z=jE2me#(BOF&kUYN~~gC({Lc*+>Q$;C7KTe+}yhoG~ge^9I>gxFQNAP-SQ)b;iAz~
zdKN|<;NswUo82>0=RJ>DCOC9+Bd>8O{fhk=U|sfRLF(ygnxJWvIVG1o8)tV$dBrhD
zT#u{P?UgV*lpSj>nY>O{?rV3tI>WRkefTuWB<CZVs`Eu6>bCN9z7S0A(e|wNv{K_Y
z=S|SGU_IcamNX~mlV`(G{x6nSH*KD#C|H>ALi5;+xhKn7?%fPxI1m&d1{zhn6ZEOD
z@#>b$VC&Rg_hT2XpZ*l3XkfC>dh<Qu13?oc4s@v}1thF6Ns>t@OwdSgToJu}U2(-Z
ziK-sMXT_OuHS?lD@$vWLG=qpEaeJ#SZpplC)N^fpe11Al={{SY*L^DvI3;96q<+55
zcOd8kKPbRigyWA&8YDE_xp-WO3lu5ag#)u$+K!buzmjFtVLi#H1MeS2fFfeKbn?6|
zEAuzS%R!0Q7BcXqXb|$vR}mE4_do;9#f&<2%$7Aj3f3R(H9GdkHO^G$lP@EK_d#V)
z4!w22DPhH%$xfgd|2?2)<uXnkmbO#>G(xx;ybl(Glth7*bUT4k&mPc}?=r?U&3slT
z^bNiwD_Kc3F5EQ#(_PTuz5vL6whi~H-`lPa`ZUMzi$(I8=ucXS6W?<&L~zN09CMjr
z+Hoxb39a4B7Jvr0%0WXZmJDL)Jgx~V-ppzO^_T8|W*43@M4XV&+P(AvNY!+ZDoy6>
z9>Zr^m7yCnOhDn<4-&j}pz7Dl<tu}i`^5<>C$D(Z*R+*kgGda>ky%XL%+BI^F)vo7
zdbpey42(|Unff<y1!&CgIjE%81!b^LO5Y5R<xC7`?sf`gI1uzf1~h`kxTc|J;Wwt9
z%{5#0=tPLjU}BiobQm-vv*f_4;N^UKzg+T;Yg{<H^974i)oqE#@mf)FN;+H)pdj@G
zg_lr5;js%(Pfx!b=q~$oP6xB|ZOP<mC$t+}4K)}NG%Ex_t!wTzUQ@L$zPY)1rE@#q
zIZqv>SA9JTH+?$_?)`xVBzm~lu*+36{QC0pvFX9oV>3Q}I<rAT4dn5BP-R-!U|RAb
zVAscE(tFwVpOq+HYNM^w1&-ClASZ+*u%__TUXr*RJ5NyT=n960r4K-3dxl&aZf(!c
zx8MFrL-l;)!aoyg+ijF}x<H+mgR4RMB0wp5zu=mvt*eSJl%`&tDJY?JI(7>v(6T}0
ziot<LUKeDtp9Xr(Gj1!={OSK>W<uZ@Q0(3V4X>(#YQI&Xt2-{sSWB_D8LgRM7&2|=
z3(ztMaZt{8Jg_Qkt(0!;t}EIGQ|5<$Oig2HJ0&!|1vJ@|25PDDN61K6fyVhRFY7H9
z;Ny9l*)vnIpRYS85EMHmpe(|^rs2Q^$73_1pH55+^a5KAEr33svwnFyfB#bHyd4Ku
zf3`?I<4_qAF=ZAg`i_G#j`{|(oEs0mHq2$Ox*}1$%tlGa3+(gP4AXQL2}ju3#wjei
z#=$f7t4=5=?SBRZ2nQ%Y#BKh%$?=LUT?Gn9&=^7>!?pC(rB4JUw7erPfdc2Z?&(=h
zF5)3FSsx!A<pMQ#)#p_#x}RoYuw|)Xn(xOqV%8_8fgG~woba?m6P6mWFgbf4z3lay
zWrIiy%Z8-x8@DAs2fVrWBBBW7BR%#FNu4{+NL<zm^Dohg1jYLG=xIk&FIsEygr0HU
z^2{qHRr*Q$Yjf%3cUsSQlk<OZF+}{DmE^+Ds&o3+#Ew-07bm-v>@sY7&$Y<0(SwU2
zV&apg!Wh<54PUvKoF8j-)U9D?XnpUf#T7Aa>#PnxqhmF5PqoZgq9Mw#q3hDxpW8K0
oZ~Av#;_yu8iwhibSpV@~pSR<I&8Zka1_lNOPgg&ebxsLQ0DS{9Y5)KL

literal 0
HcmV?d00001

diff --git a/src/webui/service/static/topology_icons/firewall.png b/src/webui/service/static/topology_icons/firewall.png
new file mode 100644
index 0000000000000000000000000000000000000000..3816555c89631ce591e189cf7e0e1b021056329c
GIT binary patch
literal 13242
zcmeAS@N?(olHy`uVBq!ia0y~yVAKI&4mJh`hRWK$QU(SE22U5qkczmsbIWIlgkC##
zf0pE?1{YRF*8?0J92{C66J%IjkIG!*S+p)O_VS|D^Es8>Vvcq!>S$m&*~H>l;HcWs
zv7n(r!C8*&RdwF!4VOiKh3tsEYyA0Jyv^n3bE@A}cij&Tt$lCH_G2NFl&FF4X6c4B
zDQB^kfU68Kyb7-aHu*E%sC{vNzEs=C`%MO&O%oOe3QS7rV|8Y{Y%-tOU_(NRwC6Nu
zp2ItoCr#`+p}-O*s99pPJablBDZ_lGjCp4Yxgy?F^Bk_&)9`f8x0gZ@nemIh_+2nL
zdye5AbAaJq<6aZ%uM#)ZF9~*^NPuWwmO1O$VupVcdv37Wq=_Cj*e3G9a!KkhmawR4
zs(U9J`F_q|kY~zxJLTmc)7b_8ceGj*T=03{$#UY|*MDmZYMvHNN)J73VCL=i=iYuM
zmTC28ySB7v&f*G^XI}A0<%sd+X^-UR>pHwU*xc&3{3(A-!>-U%)icE#pSmt(Fk=a0
zxY)I*J9E~nsGa-=oEePPNWHl+yZLn6`2#!NUla4HG_xz?)RGT8_4>{aj~Ahu^UGMK
z`5)|Bv@>&-C_@d)gP7$%_2ag)iu25FGL0@5v#RtGKY!%daXr_UkB;UPpSCR!SYN+Y
z#(bOI(O<HSQ<rEr9`Ks9p;dKF<}6*t9+rZh%X8x9?&aBDYa?#S&UIfop;y^E`DwHG
zqKdF(xv#3fKYz4l`SAyLCTBhPcyHTPnHm+JOZ5y)+Mb8R+BPi9yvOPAS7^rerr#g7
zl)b&(zxv+X&cOTYG<kxzo?Up*P;|qGb)P59OsxLZTJ>k`{}ac5<o?dPb8(+yqv%6X
zhXhxRGDpc%Cca;dZ*VZg&MAu9Rw#Y0I@c&H_ne+a@TaNi%Y(BL-tf+yka**N^`Cir
z*_Z#TR{3{lu5h<!!p})&TMQdTqYfPsJz#RyjlqsN;B;o1yiQE({=N3x)!*ecVubBY
zW}lvQ{cycrF7IK+F#G=#dne1wb>3nAAHB{o!L?daAmZYyxz`rYTvo~5u$)n3yV|bw
zdOfzjIo;;Z*Ll3QZ1H^ej&J$HiE_TOiC@3Y^0oN<(s0`cmN1E<e}4-_{4>=qkz1B2
z$N0dP;kmW%yW_sMllL>#ZBL9|IQ#cbb=l_nvaBAf&{K=5ej4?Cmi~L+)S~`|$np0a
zYcljXnY5$!Ud}VQZ1S2pU_0N|xs!gUd_2E#`s>}rMVIx;WjSN7Y~j1NchTBpjmsv6
zIp?_USR`$G9l$cJPphKeF`@GMstb{`mR0gLh%?*>b6J(jRo*wNe_?!G{EKIE>zz)&
zf8V|<^lfym$Qrpnf23`!Ufyo`tiEB<UK@@z8DIUnFZx{8;e5c$@OQ3I)b3LCUwiB%
z@BjPd9`$7Q8kM@54f0vmZ@5D?NSPGrwVnIrC^PGTkm{u@hlI?j#($e<E{ptrLHWT+
zzngx45@mnwx8%K9{eAiW6sEKlbqs(0{?~IpdP#N8eeYT$@$+Xtl%;znu<AHDm@{cF
zC}6#K*5vFyhBoF6dt<|9Pkk@FTfpBpGDu+gGt1|jR5xw-chNg=)s9@<HxDIx<)vGf
zzTRHd<(W`9$#b?~<5J&KUwBhyE!#CU;JA4F`zcS4y}7$Fp7Hs=J({)Z3l)vGUVV1F
zUC(Kw&+k`X|2*W>;Z0K4WNDnLl6V=E&X3DhvE)3Ma{0>B{SPNSyu2~>`MnZPOU=qT
zaf^kX-MM+XaCL8~1CzF<>II=G2QDckSFsuTZa%*7arfycW1Eaw6)A_3Y-|bz&m1a0
z7k8(`dVUOZa{ikqI}}QO&y$&=FS_4v+5xZguOm}k6PD)ZGNq@@T2|$_ILeo|h-*{j
zak-cu^H=^Tx_azDvWUp>?C5z7)AjS7?z;MH;d$}IA5U{1Eptv-nqSJf=F3{&1!tD<
znH7iqm#dEd`n%7z@sYU7^553x$CzVhTO7(ds6YGSr<La)Y$=#>!0W!2aKy`K>H9NP
zUnMM-`#o>Yr~6LT*LH>Klz#g)RoAbeCG_7~GnQ%ZPwOn@V+r$mdfj+O=B!sOJKGuW
zJpM9c{k_X8wuVlg_IFkK0h4~CXTSPh6lM8Jues86Vf(YSJ#)<_eplRZY0r#lUpUq@
zh3ZFdTb3!unjq3(Ja^fmKK-!O*RJQ@4n2_mO80MN`8TJ_QQ!VaaE0;vNAw&N7CXwS
zv|-Q7S$bhCVY@<<9OQ!7XN#xR^zU{*uRrCuxb?}erw@xio}v6!T~Fm!mU9B@jt@aE
zoD!A>{8`{E|0<!_zJa|viCubiUgS)+y81UkQ}k2sXBB@~&{>!7bMS@gev4DS39Ng$
zf*-plEOq;SV6m5M&XsACKF9rC6i~LIP-v~w%tsN{JN7>goBfxaZ_(xM$HIE|6*e%%
zcWD-?YzR`S-r%^D&n*8;WMiZ9^Mv@khc^3etcrTu<(_bp`R|0M8?L&QZq5AlV|m2C
z-``r2gd+~FI~r0c7_l<w-t!%uRyW?9JlXsAlj)<`^K0C6cRbVWTirBs`&XB=w!cF6
z_NB{9{rf#RB3$~VbAl(=((B(@!m6$wp4NNipqp&`8mk*R|NovhncunZOO@G*R{ww3
z4i@%KjXE0tK3+cQxm~{c5}}A+uY_Dxn6$a3GWR`P+I;q_{29G1pfD@D8>yc3qBY(6
zP}bXPvKB8NPCRk)>%A*e4{%i!E<4eCz-!`%OB*_^ZmbZC-rhf}{d$`I<U=B>-pjwb
z#q$5nog0E-S$iWltGoT4r{DNAdeamufe6j1_w9CEIr!|kec6#ZR-GQ%9HFU?rgon@
zW|}_l1;^@-_t!h04_9MdrP3(sv2BW_V1(x6dxBw{);D@$e{t(c+c8^z7rpnmd+sU2
zhs(|dyxp<ptnb`yw|?lVH$DyDc;%LG#LBDxKfC}r>8s24ns27_X8((wl_DK0b^qRN
z_OGi$xA4B$cJ)|(8q2i!qe0pJ2}{H3J!Et0eiw(Y>0EBbw{%5q-QV(hnb>t(l-KMj
z+d9!id4o#prPtL=+O1zFSlw9hxLd!fSZdqbd(#i;ESBHp62@j`SEhMtT8}+vNUBoq
z){nDuBNBRdtz)h-v$$sUMzSrj=B>H-t<zir5u4mRH+oz-`0T*J{j)0U?0(*Ms;}7?
z8gsQO`>nG0;uOQ`aB2PM+&^O4JR8``?Pb50WxX+ZB6Qfm@AGW#x2dcgI+4n2#oi=5
z)_cwwdMfdx{rU2nS;Y+LHa|7@-Ct1Nm=lm-dv`f&Uhe8T<-$K(40w|FUE^*)n8YOz
zAsELI#6EkbeO|}ht#LQ3Z&-NV+f){MM&=5$BwuvyrteQ4Y&mY{d1_{yW5d^^{hJG%
zwU66vsSIA7CE<3l`lZCd|Ef&dOcSpPfP(dLxBT2K691+4bF7-}8~FQ6Zi$Rr%-wsX
ztIu{e+j~W+XYD^w_4||Ai~ByN=ly;tZcu4us`F1^6*;$h_LYNauh;F}DE|6#*qZNB
zn*wg~T09Tod3pPgV3>XGIk#qa`)^yX9$Rk_*SORya({Vh^ql)YD)gNNBH}{05}XrQ
z1<tPSzH;!{Ytz|D-eT9PEkX~xp22$ZUFYXnkGE~(-IBNUqjkOhfm5dp41WFUdr{-%
z8~tPL?r#f|ByS&VWSMr~sbY)z1{<!Y*L4EfrA4z(Y+1VF`)1Y?wl8WIue&dE>1Ld5
zRP3ECeadUpYWDNlGJ%Xs=ZrYI*~s8sn_ouxBg1VMUM=b27yBoYt(x{zAfk@@;l+6e
zK50w|-|Q@#Bga^<J(_*C_Pu$Hh4<HfmD+USrthw$+_&Zi*lI@S{^^>^5wWy8{o!Y6
z>&2mW7w0C{-`K#LJ5RQKb=16$<JIQs8~$*~Uzm4*OJmMtY3my&lJxej*Y~qq)pR!C
zdYH6ja|O3~!rGg=n1k6$4!_*0b=#?Ka~ZeQJ`1^3wYOy7N()8Qx$-CaC$tLapTBBy
zHjd#JgN1xUtv;u~?G1k(oq6Bw!!E5JnQ!$wB}6a!lwjB{P@Y*XydjELvU{QUyw<kk
zH@+L3`&}8#6SlkfpOwOd1D{q`SX47<&#BAW*>vfHG((^FJm)t3FYmHepFNuIcUb-Y
zzd4h3S}|sSot7gLzjKc6{7mgS=kwwF8?5?u-alqqqt%v}<9V`$>*oTNunwl#%T~@4
zcVozqSMr%y8ftG*Qk|)^Y*~S4yYPlNTt*+;OJDqbC4RzIV!vPCfv#_#R5via%AK|B
z)s{bk48PC2GbW3vnwL($^yuV8P5X`u+#BrT_DD_NV=9}~zx=Cnf@}3vp$Nt=X1<@_
zGtA?8;5FTuYmZ^N<(0}WEB|>MsH#7x74z>K&vg^dH5u9-37Hpeo1Fd6utQ7#iu~?x
z4_8#*yC|^pL(7TUhqrc|++&n2nfLR>>M8yozJ25U;PT#B=5s~yyRL}eTU_M#mGp0G
zVVTCZms2P5NC`_=^D9w<-+l8mg7?hGWqMU|-P-M}u)149r%<M;!UmHQo(U(FmPv1z
zb!Cl6bb9EzDSsy%P*>AGxHoyv-2LteC%0bDbWF$$n0#Q8tB-oZ+}P(UZg71wQhie%
zw!Pj+{QUVJaq})Hax<OY91_LDsl#g|6tSt}CDWR1>LLAad36GHjP)|NUW(hhzAF2k
zSEbQU9S)uNqE<7t4Nl$?)~~zt@3P8XW{jBYw@%QybYVoATg<kskFP}EpXta=`Sx3J
z!yhfNbMp>xEssAl8{`1f4ZqA*$y%S+I?c5D4l{e<LFr(Fvdj%<U$9Jzsh%swGL6j?
z<mnJ5Z`tI<eVaF$C58IxUU~J^^K{)*^#@6g39QrfCMbi-><V=zZ!yEr1G_dI<*e9S
zuPwdi+mk29zOnknOTJqY&g8vruOBy)ck?WkX*x+-4W=7<t?G6z)!iBU``dB9m>K)k
zYUXpGD!OuD*ZSgQn=5ZiqLb?1-4k!Vx~R1NglF{zg$*_xOD?t?xTK)gsM;-|y5UY0
z+rN$3`ERCNNR|Hj)l6l>lUuL1C~PoU0g4GX)-~e4=XOd*%}w&oxZG!(@%K!`np<;p
z)n6ZOI`Bzx8e1@vcXJ2GRU!w1^sir)e0}Zwt+mz{-|Z}n*j&1N&I*5Srqjz46wh+5
znZTq~4)Wy814cX#npfYl{KoU=XTNNQZHkUr%KK@Pc@i8GSOs)jxEn>C_Sl4jltvy1
z;`MWnE7q$rv$-~{<yFq*e?QM}tb874d9Xo@CCuR=(=NdX#@5sC-4aeJsWC^aN`J6o
ze`!HZ!LBFU*Jk{_vm+vXc1j(`nv_-9{k{pA7eJAAg?G)Qqeg}gm+AG{GKZ$m*3<Vr
z(6{&Z(<4q%0uhR=Utanp{1iEJa?XKCu2(p9u0AOFX#Z=G-_uRo8q?R_l4uV7ch0P+
z?4T~kng_R7KdNkKT9NiqaYKq=DdXyzm5+WrnzpWw*Dq9h-MjTZPJZtkEfsymSf;5d
z+O{cfu;H3|q6cIw<C?Ce-U-JRyt7z3Yj5$EQwyG~&A)N0;N;BK%?cY1y?lOs_JL2U
zXEfV_;zukZv`?c`KmT=ORp{y6eA7%5X3XhG>sG9dN=Uf<>)Hxap2I(UKL_xzHypTB
zASn>BsUxu=bhDGB&+e_(S>c=ZZ$4#Tbmc%+%x0rBzE^x-{my=xnIYjO9w{32Bedbb
zr_~bgH!x|6i9{R^wPA|CcaQn%>FI*Udxav@WlL4|?OAKBHBIy7l<U52iF<U^e3<WZ
z2}JBu-E94V&s)rpW5cU3P4Q};HBsB9<Tk7i``@>@&tB`@`#?r-$C7JrZ3EZVWNz;a
zH|0_ObJKLw8rO482QCE^F?ow!)ZY+t{(vU)?uC;M%l5p=3I5p;v}1el;uDQa6HF@;
z%wK+-a$u5vr-K+vn8M9Rb2)S(UF;8dT`~UfjDP>3)tjd$7JOeek@@wDqNPdYVV8EB
zFtALk@nqSguz~5MTf)z&XSFw+vsmYqGk5CN^aWda!>=4z6|l?Y&D^Ue-L3UkZg}CC
z@N=(&%`M>wxmK@~W7ay6F8T+8Y?+V8+!tJ`vwzo0vl#LHmb~+8et&-0xQHce=A+1s
z@tXeYLvNa0{F!a`u;=lrsQ-QmC#Sn8a5HI7$k}uFllE*Do$d1)S8evSZ#RnxWb{6m
z^`>|3g<W~3x2Lq9jqD4Zz3F59-r2$tb^09*-#`iX)9#O;AQaqCWwJulTItv=<AVGD
zm^ZF9^P8Kyh#{<VjgQZcotu@{*hOst71_Mow`X@8=hXShbRoqtAyZ(|fl00<%+s<8
zR`K0GeWGK(NND=(JbnKoZ|2vP^UTXhSXsQyE&jS-tl!#9>H0(8UtjpWRlnfD0?xd%
z6SLP}ZaQ#j0VwmoU|G|eZEpRI=ghsy!q$a~fzs<zn7j|ZnyY<lQT*h`vWcbtHfY|M
zUajy=wo&zZ+;Y~&rH;O!_~TlmAD&xKb0sKu$CZQC-q-WJB}^g@1RdAiU!H319<g%H
zZl1Xn5@9UUV#@D=N<mjnok$n$4RdTl(xpq6Y@BWubCT(rw)p(s?DIA!r_E~$?Vqlm
z819#Mr+m-hNk|UVV9fseEp}s?V4U@B73PRnPj@m+`1<+mE!~altivKc@_Db@od+rw
z7cI;5W4vIef92hr7#q{l&bAY+>PMJkXYKHFE8Q085V1XX`g6|LY}Xds&VIO#Z~4t*
z@!JZeqwJ0OZkN3;KGRzsG0%J1(Fq4GDJ;&MrOkNdvcRentv?Dce~V}i-aj|Dgvq<n
zi}CcYzzwfH9ID7UbMJAKIFt4*?`a1vEii8s^*QqXTK>_U`aQ>|G34$jVSK%Coo~VX
z!*}QJdYx^W;^P$YaiT%Q-NO}v5s6o<pLi$y6fZpgFXqaR=f4|o7rbP+W~%FdWcA<Z
zo0I;(Js)fFTr&Ut<%;&F`@bdHaI7(SB^c3oHQ3ir+U}QU!v75ib}cA;d*c)9>!#4D
z0o$jmC0*JSZ~N2@*6()o`sbz5t?^cMit>@@7RIpW!C6PbHb!q}dfI#8$Hu^jU3IIM
zPvOw<H_9|t+F;@VD&UuKZxC5yx9?lb6rD8d_P-xgICOT-Te(SLgNcSes3vCK5Ovkk
zYTHap!8KQW(Bz~dUWo*kF1sqI+I3WQcX|Cf-UOCuG3P@f1tO%TsBcIS4Cd5fUEOJ3
zzOi&i;D)NAS3-C0Th;|?H>zGY4h5x)r{LO=@$_2R@OO>P8<ms#bYhv_$6YkbV?r~C
zQD=Ku3|H86-uZnKyX%j+`o0#3DEfKn7^q0$0#y}R2|Kqw4tjog^<*c}HCNgXOv;|_
zC&n_ZEelj61~Q#qD?7dEYOiwI<KCUxeCj?4C%1a5b2E86n{wzx9$C>ab%pHpukX)y
zHH*IA@MPE0*{qFA7b-!jwN*vmtvALq&%IT6*E)@H-i$x-(TnyRMm3+oTXxHHmemJ^
z#S%aKaP9LHiYR(}=_JT;ydcMMC0M2|e7EY#-Kn?HT(*+o+U4Ns58hpjSNG{db2PJe
zY3ja*%{P;hSf*(NMo9`pNS$&_IH}~uxn|G0Gs`reyC$5JS~?lzR4JBeI*alWboczW
zF<BLO(riQ1)TpEDb{SRw1a$+v<fWOsopnLw=-dNE*~h2uZ{0KJV!Rm3wD6^u4)-0n
z6u{2pEfy%g;m)nXl{}~Jd`pW7PqWl!I^FH|GQ~L|a|K(YYWE7}h`hHuKDnKjGVt*`
zk|g+z@Acu;w-@I>zICl|w`7~)y>g=x0a1kwE}bdNOy1WtbT;JWUuW>2Q{I-VaJA;^
z&X@NUpC4e{^W`ajk&;wnscX0JhhwU1=N_ArD$({>e4p?V=Q&I))7rS34oq_8VFpEa
zR%-S0g~BnrjZR0h)~onjDP?!aJ#28TLUO*@KM{oue_lS#@J%?W#Kt;JT4IUVry{rd
zNR~>KkX{|T-TRb{jE(NJt;~`*mbTvV!nxf{EYr%@#^{35o5F#h4OP#(wrwkmiHkaM
zT9TDHY`5_0<U71`18lU7FAA_syUz4ui}HpVu4gHJ2`80)u}+JA@33C?$<v-c%%`)j
z%Q7HTxFxU(pW)wd=fH-<-+5c4jM%cbz2lkI(megT`yu1L)lDavcP%XW_@l0EcX3f}
zz4C@FQ;&;v9JsVV_x*+x!M%`F8QLy>EcxgA`cut6H+*1P!**3W;o4i<T-`%u?{4>B
z-yhX?`<Cg3z7y6u@}?h>y%K%~o<2J5z$Di%OrS7|E`RI#I{jE?`_xlWOw*#T%a*2J
zeb{=wuxxHtfcAS`c_#0DDol|A5sfL`<w_e;1XUAuHaZ^k(v6MS@{Yf90)tp*L+Exd
z%QL&yvagz=D=HrO)%cB3iBj6%ErR7+@;wq*FW9c&ZWImKSyKnf4NBl#)*thBp7eB+
z2-RJOZ*4SJ|0WT!w&vxIlTV+>IeZUSOT5+fb>n{Fh@!WpQ34TCS5!8n2;OaYdaY0U
ze{7G8?T*&VvSIDdk3Y7bzSZq4m-`V`yMhl2ReOK2s{Q-$`r&@zh=W`CA9*IQ2A+N7
zoN!Xfit+Wt&hDgg!>!s=x7rrXwa@XAk$5856luYj{r1}26`_W5Vb|)~Di;ez94z5~
z<(j}6+SlK*Z^~w-*JpQXUszNYI;W<jb%#Zz?vu~=kN%K4v3#TOhBb;lmyb++f96Ov
zci7EE!Vz|?{F#0Uts((CKl6EuUF2GG*81CxxU}c_iu&$Xk{_~0`2FRnY+veLzdw*e
zXMdOFjoHg~3OU&FF6_$T*zUeAg<Fa7^*aCO$tSifU6=WRPy425SHC~F!O5kcv}pH?
z4;Sw$$6VVZcW=)d8TV#)HN9ib^Xn%UR4{4Jyt?tY+6I#sz6q_ufxEgn#qZwT9g)T+
zcIT?}*VW-$Bzfolw9WflvChJzQPpe7)rJF?6x16<V_de2eLARI_4&*h1A||?z~h0l
z53k6tciV5itcuG8Q6XG5S<a9#U)(GAc16}JA>N7H?j3r|uefYZUVTGt@vY;l%{~Rz
z^DzJTajW>^>W77W&gOMFBGcC0f2FC*bb7MStsV{?-k?w6hmI&+TOY=F|K4r$a~U6Z
z*<X0m>2JE?z5S8s>2sUCXYc;+=9KXBx``G)lXvqaP+7EPdO+WT<Bz6xpFg%WeO?Op
zw(R?Lf40?@zj<F9H~UTHV$=5<zFaw)Ey8qqbr9zpP#IjpaIN_H_9JJX&&l#Gd-dsl
z(r@PP@)jEYN0J;9eooVw!rUn8wQv6%P!0}Ze!Vbn`Qv@(dUHF^{jL<gW&eNY`?|Ku
zMh=~w->h^wba=Bs-M*D9)1tc#u9mvbW!tE&9zL(3o3&9iVwXc7yjgi9gz@#VYs(+}
z<UY4WbqA==@cB(d%KN+e>hljY9pF-(pP$ZjdV5M4sCYCKJ+Ny@WGv7AJ-xa+<;`=C
z&-Cx-yn22@e@oHX$%&vo>C^+0TzjM<^8WIamfw9Si_!(uXuP`l;6{nc-0JAXmrHM#
zExI~k<BzZBV~Y;S>2m1wJ7pRvZ!qBiRmg6vI@{~oURlhZ=3l#PtLuzerYLPML#~9C
zb#0ULUM9UhHRsGaYt)`*3iIi;7his}wcHrbJbm4LHFZglKNO-k#F?~PDk|53@~~0k
z(`z-MxlZ95yu!K-?1WC0Ue5(Ne+sBaE4Cpd{F!8P)q<Lpj|x3qu9mi!qh#dCj5=3e
zl$?{b4czE+atF(rz06PFG(`(U9Nfx{lxJVDO^f~<y8K=vYEQ{6;b)ky`i3l-NVd&+
z?-R32W_7uVu}pjKtq6<V%68T672FZ-)3u-8s4)$E?_jz6ff!3z!P}+^p$Ny2$FkG%
zua+>Zc6uqau{`YSs%hmi_Spvv?pL;!?$}=}Y;$96r>PHUYOlT5w;ojHx2<j}2X%=W
zL)WEjys^HKw|`^#j+4^1SqZX%izKG~+r0kmMUexO+Y;}nu6E+y&m|C1CtAD#)O0z_
zu-fON4yYI9w?5SJp+g|kYL_szWB0E}KEJa1*%aYM)p(&s9gZ~)n~quwMr`VEYz$o$
zp{B<FqD^e;>aJ!NR-LP*?prxthwYyh?N_5BvRd>^!vU^k(R0K>y*ieNRTo#@lD@HP
z-Cw<Dx8wgiES8%3h^>z+!dc&j`}+LaqD7v<5ua2APc$9iQjvbY;m@gO;t`!vbNBuJ
z+8?nySNz@ED;h-!wzoD*zI#<L%cPdcJ4oZfcSOhHBL4;>9_6xmQ-c>@K0j^E!Jmhh
zJ&3<M%Z*QmRf|=JU!Li7vxlP(#~OuIku{)Z!TJM1@7wR~-X#0W)bgHK38Kf)dGPLH
z)@!ZH<>gPG{`E7{+w4_{Uix2SgzrC2ys$neuJP%$sW)#~8+av@+HO^I`@5ETlacYG
zWq<#+<w|@!>tC^>I+*G7dsad4P@RlC=U>j}tPy#=esinX-B{NYzY072+`QE3WKv|I
zaNJ&1>E|}ae1B(OJ^C2bXZokte&8BQSi;MH&ri5JMY?cCyt3bW>siv@9bfr+m?C_$
zLytXSj1AnD^5>%I>+SEm4tkkxd2mezxg_XpSX%csm|;_$&{sYmvkh6{THT<T5Y^Kc
zP3zy>>fUy~?=Zjg|DL7ZDC0{d%+sP5Urv?YzVNH@<Cto8HQ|V>r=}h|b9>k0iqogR
z$W|9$c-Z<eVn^BOhn%R@-Q0$)6?et<+}c0&Y@}`0N<Q=GvUjDtb953ybz+$=vzH!U
zc~$F3@7(GK3RZh97>&boJAPZE<noJLYgTI4Iqw!;bvWR)#HZRl-}rpkHe5+d`+9EG
z&5fatih`c!#D4o$QuE_%)@>I~P_bwH_q{FygK#NmEdaa-3`<z~dG(qNw>H$8NAXHN
zURk~%FJa}>ukm*-T`e^J?5mvic<cIU)_#)?Aosd5Sf^ce{>o?b`K4jRR?BEUwv1Sd
zRe7K8?cAfQmlbu~?AzXCu?L+e|CgTaJn$(*FV~G_8k;7lTy{CYb;&y5x@_3Vq?r{j
z4{a{|Dfu;Laz)*-@*RICS8}Q&hVL$$oSn+>CVWrZjaJ(u=W2h0#*6k<v%g}xw)}dz
z3x9iZlAF#S&2RTknFxnB9O(MSr3$VhS%m|?^5y*h^L)nsWB)S`Sv8n$@T~<6g-`o4
zeYM$<Y5FT{yDzmLm?U!Pw{7E6M}H>m86C3mGX0s_*Vv2rxOKM9jNH5Z)QJuM#VsCp
zUi^`E_y4shRj&yLxI*?F@Pi~VkA$D%AE&Ri4t#!4@SiMyWeel9+iB1Cq)6GDad}_Q
z|2jpw@u{a8#LvE$=P)g(jazZoawoKM_3vQcb)<Y+p!?A;6{$fFIN4Z1y8m<vL^PhB
zRN~I$-F)QF)Bv%-TYq%iJGOH$tqJb46N<lk@$$BrH?7PXpKh1BcvCn+YKt1E^TZ2s
z?_2&gar=B?Hd%jr=YDh2(MSK>5>9^gnF{KPSAx10Qx6o~KC`B7>7VaQ@^jfg2u2jy
z2B(6G^Le1+Ty(>ge-2+IUTm4U^Ze_{f$KsF_f)$^-%C8H>cb7{{YZjp-Vlb<Yj0-$
zJ9{R}ny*pyx_+z<hYs&lg$*f!i`k~#I<w|nVtH2Cta@YPM%C+jb3u|<!ICUti_V^D
zR@XW7;A1yNmrA2?>9*S|a?P)uU%h$y!)N^ayMCkVXPOqhIe7coGc40$c9(#9oFUDi
z8k8yG)!i%J;&XGopM8FR&FQbwi!C!}qIHcJy#M}6zk9~!^Ksr6zb?7FIc@u3h6<YV
z7^azWU!D1L&GO?8b9X-drnuqBEktK2>B@mqug~mJtS&$FghOX%*-Ox{3b>ymp}OHy
zdD=81*bJ7pvn{BEynCSPUz72|SsSA4ubn#+l*Te`NkCPte?sO8c2MU?IAYb!m#5f&
zKRj_s^$}ax?3uT1to7CzZ=NFAsH!<7?!It@)GJWm?G@P5QytHTt0n&V{`yJEr^pu8
zYsR(FNe;7v*Cx-)k!UMcc8<S!@y05K#-$Hufdaae;dHKX@x2$3%xxz-BXkZitj?QS
z6j9<YKSgg|s%&{*qD1;nzc#)_Of1thCgwOKoRn&11x3wDhG|tgbANx2TM@i;&gCcP
z4S61W!^i#L!;7ytB$l5$bF;d5!rt%eOT&)e{ogpJqs?09Ys9aky0I7j>{yleIMkHq
zaQ%Cu`!~gH*_phZ&w?_$!GWqR>BcK;o38a=PD`_#T*1A+zvY!*{-d+87rwQ;>TFZm
z@JH;>V%x^2fh%0nKn;(8gr9fM=%fqrMI6@8Z}y&bb!wX;e4<Nlzci#`ygs*d()+V#
ziqsA^es#F6wqcugv1I>&PthFx-&m%(FRW-6_0!mYAn2^0d;Il_+h$fC)SsQ4z4nfo
z@$a*jUMoNBUF&y@`|lh3KWlHz;r*Ju@TqgcPu&*xYNpeR16aZ=7XASx_LaBJ-1&C1
z@W!s{_#G*qDytd8zW>^qbX+&uzv)NSS+$<Od283c=3`*;j&6O#EEplx@>F@D&Z6)H
z)3u?Jli5qQnp%I|H8b+uk^9Pto0C^3{91cAU{l1OsMYh$(icAsp8s&wH1$Ux@13n|
ze;WP+GT!%t@AUkFxQ3;(=APTVSzK$Xrlk0t^J!`Ik&4?w4z0~T_i^g!W7nc0KL`F6
z6<rgSf3wm0mbuD?KV5Q%<{jWtjGLzo>M*J%>@>B$yU|>|Y}r+Q>HkyMITIeTt<kmq
zo^))%yKSutv-T(5es0%ZHGP>KXql4p4uJ^8Bgz~0bWi7q$h!LDi{stgvwos7yY`xJ
z8i(h8u$$oTt)8Iiu&?Ul%@y%`lVY}j<}m(k(3JRo_txQh^$j&#a+l^D;L==B^jvnD
z&LZgzcg&2nEmjoY_?wqD&A4-W0n@aqneVoA{r&Xt^2dLN=09QrwV(LY{S#U*>puha
z&8-+;U+aJVpgVfkqd8SqA2B_7e@4fhFa05l&hidWr_GEd%;N9gDq(oDYi>hn%F0K5
zznMRmr%h9C-~54T&3CaiheY$w7szxR;99;vKA-9I`XrVxg`;Z@1ZA)CTN`#z?DShd
zwF?X6=BOn2#_yDy+wND8Be?94aD<%8wG5|(Oo7Se5t}-~5-clU+yJG&{D~Y9uVTZF
zi>s@=+2x$@Gt_2|ZKJ5){u$<ts@)olr`H;9ma&|3^ufF3kMH^Q<~n{7Yx7$DigQiD
zuiszQHvG|g_Q&G~XM<g3{L0TW&sD$W=AFpx-?5T;_f9{x!1QM+S_|YnuR2`~nil$|
z{@u;?XZ}5Xx;#_uSf(wRaPK{*4sX>gSl=;*<L>O4d%0GKtva`VwfL&(`pLyRzpQ;J
z@zM9sC)VvdSf+&^{dz+%LaIb%LsRFBp0j7-i~_Uwr`^AIc$<OA`RyN*7jG!}8>YYT
z$ECZIy?%kZYEeQF|6I>l76=@-|G;RL_Wt90nM2N|n<UDU)sG81udl8bbJL6Km2K~f
z`DVoPe#4#>OU}0)xU@jE@oD^#sk65|p3?6AtDNUyqC|(R@a4q^H*V8#oE|I?p~xk4
zVCn%bg;`gRn)vQ35ii-YujGHiL;oE)KT3FCRr4Dz$>-+D3BLbqLPp{Wk-3NpSTB2m
z>lDB23Cb;-0~Q1w*i?5+@2~2%g+C8C8ed=lb;Fpf1tS`l{+_SgsM<ZlE8%N?6nlQ`
zwPPQT1eAvO%y>Kv+_Zr=XI3(W&91tdl)Dqux}5Z7mqExZQ2Dy#do`1H^E^-)qt&of
ztZmg(?o@BFes6>SoePVeb?S1g*}(PdvpRgl$c<NLd+Wk$!p=|6aIV=P_4124Y_^M2
zr?lzimgwD;R)!(x<{aQ!J<+coHtiO2Ac)&Jbh`9<^|n(pg(DJ8FTM0nfXqbpFh!h<
zkkC5Y^L~R$>z6uE&mS~F*~1iZKE6OLFRQjoccuZi^U|4u5tE#%_N#9&c>(I`sYyrh
zm*h6F?=sn_DpZ!Z!o--#JILexca~{vwxA+5g~?l&r}lT(wrwg`Iu|C2w|N;Wqgdc0
zwqep<%s?<|xVkIPv}fl&=01-{hXOJ|l@&DYf%?V2<9CSt)ZaEe{ci)K{Mm`Ju{!hK
zm#gJvrPd!@SDm<G$^z~Ut0dYsx_)~4{hz49hCkV9pTX4-$ThJa6YN7YVwLg|mWO>R
zN_(gi_x?Ut_*R>XQY{C#)K{-IZ(Qma0U1nO6elq&BW?S(wf)O~-{@b%=zy3q`RE54
zBj_uSm?_By8hbu2>>SDluHG^>y@=Z{X18}8Gtbs2(|?~ACQ68BO0^~Ga0x_6>2ZQg
zX5Y{je~)dt$?Dfu5g`YxUjJBZQ0WjZa{knoXGW|J;)e~2Qe86yT^O0PJF>*&L2V?R
z4R^%ap2=HsCCm-jYV+*=&C_KmybVhkq9ocjMu#<vIf^Q5XwsT~z8^aD*t+mq;AGx4
zEPHwC886&1=<(eow1s0aL!+qMUgv$FR2Go1vfTC6-l<=YT*%%1{brr2kJ^S1edp5j
z(no>rQR=&S9gGhf>?w_#x^$5%6Dx-f?{rWjL4qaXY~NZTYprEVmQLMcW%%W=>+0Os
z8z!-?Nt!9Su{<pOy5%jai!uyrc@NLf*LL8R1^GEdWkZVKU#8bTPNf=tf4?_irO(M7
z4=TBxL-P+-Tbp+M){8t4w4crDi;)e-g7t|Ki=W=S>@=N;Wg43*XwJp{K+yZHG@e&|
zR-vbkvYy*-Py(7dV>tcxgcQSd$+nNXY>J~^gfzhBgG3`<#ZJtU3EW@h8hzn(yZ`au
z-2baWMOZiFWnX9TpI6>?`H7r4&ttjDYg;a?WoTUL7zmmT;@)uOP{7qmtKV{7&1GD>
z_Q_=4HT!zAl8;<{yTc$vFLw!Oq<<&KHTnmNq9tCHBxM*iE){F@lf7~F+i8^sea0=%
z4+ZSJcM{YD)bLI?spJK2THLw%&?H)6yRh?QR-Nr}ZS7)h^HL>_@l|fy;xP^6!BkKd
zaXBD$W0_ssm#z6qejtMzmd1V4-}Bo>CUo7DQm6fl8HZXI7R{Xu9^jY(nKX-%uzHm*
zJ7J<=y{6aNC#B4wdD|Jq?*7|b7wYmJj!-;5N$g}8C`b$%Rl8rXta<o3e3u?i?$0af
z5qppRed(>f;mV;4Gn;o=e>Hk?C}8K7iJ(!=C!iMl+5^8n%)V;zeaWkBtqZNcJzMa&
zTX@5R>1R2cUonL>#kHw5*u_X_T{rUr%~{<7WdYHM-QV82&lEcPNapIH3+J5G6OQ#u
zA8FXt@HOgx*p6FuNh_r47bHsPcXVD*2m&RfqS?z<o^#BaFP>HIr#ElbE*Iw~hlCHU
zOkYr1_7hY-TxZmo{`tn$3;vRAh0CWf@9&ReWb$r)wk&fUOMt)g3MJ`7y9`2vlyo-i
zFbD~<umu%GS6UBnsV7Yc`;^#lv~}UbS5v+6nY^2Sv4j-}HgB86&!wZs!yC7{<b%ov
zlaR&(Txv-(!ag~IlpcIF#V?L!T3gl!(D-27oh^L#b}q`DbMc$4<%;hY+Ci<W1zbN^
z!<t$b-fZtPe|G4C!_<yzo#0tB)$WYgYajkKh3@$CR&vwg?pFB(PHyM(raZ}E4_sbI
ztOP|cIL%~!-Ylbd?~wL}9R^p{Z+e*vYH{;}DhsWI!o(FZvzx#TcQKF%SHj)OJZGD0
zt9J$$ftH&)pPME2av1|`Cg;k5AZ};-J<mQoYyQJomnGpQZ<!pmWHD&cVU<9{rj9_S
z)xLYPHZGpFb}tYAT!~e2o8C`1Ugm10<&coMf(z6*6$K^q(sffylT90*wolXla3o-7
zOlG!YLZ${UNS<{=mi-6DXMgu@zumcT)zm*#mcda=HiIm91-5{}du~wH+f<GQZs(_;
zL?l2Ru$7<=m`20X39VL!Q_zG(7`oNlPNixVfab9#fd-j08Lr8;CGt!(UhL`^)NtTZ
zfG((bOG>cKmpHbzC~S*H2B^r;0<DI4#dgj8`kZdN-o9d~8QjiKi$o$o_Pqr4W#)oH
zV!y-%QOT_I;y><NCxP;x4C}R~1D67<Kt-(h1|c1uP|qpJ+Lb%SSZ{*FZ9(Gf8?wSQ
z9&a-+nbweaBY)?UGZ}#sL=-ldgmi;SPHvsjq!-uAzm-KvR8<r(d9QPJ+zyhQ0Fq>0
zBNRDv<Fs#Q`&Z8@P(YL9()l{U{9T*hixMy2*9uvQF9H}of8J-n^ElR0I7%c1l<==A
zZ%7erX3{>`xv*Ta?c)*~BVDe^pr8d0^*T0u?f2{bQ1E@3-@$lep2t;{AyFb`Abp~$
z;PP{I{bj3)+n1!?T+o=$^deiLtxDy|@(xXhgiH+!P&Q|e$Vz;%Bzl*EvGQT53b}@B
zHijYBc5eV>Z7oodRK*&$SZb<4aX|TYVdrS6wvWqgq;$DfgB)-QRHw#)+8ug(e%pj-
z1z(c-P|o06k+fn>aUwVXKn2f~hR}^AoM--4>u(o!K5xYH*t$|AN~8?zL{Qlw%;>Gl
zGq<*y-(+3nO(~Dk?V0DpK5g3PdK47+nV@2pH{#Wi){W*RB~cQqn&L7fj=2|=M2U!k
zOqdEX;ckQJpHF5xmPE!bXZSAB_Hl>IOfgqaMka6Pt)P<fuYOGTAMx9#H`g6_f3x~S
z!1l{?=j=2HnYP6P<jGT@nXahDt$DZgR>ZT)+SwR}Oxt_{B;y5|29A>FjJ4Te5Hf9(
zM>J>}5+qi|a7~Nh><)vFYnwDcf~!D+T%e>Cs{M0okxG<ED#&eD&3!-fGK4?p|N3+l
zuauJbJb|^Z!-{90(PPlvVX)=H6|0%XiW^K;WbZwENnq28mH=+&-4bnvTUYqZ_{_7M
z0opDXjX2`Xd$>Y>gSl)sc$#pMa73faoO}tlZijg#TAM)0-Yb9Bvsi{*SsbA=oVPGd
zC_iwuiosv1?PE^jJcH-U;u)E|_b=;tv7jMymNnywsf!*nmOSrVxW}hS!y$n+u-9&%
zs0GWKr3|;E+BRM<XRr!jys9%@E1*$B#K8CSZRZWQ#Ew?TEH2P;NDw`@YuVj3K9|>=
k6L!A5PKQ-*;eYn{hV2iGf`5HyU|?YIboFyt=akR{0A(tZRR910

literal 0
HcmV?d00001

-- 
GitLab


From 2074132235786a35abbbf4f458a827be9fb0eef5 Mon Sep 17 00:00:00 2001
From: gifrerenom <lluis.gifre@cttc.es>
Date: Mon, 27 Oct 2025 12:01:04 +0000
Subject: [PATCH 4/7] NBI component - IETF ACL connector:

- Directionality of ACL rules
---
 src/nbi/service/ietf_acl/Acls.py            | 29 +++++++++++----------
 src/nbi/service/ietf_acl/ietf_acl_parser.py | 16 +++++++++---
 2 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/src/nbi/service/ietf_acl/Acls.py b/src/nbi/service/ietf_acl/Acls.py
index c537c8172..e966f2c0c 100644
--- a/src/nbi/service/ietf_acl/Acls.py
+++ b/src/nbi/service/ietf_acl/Acls.py
@@ -46,12 +46,11 @@ def compose_interface_direction_acl_rules(
         if acl_set is None:
             MSG = 'Interface({:s})/{:s}/AclSet({:s}) not found'
             raise NotFound(MSG.format(
-                str(interface_name), acl_direction_title,
-                str(acl_set_name)
+                str(interface_name), acl_direction_title, str(acl_set_name)
             ))
 
         acl_config_rule = config_rule_from_ietf_acl(
-            device_name, interface_name, acl_set
+            device_name, interface_name, acl_direction, acl_set
         )
         MSG = 'Adding {:s} ACL Config Rule: {:s}'
         LOGGER.info(MSG.format(
@@ -114,17 +113,19 @@ class Acls(Resource):
             interface_data = interface_name__to__interface_data.get(interface_name)
             if interface_data is None: continue
 
-            ingress_acl_config_rules = compose_interface_direction_acl_rules(
-                device_name, interface_name, interface_data, AclDirectionEnum.INGRESS,
-                acl_name__to__acl_data
-            )
-            device.device_config.config_rules.extend(ingress_acl_config_rules)
-
-            egress_acl_config_rules = compose_interface_direction_acl_rules(
-                device_name, interface_name, interface_data, AclDirectionEnum.EGRESS,
-                acl_name__to__acl_data
-            )
-            device.device_config.config_rules.extend(egress_acl_config_rules)
+            if 'ingress' in interface_data:
+                ingress_acl_config_rules = compose_interface_direction_acl_rules(
+                    device_name, interface_name, interface_data, AclDirectionEnum.INGRESS,
+                    acl_name__to__acl_data
+                )
+                device.device_config.config_rules.extend(ingress_acl_config_rules)
+
+            if 'egress' in interface_data:
+                egress_acl_config_rules = compose_interface_direction_acl_rules(
+                    device_name, interface_name, interface_data, AclDirectionEnum.EGRESS,
+                    acl_name__to__acl_data
+                )
+                device.device_config.config_rules.extend(egress_acl_config_rules)
 
         device_client = DeviceClient()
         device_client.ConfigureDevice(device)
diff --git a/src/nbi/service/ietf_acl/ietf_acl_parser.py b/src/nbi/service/ietf_acl/ietf_acl_parser.py
index b7977fe35..65e9129a2 100644
--- a/src/nbi/service/ietf_acl/ietf_acl_parser.py
+++ b/src/nbi/service/ietf_acl/ietf_acl_parser.py
@@ -17,12 +17,13 @@ from typing import List, Dict, Optional
 from pydantic import BaseModel, Field
 from werkzeug.exceptions import NotImplemented
 from common.proto.acl_pb2 import AclForwardActionEnum, AclRuleTypeEnum, AclEntry
-from common.proto.context_pb2 import ConfigActionEnum, ConfigRule
+from common.proto.context_pb2 import ConfigActionEnum, ConfigRule, AclDirectionEnum as Proto_AclDirectionEnum
 
 
 class AclDirectionEnum(Enum):
+    BOTH    = 'both'
     INGRESS = 'ingress'
-    EGRESS = 'egress'
+    EGRESS  = 'egress'
 
 
 class Ipv4(BaseModel):
@@ -132,14 +133,23 @@ TFS_IETF_FORWARDING_ACTION_MAPPING = {
 
 
 def config_rule_from_ietf_acl(
-    device_name: str, endpoint_name: str, acl_set_data: Dict
+    device_name : str, endpoint_name : str, acl_direction : AclDirectionEnum,
+    acl_set_data : Dict
 ) -> ConfigRule:
     acl_config_rule = ConfigRule()
     acl_config_rule.action = ConfigActionEnum.CONFIGACTION_SET
+
     acl_endpoint_id = acl_config_rule.acl.endpoint_id
     acl_endpoint_id.device_id.device_uuid.uuid = device_name
     acl_endpoint_id.endpoint_uuid.uuid = endpoint_name
 
+    if acl_direction == AclDirectionEnum.INGRESS:
+        acl_config_rule.acl.direction = Proto_AclDirectionEnum.ACLDIRECTION_INGRESS
+    elif acl_direction == AclDirectionEnum.EGRESS:
+        acl_config_rule.acl.direction = Proto_AclDirectionEnum.ACLDIRECTION_EGRESS
+    else:
+        acl_config_rule.acl.direction = Proto_AclDirectionEnum.ACLDIRECTION_BOTH
+
     acl_name = acl_set_data['name']
     acl_type = acl_set_data['type']
     if acl_type.startswith('ietf-access-control-list:'):
-- 
GitLab


From cd5326866452c8d8f476b3edfa0fce81e10f7c41 Mon Sep 17 00:00:00 2001
From: gifrerenom <lluis.gifre@cttc.es>
Date: Mon, 27 Oct 2025 12:12:10 +0000
Subject: [PATCH 5/7] Update Policy and ZTP gRPC code

---
 .../generated-sources/grpc/acl/Acl.java       |   56 +-
 .../grpc/context/ContextOuterClass.java       | 1330 ++++++++++-------
 .../generated-sources/grpc/device/Device.java |   14 +-
 .../grpc/ip_link/IpLink.java                  |   14 +-
 .../grpc/monitoring/Monitoring.java           |  322 ++--
 .../generated-sources/grpc/policy/Policy.java |  140 +-
 .../grpc/policy/PolicyAction.java             |   28 +-
 .../grpc/policy/PolicyCondition.java          |   14 +-
 .../generated-sources/grpc/acl/Acl.java       |   56 +-
 .../grpc/context/ContextOuterClass.java       | 1330 ++++++++++-------
 .../generated-sources/grpc/device/Device.java |   14 +-
 .../grpc/ip_link/IpLink.java                  |   14 +-
 .../grpc/monitoring/Monitoring.java           |  322 ++--
 .../generated-sources/grpc/ztp/Ztp.java       |   84 +-
 14 files changed, 2136 insertions(+), 1602 deletions(-)

diff --git a/src/policy/target/generated-sources/grpc/acl/Acl.java b/src/policy/target/generated-sources/grpc/acl/Acl.java
index 037bd3858..64d70d842 100644
--- a/src/policy/target/generated-sources/grpc/acl/Acl.java
+++ b/src/policy/target/generated-sources/grpc/acl/Acl.java
@@ -397,8 +397,8 @@ public final class Acl {
         }
     }
 
-    public interface AclMatchOrBuilder extends // @@protoc_insertion_point(interface_extends:acl.AclMatch)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:acl.AclMatch)
+    AclMatchOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>uint32 dscp = 1;</code>
@@ -476,8 +476,9 @@ public final class Acl {
     /**
      * Protobuf type {@code acl.AclMatch}
      */
-    public static final class AclMatch extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:acl.AclMatch)
-    AclMatchOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:acl.AclMatch)
+    AclMatch extends // @@protoc_insertion_point(message_implements:acl.AclMatch)
+    com.google.protobuf.GeneratedMessageV3 implements AclMatchOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -919,8 +920,9 @@ public final class Acl {
         /**
          * Protobuf type {@code acl.AclMatch}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:acl.AclMatch)
-        acl.Acl.AclMatchOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:acl.AclMatch)
+        Builder extends // @@protoc_insertion_point(builder_implements:acl.AclMatch)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements acl.Acl.AclMatchOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return acl.Acl.internal_static_acl_AclMatch_descriptor;
@@ -1655,8 +1657,8 @@ public final class Acl {
         }
     }
 
-    public interface AclActionOrBuilder extends // @@protoc_insertion_point(interface_extends:acl.AclAction)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:acl.AclAction)
+    AclActionOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.acl.AclForwardActionEnum forward_action = 1;</code>
@@ -1686,8 +1688,9 @@ public final class Acl {
     /**
      * Protobuf type {@code acl.AclAction}
      */
-    public static final class AclAction extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:acl.AclAction)
-    AclActionOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:acl.AclAction)
+    AclAction extends // @@protoc_insertion_point(message_implements:acl.AclAction)
+    com.google.protobuf.GeneratedMessageV3 implements AclActionOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -1912,8 +1915,9 @@ public final class Acl {
         /**
          * Protobuf type {@code acl.AclAction}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:acl.AclAction)
-        acl.Acl.AclActionOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:acl.AclAction)
+        Builder extends // @@protoc_insertion_point(builder_implements:acl.AclAction)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements acl.Acl.AclActionOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return acl.Acl.internal_static_acl_AclAction_descriptor;
@@ -2233,8 +2237,8 @@ public final class Acl {
         }
     }
 
-    public interface AclEntryOrBuilder extends // @@protoc_insertion_point(interface_extends:acl.AclEntry)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:acl.AclEntry)
+    AclEntryOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>uint32 sequence_id = 1;</code>
@@ -2292,8 +2296,9 @@ public final class Acl {
     /**
      * Protobuf type {@code acl.AclEntry}
      */
-    public static final class AclEntry extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:acl.AclEntry)
-    AclEntryOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:acl.AclEntry)
+    AclEntry extends // @@protoc_insertion_point(message_implements:acl.AclEntry)
+    com.google.protobuf.GeneratedMessageV3 implements AclEntryOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -2614,8 +2619,9 @@ public final class Acl {
         /**
          * Protobuf type {@code acl.AclEntry}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:acl.AclEntry)
-        acl.Acl.AclEntryOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:acl.AclEntry)
+        Builder extends // @@protoc_insertion_point(builder_implements:acl.AclEntry)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements acl.Acl.AclEntryOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return acl.Acl.internal_static_acl_AclEntry_descriptor;
@@ -3200,8 +3206,8 @@ public final class Acl {
         }
     }
 
-    public interface AclRuleSetOrBuilder extends // @@protoc_insertion_point(interface_extends:acl.AclRuleSet)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:acl.AclRuleSet)
+    AclRuleSetOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>string name = 1;</code>
@@ -3280,8 +3286,9 @@ public final class Acl {
     /**
      * Protobuf type {@code acl.AclRuleSet}
      */
-    public static final class AclRuleSet extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:acl.AclRuleSet)
-    AclRuleSetOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:acl.AclRuleSet)
+    AclRuleSet extends // @@protoc_insertion_point(message_implements:acl.AclRuleSet)
+    com.google.protobuf.GeneratedMessageV3 implements AclRuleSetOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -3677,8 +3684,9 @@ public final class Acl {
         /**
          * Protobuf type {@code acl.AclRuleSet}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:acl.AclRuleSet)
-        acl.Acl.AclRuleSetOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:acl.AclRuleSet)
+        Builder extends // @@protoc_insertion_point(builder_implements:acl.AclRuleSet)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements acl.Acl.AclRuleSetOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return acl.Acl.internal_static_acl_AclRuleSet_descriptor;
diff --git a/src/policy/target/generated-sources/grpc/context/ContextOuterClass.java b/src/policy/target/generated-sources/grpc/context/ContextOuterClass.java
index ceec864c6..e89bfb9fc 100644
--- a/src/policy/target/generated-sources/grpc/context/ContextOuterClass.java
+++ b/src/policy/target/generated-sources/grpc/context/ContextOuterClass.java
@@ -1652,8 +1652,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface EmptyOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Empty)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.Empty)
+    EmptyOrBuilder extends com.google.protobuf.MessageOrBuilder {
     }
 
     /**
@@ -1663,8 +1663,9 @@ public final class ContextOuterClass {
      *
      * Protobuf type {@code context.Empty}
      */
-    public static final class Empty extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Empty)
-    EmptyOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.Empty)
+    Empty extends // @@protoc_insertion_point(message_implements:context.Empty)
+    com.google.protobuf.GeneratedMessageV3 implements EmptyOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -1825,8 +1826,9 @@ public final class ContextOuterClass {
          *
          * Protobuf type {@code context.Empty}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Empty)
-        context.ContextOuterClass.EmptyOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.Empty)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.Empty)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.EmptyOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Empty_descriptor;
@@ -1990,8 +1992,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface UuidOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Uuid)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.Uuid)
+    UuidOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>string uuid = 1;</code>
@@ -2009,8 +2011,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Uuid}
      */
-    public static final class Uuid extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Uuid)
-    UuidOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.Uuid)
+    Uuid extends // @@protoc_insertion_point(message_implements:context.Uuid)
+    com.google.protobuf.GeneratedMessageV3 implements UuidOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -2216,8 +2219,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Uuid}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Uuid)
-        context.ContextOuterClass.UuidOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.Uuid)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.Uuid)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.UuidOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Uuid_descriptor;
@@ -2482,8 +2486,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface TimestampOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Timestamp)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.Timestamp)
+    TimestampOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>double timestamp = 1;</code>
@@ -2495,8 +2499,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Timestamp}
      */
-    public static final class Timestamp extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Timestamp)
-    TimestampOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.Timestamp)
+    Timestamp extends // @@protoc_insertion_point(message_implements:context.Timestamp)
+    com.google.protobuf.GeneratedMessageV3 implements TimestampOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -2676,8 +2681,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Timestamp}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Timestamp)
-        context.ContextOuterClass.TimestampOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.Timestamp)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.Timestamp)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.TimestampOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Timestamp_descriptor;
@@ -2899,8 +2905,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface EventOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Event)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.Event)
+    EventOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Timestamp timestamp = 1;</code>
@@ -2935,8 +2941,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Event}
      */
-    public static final class Event extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Event)
-    EventOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.Event)
+    Event extends // @@protoc_insertion_point(message_implements:context.Event)
+    com.google.protobuf.GeneratedMessageV3 implements EventOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -3173,8 +3180,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Event}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Event)
-        context.ContextOuterClass.EventOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.Event)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.Event)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.EventOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Event_descriptor;
@@ -3557,8 +3565,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface AnyEventOrBuilder extends // @@protoc_insertion_point(interface_extends:context.AnyEvent)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.AnyEvent)
+    AnyEventOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.ContextEvent context = 1;</code>
@@ -3685,8 +3693,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.AnyEvent}
      */
-    public static final class AnyEvent extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.AnyEvent)
-    AnyEventOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.AnyEvent)
+    AnyEvent extends // @@protoc_insertion_point(message_implements:context.AnyEvent)
+    com.google.protobuf.GeneratedMessageV3 implements AnyEventOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -4253,8 +4262,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.AnyEvent}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.AnyEvent)
-        context.ContextOuterClass.AnyEventOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.AnyEvent)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.AnyEvent)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.AnyEventOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_AnyEvent_descriptor;
@@ -5570,8 +5580,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface ContextIdOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ContextId)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.ContextId)
+    ContextIdOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Uuid context_uuid = 1;</code>
@@ -5598,8 +5608,9 @@ public final class ContextOuterClass {
      *
      * Protobuf type {@code context.ContextId}
      */
-    public static final class ContextId extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ContextId)
-    ContextIdOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.ContextId)
+    ContextId extends // @@protoc_insertion_point(message_implements:context.ContextId)
+    com.google.protobuf.GeneratedMessageV3 implements ContextIdOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -5806,8 +5817,9 @@ public final class ContextOuterClass {
          *
          * Protobuf type {@code context.ContextId}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ContextId)
-        context.ContextOuterClass.ContextIdOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.ContextId)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.ContextId)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ContextIdOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ContextId_descriptor;
@@ -6117,8 +6129,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface ContextOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Context)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.Context)
+    ContextOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.ContextId context_id = 1;</code>
@@ -6245,8 +6257,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Context}
      */
-    public static final class Context extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Context)
-    ContextOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.Context)
+    Context extends // @@protoc_insertion_point(message_implements:context.Context)
+    com.google.protobuf.GeneratedMessageV3 implements ContextOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -6718,8 +6731,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Context}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Context)
-        context.ContextOuterClass.ContextOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.Context)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.Context)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ContextOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Context_descriptor;
@@ -8127,8 +8141,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface ContextIdListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ContextIdList)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.ContextIdList)
+    ContextIdListOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.ContextId context_ids = 1;</code>
@@ -8159,8 +8173,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ContextIdList}
      */
-    public static final class ContextIdList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ContextIdList)
-    ContextIdListOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.ContextIdList)
+    ContextIdList extends // @@protoc_insertion_point(message_implements:context.ContextIdList)
+    com.google.protobuf.GeneratedMessageV3 implements ContextIdListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -8375,8 +8390,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ContextIdList}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ContextIdList)
-        context.ContextOuterClass.ContextIdListOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.ContextIdList)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.ContextIdList)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ContextIdListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ContextIdList_descriptor;
@@ -8843,8 +8859,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface ContextListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ContextList)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.ContextList)
+    ContextListOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.Context contexts = 1;</code>
@@ -8875,8 +8891,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ContextList}
      */
-    public static final class ContextList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ContextList)
-    ContextListOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.ContextList)
+    ContextList extends // @@protoc_insertion_point(message_implements:context.ContextList)
+    com.google.protobuf.GeneratedMessageV3 implements ContextListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -9091,8 +9108,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ContextList}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ContextList)
-        context.ContextOuterClass.ContextListOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.ContextList)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.ContextList)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ContextListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ContextList_descriptor;
@@ -9559,8 +9577,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface ContextEventOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ContextEvent)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.ContextEvent)
+    ContextEventOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Event event = 1;</code>
@@ -9600,8 +9618,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ContextEvent}
      */
-    public static final class ContextEvent extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ContextEvent)
-    ContextEventOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.ContextEvent)
+    ContextEvent extends // @@protoc_insertion_point(message_implements:context.ContextEvent)
+    com.google.protobuf.GeneratedMessageV3 implements ContextEventOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -9850,8 +9869,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ContextEvent}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ContextEvent)
-        context.ContextOuterClass.ContextEventOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.ContextEvent)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.ContextEvent)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ContextEventOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ContextEvent_descriptor;
@@ -10297,8 +10317,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface TopologyIdOrBuilder extends // @@protoc_insertion_point(interface_extends:context.TopologyId)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.TopologyId)
+    TopologyIdOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.ContextId context_id = 1;</code>
@@ -10342,8 +10362,9 @@ public final class ContextOuterClass {
      *
      * Protobuf type {@code context.TopologyId}
      */
-    public static final class TopologyId extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.TopologyId)
-    TopologyIdOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.TopologyId)
+    TopologyId extends // @@protoc_insertion_point(message_implements:context.TopologyId)
+    com.google.protobuf.GeneratedMessageV3 implements TopologyIdOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -10596,8 +10617,9 @@ public final class ContextOuterClass {
          *
          * Protobuf type {@code context.TopologyId}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.TopologyId)
-        context.ContextOuterClass.TopologyIdOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.TopologyId)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.TopologyId)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.TopologyIdOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_TopologyId_descriptor;
@@ -11043,8 +11065,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface TopologyOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Topology)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.Topology)
+    TopologyOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.TopologyId topology_id = 1;</code>
@@ -11154,8 +11176,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Topology}
      */
-    public static final class Topology extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Topology)
-    TopologyOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.Topology)
+    Topology extends // @@protoc_insertion_point(message_implements:context.Topology)
+    com.google.protobuf.GeneratedMessageV3 implements TopologyOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -11581,8 +11604,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Topology}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Topology)
-        context.ContextOuterClass.TopologyOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.Topology)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.Topology)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.TopologyOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Topology_descriptor;
@@ -12854,8 +12878,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface TopologyDetailsOrBuilder extends // @@protoc_insertion_point(interface_extends:context.TopologyDetails)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.TopologyDetails)
+    TopologyDetailsOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.TopologyId topology_id = 1;</code>
@@ -12965,8 +12989,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.TopologyDetails}
      */
-    public static final class TopologyDetails extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.TopologyDetails)
-    TopologyDetailsOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.TopologyDetails)
+    TopologyDetails extends // @@protoc_insertion_point(message_implements:context.TopologyDetails)
+    com.google.protobuf.GeneratedMessageV3 implements TopologyDetailsOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -13392,8 +13417,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.TopologyDetails}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.TopologyDetails)
-        context.ContextOuterClass.TopologyDetailsOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.TopologyDetails)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.TopologyDetails)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.TopologyDetailsOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_TopologyDetails_descriptor;
@@ -14665,8 +14691,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface TopologyIdListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.TopologyIdList)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.TopologyIdList)
+    TopologyIdListOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.TopologyId topology_ids = 1;</code>
@@ -14697,8 +14723,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.TopologyIdList}
      */
-    public static final class TopologyIdList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.TopologyIdList)
-    TopologyIdListOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.TopologyIdList)
+    TopologyIdList extends // @@protoc_insertion_point(message_implements:context.TopologyIdList)
+    com.google.protobuf.GeneratedMessageV3 implements TopologyIdListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -14913,8 +14940,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.TopologyIdList}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.TopologyIdList)
-        context.ContextOuterClass.TopologyIdListOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.TopologyIdList)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.TopologyIdList)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.TopologyIdListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_TopologyIdList_descriptor;
@@ -15381,8 +15409,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface TopologyListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.TopologyList)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.TopologyList)
+    TopologyListOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.Topology topologies = 1;</code>
@@ -15413,8 +15441,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.TopologyList}
      */
-    public static final class TopologyList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.TopologyList)
-    TopologyListOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.TopologyList)
+    TopologyList extends // @@protoc_insertion_point(message_implements:context.TopologyList)
+    com.google.protobuf.GeneratedMessageV3 implements TopologyListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -15629,8 +15658,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.TopologyList}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.TopologyList)
-        context.ContextOuterClass.TopologyListOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.TopologyList)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.TopologyList)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.TopologyListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_TopologyList_descriptor;
@@ -16097,8 +16127,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface TopologyEventOrBuilder extends // @@protoc_insertion_point(interface_extends:context.TopologyEvent)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.TopologyEvent)
+    TopologyEventOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Event event = 1;</code>
@@ -16138,8 +16168,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.TopologyEvent}
      */
-    public static final class TopologyEvent extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.TopologyEvent)
-    TopologyEventOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.TopologyEvent)
+    TopologyEvent extends // @@protoc_insertion_point(message_implements:context.TopologyEvent)
+    com.google.protobuf.GeneratedMessageV3 implements TopologyEventOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -16388,8 +16419,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.TopologyEvent}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.TopologyEvent)
-        context.ContextOuterClass.TopologyEventOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.TopologyEvent)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.TopologyEvent)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.TopologyEventOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_TopologyEvent_descriptor;
@@ -16835,8 +16867,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface DeviceIdOrBuilder extends // @@protoc_insertion_point(interface_extends:context.DeviceId)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.DeviceId)
+    DeviceIdOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Uuid device_uuid = 1;</code>
@@ -16863,8 +16895,9 @@ public final class ContextOuterClass {
      *
      * Protobuf type {@code context.DeviceId}
      */
-    public static final class DeviceId extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.DeviceId)
-    DeviceIdOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.DeviceId)
+    DeviceId extends // @@protoc_insertion_point(message_implements:context.DeviceId)
+    com.google.protobuf.GeneratedMessageV3 implements DeviceIdOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -17071,8 +17104,9 @@ public final class ContextOuterClass {
          *
          * Protobuf type {@code context.DeviceId}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.DeviceId)
-        context.ContextOuterClass.DeviceIdOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.DeviceId)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.DeviceId)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.DeviceIdOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_DeviceId_descriptor;
@@ -17382,8 +17416,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface DeviceOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Device)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.Device)
+    DeviceOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.DeviceId device_id = 1;</code>
@@ -17590,8 +17624,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Device}
      */
-    public static final class Device extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Device)
-    DeviceOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.Device)
+    Device extends // @@protoc_insertion_point(message_implements:context.Device)
+    com.google.protobuf.GeneratedMessageV3 implements DeviceOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -18255,8 +18290,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Device}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Device)
-        context.ContextOuterClass.DeviceOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.Device)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.Device)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.DeviceOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Device_descriptor;
@@ -19967,8 +20003,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface ComponentOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Component)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.Component)
+    ComponentOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Uuid component_uuid = 1;</code>
@@ -20084,8 +20120,9 @@ public final class ContextOuterClass {
      *
      * Protobuf type {@code context.Component}
      */
-    public static final class Component extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Component)
-    ComponentOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.Component)
+    Component extends // @@protoc_insertion_point(message_implements:context.Component)
+    com.google.protobuf.GeneratedMessageV3 implements ComponentOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -20555,8 +20592,9 @@ public final class ContextOuterClass {
          *
          * Protobuf type {@code context.Component}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Component)
-        context.ContextOuterClass.ComponentOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.Component)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.Component)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ComponentOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Component_descriptor;
@@ -21334,8 +21372,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface DeviceConfigOrBuilder extends // @@protoc_insertion_point(interface_extends:context.DeviceConfig)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.DeviceConfig)
+    DeviceConfigOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.ConfigRule config_rules = 1;</code>
@@ -21366,8 +21404,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.DeviceConfig}
      */
-    public static final class DeviceConfig extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.DeviceConfig)
-    DeviceConfigOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.DeviceConfig)
+    DeviceConfig extends // @@protoc_insertion_point(message_implements:context.DeviceConfig)
+    com.google.protobuf.GeneratedMessageV3 implements DeviceConfigOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -21582,8 +21621,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.DeviceConfig}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.DeviceConfig)
-        context.ContextOuterClass.DeviceConfigOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.DeviceConfig)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.DeviceConfig)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.DeviceConfigOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_DeviceConfig_descriptor;
@@ -22050,8 +22090,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface DeviceIdListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.DeviceIdList)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.DeviceIdList)
+    DeviceIdListOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.DeviceId device_ids = 1;</code>
@@ -22082,8 +22122,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.DeviceIdList}
      */
-    public static final class DeviceIdList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.DeviceIdList)
-    DeviceIdListOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.DeviceIdList)
+    DeviceIdList extends // @@protoc_insertion_point(message_implements:context.DeviceIdList)
+    com.google.protobuf.GeneratedMessageV3 implements DeviceIdListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -22298,8 +22339,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.DeviceIdList}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.DeviceIdList)
-        context.ContextOuterClass.DeviceIdListOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.DeviceIdList)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.DeviceIdList)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.DeviceIdListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_DeviceIdList_descriptor;
@@ -22766,8 +22808,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface DeviceListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.DeviceList)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.DeviceList)
+    DeviceListOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.Device devices = 1;</code>
@@ -22798,8 +22840,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.DeviceList}
      */
-    public static final class DeviceList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.DeviceList)
-    DeviceListOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.DeviceList)
+    DeviceList extends // @@protoc_insertion_point(message_implements:context.DeviceList)
+    com.google.protobuf.GeneratedMessageV3 implements DeviceListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -23014,8 +23057,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.DeviceList}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.DeviceList)
-        context.ContextOuterClass.DeviceListOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.DeviceList)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.DeviceList)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.DeviceListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_DeviceList_descriptor;
@@ -23482,8 +23526,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface DeviceFilterOrBuilder extends // @@protoc_insertion_point(interface_extends:context.DeviceFilter)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.DeviceFilter)
+    DeviceFilterOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.DeviceIdList device_ids = 1;</code>
@@ -23524,8 +23568,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.DeviceFilter}
      */
-    public static final class DeviceFilter extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.DeviceFilter)
-    DeviceFilterOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.DeviceFilter)
+    DeviceFilter extends // @@protoc_insertion_point(message_implements:context.DeviceFilter)
+    com.google.protobuf.GeneratedMessageV3 implements DeviceFilterOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -23797,8 +23842,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.DeviceFilter}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.DeviceFilter)
-        context.ContextOuterClass.DeviceFilterOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.DeviceFilter)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.DeviceFilter)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.DeviceFilterOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_DeviceFilter_descriptor;
@@ -24252,8 +24298,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface DeviceEventOrBuilder extends // @@protoc_insertion_point(interface_extends:context.DeviceEvent)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.DeviceEvent)
+    DeviceEventOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Event event = 1;</code>
@@ -24310,8 +24356,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.DeviceEvent}
      */
-    public static final class DeviceEvent extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.DeviceEvent)
-    DeviceEventOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.DeviceEvent)
+    DeviceEvent extends // @@protoc_insertion_point(message_implements:context.DeviceEvent)
+    com.google.protobuf.GeneratedMessageV3 implements DeviceEventOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -24606,8 +24653,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.DeviceEvent}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.DeviceEvent)
-        context.ContextOuterClass.DeviceEventOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.DeviceEvent)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.DeviceEvent)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.DeviceEventOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_DeviceEvent_descriptor;
@@ -25189,8 +25237,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface LinkIdOrBuilder extends // @@protoc_insertion_point(interface_extends:context.LinkId)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.LinkId)
+    LinkIdOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Uuid link_uuid = 1;</code>
@@ -25217,8 +25265,9 @@ public final class ContextOuterClass {
      *
      * Protobuf type {@code context.LinkId}
      */
-    public static final class LinkId extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.LinkId)
-    LinkIdOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.LinkId)
+    LinkId extends // @@protoc_insertion_point(message_implements:context.LinkId)
+    com.google.protobuf.GeneratedMessageV3 implements LinkIdOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -25425,8 +25474,9 @@ public final class ContextOuterClass {
          *
          * Protobuf type {@code context.LinkId}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.LinkId)
-        context.ContextOuterClass.LinkIdOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.LinkId)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.LinkId)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.LinkIdOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_LinkId_descriptor;
@@ -25736,8 +25786,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface LinkAttributesOrBuilder extends // @@protoc_insertion_point(interface_extends:context.LinkAttributes)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.LinkAttributes)
+    LinkAttributesOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>bool is_bidirectional = 1;</code>
@@ -25761,8 +25811,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.LinkAttributes}
      */
-    public static final class LinkAttributes extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.LinkAttributes)
-    LinkAttributesOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.LinkAttributes)
+    LinkAttributes extends // @@protoc_insertion_point(message_implements:context.LinkAttributes)
+    com.google.protobuf.GeneratedMessageV3 implements LinkAttributesOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -25988,8 +26039,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.LinkAttributes}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.LinkAttributes)
-        context.ContextOuterClass.LinkAttributesOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.LinkAttributes)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.LinkAttributes)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.LinkAttributesOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_LinkAttributes_descriptor;
@@ -26307,8 +26359,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface LinkOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Link)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.Link)
+    LinkOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.LinkId link_id = 1;</code>
@@ -26397,8 +26449,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Link}
      */
-    public static final class Link extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Link)
-    LinkOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.Link)
+    Link extends // @@protoc_insertion_point(message_implements:context.Link)
+    com.google.protobuf.GeneratedMessageV3 implements LinkOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -26788,8 +26841,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Link}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Link)
-        context.ContextOuterClass.LinkOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.Link)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.Link)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.LinkOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Link_descriptor;
@@ -27692,8 +27746,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface LinkIdListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.LinkIdList)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.LinkIdList)
+    LinkIdListOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.LinkId link_ids = 1;</code>
@@ -27724,8 +27778,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.LinkIdList}
      */
-    public static final class LinkIdList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.LinkIdList)
-    LinkIdListOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.LinkIdList)
+    LinkIdList extends // @@protoc_insertion_point(message_implements:context.LinkIdList)
+    com.google.protobuf.GeneratedMessageV3 implements LinkIdListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -27940,8 +27995,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.LinkIdList}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.LinkIdList)
-        context.ContextOuterClass.LinkIdListOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.LinkIdList)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.LinkIdList)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.LinkIdListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_LinkIdList_descriptor;
@@ -28408,8 +28464,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface LinkListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.LinkList)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.LinkList)
+    LinkListOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.Link links = 1;</code>
@@ -28440,8 +28496,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.LinkList}
      */
-    public static final class LinkList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.LinkList)
-    LinkListOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.LinkList)
+    LinkList extends // @@protoc_insertion_point(message_implements:context.LinkList)
+    com.google.protobuf.GeneratedMessageV3 implements LinkListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -28656,8 +28713,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.LinkList}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.LinkList)
-        context.ContextOuterClass.LinkListOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.LinkList)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.LinkList)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.LinkListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_LinkList_descriptor;
@@ -29124,8 +29182,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface LinkEventOrBuilder extends // @@protoc_insertion_point(interface_extends:context.LinkEvent)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.LinkEvent)
+    LinkEventOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Event event = 1;</code>
@@ -29165,8 +29223,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.LinkEvent}
      */
-    public static final class LinkEvent extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.LinkEvent)
-    LinkEventOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.LinkEvent)
+    LinkEvent extends // @@protoc_insertion_point(message_implements:context.LinkEvent)
+    com.google.protobuf.GeneratedMessageV3 implements LinkEventOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -29415,8 +29474,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.LinkEvent}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.LinkEvent)
-        context.ContextOuterClass.LinkEventOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.LinkEvent)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.LinkEvent)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.LinkEventOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_LinkEvent_descriptor;
@@ -29862,8 +29922,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface ServiceIdOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ServiceId)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.ServiceId)
+    ServiceIdOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.ContextId context_id = 1;</code>
@@ -29907,8 +29967,9 @@ public final class ContextOuterClass {
      *
      * Protobuf type {@code context.ServiceId}
      */
-    public static final class ServiceId extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ServiceId)
-    ServiceIdOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.ServiceId)
+    ServiceId extends // @@protoc_insertion_point(message_implements:context.ServiceId)
+    com.google.protobuf.GeneratedMessageV3 implements ServiceIdOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -30161,8 +30222,9 @@ public final class ContextOuterClass {
          *
          * Protobuf type {@code context.ServiceId}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ServiceId)
-        context.ContextOuterClass.ServiceIdOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.ServiceId)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.ServiceId)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ServiceIdOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ServiceId_descriptor;
@@ -30608,8 +30670,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface ServiceOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Service)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.Service)
+    ServiceOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.ServiceId service_id = 1;</code>
@@ -30757,8 +30819,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Service}
      */
-    public static final class Service extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Service)
-    ServiceOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.Service)
+    Service extends // @@protoc_insertion_point(message_implements:context.Service)
+    com.google.protobuf.GeneratedMessageV3 implements ServiceOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -31298,8 +31361,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Service}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Service)
-        context.ContextOuterClass.ServiceOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.Service)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.Service)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ServiceOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Service_descriptor;
@@ -32763,8 +32827,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface ServiceStatusOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ServiceStatus)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.ServiceStatus)
+    ServiceStatusOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.ServiceStatusEnum service_status = 1;</code>
@@ -32782,8 +32846,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ServiceStatus}
      */
-    public static final class ServiceStatus extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ServiceStatus)
-    ServiceStatusOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.ServiceStatus)
+    ServiceStatus extends // @@protoc_insertion_point(message_implements:context.ServiceStatus)
+    com.google.protobuf.GeneratedMessageV3 implements ServiceStatusOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -32974,8 +33039,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ServiceStatus}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ServiceStatus)
-        context.ContextOuterClass.ServiceStatusOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.ServiceStatus)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.ServiceStatus)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ServiceStatusOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ServiceStatus_descriptor;
@@ -33222,8 +33288,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface ServiceConfigOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ServiceConfig)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.ServiceConfig)
+    ServiceConfigOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.ConfigRule config_rules = 1;</code>
@@ -33254,8 +33320,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ServiceConfig}
      */
-    public static final class ServiceConfig extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ServiceConfig)
-    ServiceConfigOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.ServiceConfig)
+    ServiceConfig extends // @@protoc_insertion_point(message_implements:context.ServiceConfig)
+    com.google.protobuf.GeneratedMessageV3 implements ServiceConfigOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -33470,8 +33537,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ServiceConfig}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ServiceConfig)
-        context.ContextOuterClass.ServiceConfigOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.ServiceConfig)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.ServiceConfig)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ServiceConfigOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ServiceConfig_descriptor;
@@ -33938,8 +34006,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface ServiceIdListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ServiceIdList)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.ServiceIdList)
+    ServiceIdListOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.ServiceId service_ids = 1;</code>
@@ -33970,8 +34038,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ServiceIdList}
      */
-    public static final class ServiceIdList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ServiceIdList)
-    ServiceIdListOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.ServiceIdList)
+    ServiceIdList extends // @@protoc_insertion_point(message_implements:context.ServiceIdList)
+    com.google.protobuf.GeneratedMessageV3 implements ServiceIdListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -34186,8 +34255,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ServiceIdList}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ServiceIdList)
-        context.ContextOuterClass.ServiceIdListOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.ServiceIdList)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.ServiceIdList)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ServiceIdListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ServiceIdList_descriptor;
@@ -34654,8 +34724,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface ServiceListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ServiceList)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.ServiceList)
+    ServiceListOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.Service services = 1;</code>
@@ -34686,8 +34756,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ServiceList}
      */
-    public static final class ServiceList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ServiceList)
-    ServiceListOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.ServiceList)
+    ServiceList extends // @@protoc_insertion_point(message_implements:context.ServiceList)
+    com.google.protobuf.GeneratedMessageV3 implements ServiceListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -34902,8 +34973,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ServiceList}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ServiceList)
-        context.ContextOuterClass.ServiceListOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.ServiceList)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.ServiceList)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ServiceListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ServiceList_descriptor;
@@ -35370,8 +35442,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface ServiceFilterOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ServiceFilter)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.ServiceFilter)
+    ServiceFilterOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.ServiceIdList service_ids = 1;</code>
@@ -35412,8 +35484,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ServiceFilter}
      */
-    public static final class ServiceFilter extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ServiceFilter)
-    ServiceFilterOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.ServiceFilter)
+    ServiceFilter extends // @@protoc_insertion_point(message_implements:context.ServiceFilter)
+    com.google.protobuf.GeneratedMessageV3 implements ServiceFilterOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -35685,8 +35758,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ServiceFilter}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ServiceFilter)
-        context.ContextOuterClass.ServiceFilterOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.ServiceFilter)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.ServiceFilter)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ServiceFilterOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ServiceFilter_descriptor;
@@ -36140,8 +36214,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface ServiceEventOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ServiceEvent)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.ServiceEvent)
+    ServiceEventOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Event event = 1;</code>
@@ -36181,8 +36255,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ServiceEvent}
      */
-    public static final class ServiceEvent extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ServiceEvent)
-    ServiceEventOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.ServiceEvent)
+    ServiceEvent extends // @@protoc_insertion_point(message_implements:context.ServiceEvent)
+    com.google.protobuf.GeneratedMessageV3 implements ServiceEventOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -36431,8 +36506,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ServiceEvent}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ServiceEvent)
-        context.ContextOuterClass.ServiceEventOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.ServiceEvent)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.ServiceEvent)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ServiceEventOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ServiceEvent_descriptor;
@@ -36878,8 +36954,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface SliceIdOrBuilder extends // @@protoc_insertion_point(interface_extends:context.SliceId)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.SliceId)
+    SliceIdOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.ContextId context_id = 1;</code>
@@ -36923,8 +36999,9 @@ public final class ContextOuterClass {
      *
      * Protobuf type {@code context.SliceId}
      */
-    public static final class SliceId extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.SliceId)
-    SliceIdOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.SliceId)
+    SliceId extends // @@protoc_insertion_point(message_implements:context.SliceId)
+    com.google.protobuf.GeneratedMessageV3 implements SliceIdOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -37177,8 +37254,9 @@ public final class ContextOuterClass {
          *
          * Protobuf type {@code context.SliceId}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.SliceId)
-        context.ContextOuterClass.SliceIdOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.SliceId)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.SliceId)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.SliceIdOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_SliceId_descriptor;
@@ -37624,8 +37702,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface SliceOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Slice)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.Slice)
+    SliceOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.SliceId slice_id = 1;</code>
@@ -37828,8 +37906,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Slice}
      */
-    public static final class Slice extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Slice)
-    SliceOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.Slice)
+    Slice extends // @@protoc_insertion_point(message_implements:context.Slice)
+    com.google.protobuf.GeneratedMessageV3 implements SliceOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -38497,8 +38576,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Slice}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Slice)
-        context.ContextOuterClass.SliceOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.Slice)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.Slice)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.SliceOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Slice_descriptor;
@@ -40603,8 +40683,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface SliceOwnerOrBuilder extends // @@protoc_insertion_point(interface_extends:context.SliceOwner)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.SliceOwner)
+    SliceOwnerOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Uuid owner_uuid = 1;</code>
@@ -40639,8 +40719,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.SliceOwner}
      */
-    public static final class SliceOwner extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.SliceOwner)
-    SliceOwnerOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.SliceOwner)
+    SliceOwner extends // @@protoc_insertion_point(message_implements:context.SliceOwner)
+    com.google.protobuf.GeneratedMessageV3 implements SliceOwnerOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -40892,8 +40973,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.SliceOwner}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.SliceOwner)
-        context.ContextOuterClass.SliceOwnerOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.SliceOwner)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.SliceOwner)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.SliceOwnerOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_SliceOwner_descriptor;
@@ -41294,8 +41376,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface SliceStatusOrBuilder extends // @@protoc_insertion_point(interface_extends:context.SliceStatus)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.SliceStatus)
+    SliceStatusOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.SliceStatusEnum slice_status = 1;</code>
@@ -41313,8 +41395,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.SliceStatus}
      */
-    public static final class SliceStatus extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.SliceStatus)
-    SliceStatusOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.SliceStatus)
+    SliceStatus extends // @@protoc_insertion_point(message_implements:context.SliceStatus)
+    com.google.protobuf.GeneratedMessageV3 implements SliceStatusOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -41505,8 +41588,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.SliceStatus}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.SliceStatus)
-        context.ContextOuterClass.SliceStatusOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.SliceStatus)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.SliceStatus)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.SliceStatusOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_SliceStatus_descriptor;
@@ -41753,8 +41837,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface SliceConfigOrBuilder extends // @@protoc_insertion_point(interface_extends:context.SliceConfig)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.SliceConfig)
+    SliceConfigOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.ConfigRule config_rules = 1;</code>
@@ -41785,8 +41869,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.SliceConfig}
      */
-    public static final class SliceConfig extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.SliceConfig)
-    SliceConfigOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.SliceConfig)
+    SliceConfig extends // @@protoc_insertion_point(message_implements:context.SliceConfig)
+    com.google.protobuf.GeneratedMessageV3 implements SliceConfigOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -42001,8 +42086,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.SliceConfig}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.SliceConfig)
-        context.ContextOuterClass.SliceConfigOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.SliceConfig)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.SliceConfig)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.SliceConfigOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_SliceConfig_descriptor;
@@ -42469,8 +42555,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface SliceIdListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.SliceIdList)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.SliceIdList)
+    SliceIdListOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.SliceId slice_ids = 1;</code>
@@ -42501,8 +42587,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.SliceIdList}
      */
-    public static final class SliceIdList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.SliceIdList)
-    SliceIdListOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.SliceIdList)
+    SliceIdList extends // @@protoc_insertion_point(message_implements:context.SliceIdList)
+    com.google.protobuf.GeneratedMessageV3 implements SliceIdListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -42717,8 +42804,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.SliceIdList}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.SliceIdList)
-        context.ContextOuterClass.SliceIdListOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.SliceIdList)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.SliceIdList)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.SliceIdListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_SliceIdList_descriptor;
@@ -43185,8 +43273,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface SliceListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.SliceList)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.SliceList)
+    SliceListOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.Slice slices = 1;</code>
@@ -43217,8 +43305,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.SliceList}
      */
-    public static final class SliceList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.SliceList)
-    SliceListOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.SliceList)
+    SliceList extends // @@protoc_insertion_point(message_implements:context.SliceList)
+    com.google.protobuf.GeneratedMessageV3 implements SliceListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -43433,8 +43522,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.SliceList}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.SliceList)
-        context.ContextOuterClass.SliceListOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.SliceList)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.SliceList)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.SliceListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_SliceList_descriptor;
@@ -43901,8 +43991,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface SliceFilterOrBuilder extends // @@protoc_insertion_point(interface_extends:context.SliceFilter)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.SliceFilter)
+    SliceFilterOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.SliceIdList slice_ids = 1;</code>
@@ -43955,8 +44045,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.SliceFilter}
      */
-    public static final class SliceFilter extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.SliceFilter)
-    SliceFilterOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.SliceFilter)
+    SliceFilter extends // @@protoc_insertion_point(message_implements:context.SliceFilter)
+    com.google.protobuf.GeneratedMessageV3 implements SliceFilterOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -44274,8 +44365,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.SliceFilter}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.SliceFilter)
-        context.ContextOuterClass.SliceFilterOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.SliceFilter)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.SliceFilter)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.SliceFilterOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_SliceFilter_descriptor;
@@ -44825,8 +44917,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface SliceEventOrBuilder extends // @@protoc_insertion_point(interface_extends:context.SliceEvent)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.SliceEvent)
+    SliceEventOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Event event = 1;</code>
@@ -44866,8 +44958,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.SliceEvent}
      */
-    public static final class SliceEvent extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.SliceEvent)
-    SliceEventOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.SliceEvent)
+    SliceEvent extends // @@protoc_insertion_point(message_implements:context.SliceEvent)
+    com.google.protobuf.GeneratedMessageV3 implements SliceEventOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -45116,8 +45209,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.SliceEvent}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.SliceEvent)
-        context.ContextOuterClass.SliceEventOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.SliceEvent)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.SliceEvent)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.SliceEventOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_SliceEvent_descriptor;
@@ -45563,8 +45657,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface ConnectionIdOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ConnectionId)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.ConnectionId)
+    ConnectionIdOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Uuid connection_uuid = 1;</code>
@@ -45591,8 +45685,9 @@ public final class ContextOuterClass {
      *
      * Protobuf type {@code context.ConnectionId}
      */
-    public static final class ConnectionId extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ConnectionId)
-    ConnectionIdOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.ConnectionId)
+    ConnectionId extends // @@protoc_insertion_point(message_implements:context.ConnectionId)
+    com.google.protobuf.GeneratedMessageV3 implements ConnectionIdOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -45799,8 +45894,9 @@ public final class ContextOuterClass {
          *
          * Protobuf type {@code context.ConnectionId}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ConnectionId)
-        context.ContextOuterClass.ConnectionIdOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.ConnectionId)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.ConnectionId)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ConnectionIdOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ConnectionId_descriptor;
@@ -46110,8 +46206,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface ConnectionSettings_L0OrBuilder extends // @@protoc_insertion_point(interface_extends:context.ConnectionSettings_L0)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.ConnectionSettings_L0)
+    ConnectionSettings_L0OrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>string lsp_symbolic_name = 1;</code>
@@ -46129,8 +46225,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ConnectionSettings_L0}
      */
-    public static final class ConnectionSettings_L0 extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ConnectionSettings_L0)
-    ConnectionSettings_L0OrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.ConnectionSettings_L0)
+    ConnectionSettings_L0 extends // @@protoc_insertion_point(message_implements:context.ConnectionSettings_L0)
+    com.google.protobuf.GeneratedMessageV3 implements ConnectionSettings_L0OrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -46336,8 +46433,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ConnectionSettings_L0}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ConnectionSettings_L0)
-        context.ContextOuterClass.ConnectionSettings_L0OrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.ConnectionSettings_L0)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.ConnectionSettings_L0)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ConnectionSettings_L0OrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ConnectionSettings_L0_descriptor;
@@ -46602,8 +46700,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface ConnectionSettings_L2OrBuilder extends // @@protoc_insertion_point(interface_extends:context.ConnectionSettings_L2)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.ConnectionSettings_L2)
+    ConnectionSettings_L2OrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>string src_mac_address = 1;</code>
@@ -46657,8 +46755,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ConnectionSettings_L2}
      */
-    public static final class ConnectionSettings_L2 extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ConnectionSettings_L2)
-    ConnectionSettings_L2OrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.ConnectionSettings_L2)
+    ConnectionSettings_L2 extends // @@protoc_insertion_point(message_implements:context.ConnectionSettings_L2)
+    com.google.protobuf.GeneratedMessageV3 implements ConnectionSettings_L2OrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -47005,8 +47104,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ConnectionSettings_L2}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ConnectionSettings_L2)
-        context.ContextOuterClass.ConnectionSettings_L2OrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.ConnectionSettings_L2)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.ConnectionSettings_L2)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ConnectionSettings_L2OrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ConnectionSettings_L2_descriptor;
@@ -47554,8 +47654,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface ConnectionSettings_L3OrBuilder extends // @@protoc_insertion_point(interface_extends:context.ConnectionSettings_L3)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.ConnectionSettings_L3)
+    ConnectionSettings_L3OrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>string src_ip_address = 1;</code>
@@ -47603,8 +47703,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ConnectionSettings_L3}
      */
-    public static final class ConnectionSettings_L3 extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ConnectionSettings_L3)
-    ConnectionSettings_L3OrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.ConnectionSettings_L3)
+    ConnectionSettings_L3 extends // @@protoc_insertion_point(message_implements:context.ConnectionSettings_L3)
+    com.google.protobuf.GeneratedMessageV3 implements ConnectionSettings_L3OrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -47928,8 +48029,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ConnectionSettings_L3}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ConnectionSettings_L3)
-        context.ContextOuterClass.ConnectionSettings_L3OrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.ConnectionSettings_L3)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.ConnectionSettings_L3)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ConnectionSettings_L3OrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ConnectionSettings_L3_descriptor;
@@ -48429,8 +48531,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface ConnectionSettings_L4OrBuilder extends // @@protoc_insertion_point(interface_extends:context.ConnectionSettings_L4)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.ConnectionSettings_L4)
+    ConnectionSettings_L4OrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>uint32 src_port = 1;</code>
@@ -48460,8 +48562,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ConnectionSettings_L4}
      */
-    public static final class ConnectionSettings_L4 extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ConnectionSettings_L4)
-    ConnectionSettings_L4OrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.ConnectionSettings_L4)
+    ConnectionSettings_L4 extends // @@protoc_insertion_point(message_implements:context.ConnectionSettings_L4)
+    com.google.protobuf.GeneratedMessageV3 implements ConnectionSettings_L4OrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -48710,8 +48813,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ConnectionSettings_L4}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ConnectionSettings_L4)
-        context.ContextOuterClass.ConnectionSettings_L4OrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.ConnectionSettings_L4)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.ConnectionSettings_L4)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ConnectionSettings_L4OrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ConnectionSettings_L4_descriptor;
@@ -49077,8 +49181,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface ConnectionSettingsOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ConnectionSettings)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.ConnectionSettings)
+    ConnectionSettingsOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.ConnectionSettings_L0 l0 = 1;</code>
@@ -49152,8 +49256,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ConnectionSettings}
      */
-    public static final class ConnectionSettings extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ConnectionSettings)
-    ConnectionSettingsOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.ConnectionSettings)
+    ConnectionSettings extends // @@protoc_insertion_point(message_implements:context.ConnectionSettings)
+    com.google.protobuf.GeneratedMessageV3 implements ConnectionSettingsOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -49494,8 +49599,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ConnectionSettings}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ConnectionSettings)
-        context.ContextOuterClass.ConnectionSettingsOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.ConnectionSettings)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.ConnectionSettings)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ConnectionSettingsOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ConnectionSettings_descriptor;
@@ -50213,8 +50319,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface ConnectionOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Connection)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.Connection)
+    ConnectionOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.ConnectionId connection_id = 1;</code>
@@ -50321,8 +50427,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Connection}
      */
-    public static final class Connection extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Connection)
-    ConnectionOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.Connection)
+    Connection extends // @@protoc_insertion_point(message_implements:context.Connection)
+    com.google.protobuf.GeneratedMessageV3 implements ConnectionOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -50733,8 +50840,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Connection}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Connection)
-        context.ContextOuterClass.ConnectionOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.Connection)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.Connection)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ConnectionOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Connection_descriptor;
@@ -51898,8 +52006,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface ConnectionIdListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ConnectionIdList)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.ConnectionIdList)
+    ConnectionIdListOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.ConnectionId connection_ids = 1;</code>
@@ -51930,8 +52038,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ConnectionIdList}
      */
-    public static final class ConnectionIdList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ConnectionIdList)
-    ConnectionIdListOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.ConnectionIdList)
+    ConnectionIdList extends // @@protoc_insertion_point(message_implements:context.ConnectionIdList)
+    com.google.protobuf.GeneratedMessageV3 implements ConnectionIdListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -52146,8 +52255,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ConnectionIdList}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ConnectionIdList)
-        context.ContextOuterClass.ConnectionIdListOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.ConnectionIdList)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.ConnectionIdList)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ConnectionIdListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ConnectionIdList_descriptor;
@@ -52614,8 +52724,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface ConnectionListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ConnectionList)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.ConnectionList)
+    ConnectionListOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.Connection connections = 1;</code>
@@ -52646,8 +52756,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ConnectionList}
      */
-    public static final class ConnectionList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ConnectionList)
-    ConnectionListOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.ConnectionList)
+    ConnectionList extends // @@protoc_insertion_point(message_implements:context.ConnectionList)
+    com.google.protobuf.GeneratedMessageV3 implements ConnectionListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -52862,8 +52973,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ConnectionList}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ConnectionList)
-        context.ContextOuterClass.ConnectionListOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.ConnectionList)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.ConnectionList)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ConnectionListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ConnectionList_descriptor;
@@ -53330,8 +53442,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface ConnectionEventOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ConnectionEvent)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.ConnectionEvent)
+    ConnectionEventOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Event event = 1;</code>
@@ -53371,8 +53483,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ConnectionEvent}
      */
-    public static final class ConnectionEvent extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ConnectionEvent)
-    ConnectionEventOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.ConnectionEvent)
+    ConnectionEvent extends // @@protoc_insertion_point(message_implements:context.ConnectionEvent)
+    com.google.protobuf.GeneratedMessageV3 implements ConnectionEventOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -53621,8 +53734,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ConnectionEvent}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ConnectionEvent)
-        context.ContextOuterClass.ConnectionEventOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.ConnectionEvent)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.ConnectionEvent)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ConnectionEventOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ConnectionEvent_descriptor;
@@ -54068,8 +54182,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface EndPointIdOrBuilder extends // @@protoc_insertion_point(interface_extends:context.EndPointId)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.EndPointId)
+    EndPointIdOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.TopologyId topology_id = 1;</code>
@@ -54130,8 +54244,9 @@ public final class ContextOuterClass {
      *
      * Protobuf type {@code context.EndPointId}
      */
-    public static final class EndPointId extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.EndPointId)
-    EndPointIdOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.EndPointId)
+    EndPointId extends // @@protoc_insertion_point(message_implements:context.EndPointId)
+    com.google.protobuf.GeneratedMessageV3 implements EndPointIdOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -54430,8 +54545,9 @@ public final class ContextOuterClass {
          *
          * Protobuf type {@code context.EndPointId}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.EndPointId)
-        context.ContextOuterClass.EndPointIdOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.EndPointId)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.EndPointId)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.EndPointIdOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_EndPointId_descriptor;
@@ -55013,8 +55129,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface EndPointOrBuilder extends // @@protoc_insertion_point(interface_extends:context.EndPoint)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.EndPoint)
+    EndPointOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.EndPointId endpoint_id = 1;</code>
@@ -55143,8 +55259,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.EndPoint}
      */
-    public static final class EndPoint extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.EndPoint)
-    EndPointOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.EndPoint)
+    EndPoint extends // @@protoc_insertion_point(message_implements:context.EndPoint)
+    com.google.protobuf.GeneratedMessageV3 implements EndPointOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -55680,8 +55797,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.EndPoint}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.EndPoint)
-        context.ContextOuterClass.EndPointOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.EndPoint)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.EndPoint)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.EndPointOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_EndPoint_descriptor;
@@ -56664,8 +56782,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface EndPointNameOrBuilder extends // @@protoc_insertion_point(interface_extends:context.EndPointName)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.EndPointName)
+    EndPointNameOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.EndPointId endpoint_id = 1;</code>
@@ -56724,8 +56842,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.EndPointName}
      */
-    public static final class EndPointName extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.EndPointName)
-    EndPointNameOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.EndPointName)
+    EndPointName extends // @@protoc_insertion_point(message_implements:context.EndPointName)
+    com.google.protobuf.GeneratedMessageV3 implements EndPointNameOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -57075,8 +57194,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.EndPointName}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.EndPointName)
-        context.ContextOuterClass.EndPointNameOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.EndPointName)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.EndPointName)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.EndPointNameOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_EndPointName_descriptor;
@@ -57659,8 +57779,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface EndPointIdListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.EndPointIdList)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.EndPointIdList)
+    EndPointIdListOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.EndPointId endpoint_ids = 1;</code>
@@ -57691,8 +57811,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.EndPointIdList}
      */
-    public static final class EndPointIdList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.EndPointIdList)
-    EndPointIdListOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.EndPointIdList)
+    EndPointIdList extends // @@protoc_insertion_point(message_implements:context.EndPointIdList)
+    com.google.protobuf.GeneratedMessageV3 implements EndPointIdListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -57907,8 +58028,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.EndPointIdList}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.EndPointIdList)
-        context.ContextOuterClass.EndPointIdListOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.EndPointIdList)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.EndPointIdList)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.EndPointIdListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_EndPointIdList_descriptor;
@@ -58375,8 +58497,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface EndPointNameListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.EndPointNameList)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.EndPointNameList)
+    EndPointNameListOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.EndPointName endpoint_names = 1;</code>
@@ -58407,8 +58529,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.EndPointNameList}
      */
-    public static final class EndPointNameList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.EndPointNameList)
-    EndPointNameListOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.EndPointNameList)
+    EndPointNameList extends // @@protoc_insertion_point(message_implements:context.EndPointNameList)
+    com.google.protobuf.GeneratedMessageV3 implements EndPointNameListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -58623,8 +58746,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.EndPointNameList}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.EndPointNameList)
-        context.ContextOuterClass.EndPointNameListOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.EndPointNameList)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.EndPointNameList)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.EndPointNameListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_EndPointNameList_descriptor;
@@ -59091,8 +59215,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface ConfigRule_CustomOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ConfigRule_Custom)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.ConfigRule_Custom)
+    ConfigRule_CustomOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>string resource_key = 1;</code>
@@ -59122,8 +59246,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ConfigRule_Custom}
      */
-    public static final class ConfigRule_Custom extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ConfigRule_Custom)
-    ConfigRule_CustomOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.ConfigRule_Custom)
+    ConfigRule_Custom extends // @@protoc_insertion_point(message_implements:context.ConfigRule_Custom)
+    com.google.protobuf.GeneratedMessageV3 implements ConfigRule_CustomOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -59378,8 +59503,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ConfigRule_Custom}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ConfigRule_Custom)
-        context.ContextOuterClass.ConfigRule_CustomOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.ConfigRule_Custom)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.ConfigRule_Custom)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ConfigRule_CustomOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ConfigRule_Custom_descriptor;
@@ -59735,8 +59861,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface ConfigRule_ACLOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ConfigRule_ACL)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.ConfigRule_ACL)
+    ConfigRule_ACLOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.EndPointId endpoint_id = 1;</code>
@@ -59776,8 +59902,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ConfigRule_ACL}
      */
-    public static final class ConfigRule_ACL extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ConfigRule_ACL)
-    ConfigRule_ACLOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.ConfigRule_ACL)
+    ConfigRule_ACL extends // @@protoc_insertion_point(message_implements:context.ConfigRule_ACL)
+    com.google.protobuf.GeneratedMessageV3 implements ConfigRule_ACLOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -60026,8 +60153,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ConfigRule_ACL}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ConfigRule_ACL)
-        context.ContextOuterClass.ConfigRule_ACLOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.ConfigRule_ACL)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.ConfigRule_ACL)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ConfigRule_ACLOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ConfigRule_ACL_descriptor;
@@ -60473,8 +60601,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface ConfigRule_IP_LINKOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ConfigRule_IP_LINK)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.ConfigRule_IP_LINK)
+    ConfigRule_IP_LINKOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.EndPointId endpoint_id = 1;</code>
@@ -60514,8 +60642,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ConfigRule_IP_LINK}
      */
-    public static final class ConfigRule_IP_LINK extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ConfigRule_IP_LINK)
-    ConfigRule_IP_LINKOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.ConfigRule_IP_LINK)
+    ConfigRule_IP_LINK extends // @@protoc_insertion_point(message_implements:context.ConfigRule_IP_LINK)
+    com.google.protobuf.GeneratedMessageV3 implements ConfigRule_IP_LINKOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -60764,8 +60893,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ConfigRule_IP_LINK}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ConfigRule_IP_LINK)
-        context.ContextOuterClass.ConfigRule_IP_LINKOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.ConfigRule_IP_LINK)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.ConfigRule_IP_LINK)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ConfigRule_IP_LINKOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ConfigRule_IP_LINK_descriptor;
@@ -61211,8 +61341,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface ConfigRuleOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ConfigRule)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.ConfigRule)
+    ConfigRuleOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.ConfigActionEnum action = 1;</code>
@@ -61283,8 +61413,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ConfigRule}
      */
-    public static final class ConfigRule extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ConfigRule)
-    ConfigRuleOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.ConfigRule)
+    ConfigRule extends // @@protoc_insertion_point(message_implements:context.ConfigRule)
+    com.google.protobuf.GeneratedMessageV3 implements ConfigRuleOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -61678,8 +61809,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ConfigRule}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ConfigRule)
-        context.ContextOuterClass.ConfigRuleOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.ConfigRule)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.ConfigRule)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ConfigRuleOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ConfigRule_descriptor;
@@ -62432,8 +62564,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface Constraint_CustomOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Constraint_Custom)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.Constraint_Custom)
+    Constraint_CustomOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>string constraint_type = 1;</code>
@@ -62463,8 +62595,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Constraint_Custom}
      */
-    public static final class Constraint_Custom extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Constraint_Custom)
-    Constraint_CustomOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.Constraint_Custom)
+    Constraint_Custom extends // @@protoc_insertion_point(message_implements:context.Constraint_Custom)
+    com.google.protobuf.GeneratedMessageV3 implements Constraint_CustomOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -62719,8 +62852,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Constraint_Custom}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Constraint_Custom)
-        context.ContextOuterClass.Constraint_CustomOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.Constraint_Custom)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.Constraint_Custom)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.Constraint_CustomOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Constraint_Custom_descriptor;
@@ -63076,8 +63210,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface Constraint_ScheduleOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Constraint_Schedule)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.Constraint_Schedule)
+    Constraint_ScheduleOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>double start_timestamp = 1;</code>
@@ -63095,8 +63229,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Constraint_Schedule}
      */
-    public static final class Constraint_Schedule extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Constraint_Schedule)
-    Constraint_ScheduleOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.Constraint_Schedule)
+    Constraint_Schedule extends // @@protoc_insertion_point(message_implements:context.Constraint_Schedule)
+    com.google.protobuf.GeneratedMessageV3 implements Constraint_ScheduleOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -63299,8 +63434,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Constraint_Schedule}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Constraint_Schedule)
-        context.ContextOuterClass.Constraint_ScheduleOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.Constraint_Schedule)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.Constraint_Schedule)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.Constraint_ScheduleOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Constraint_Schedule_descriptor;
@@ -63570,8 +63706,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface GPS_PositionOrBuilder extends // @@protoc_insertion_point(interface_extends:context.GPS_Position)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.GPS_Position)
+    GPS_PositionOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>float latitude = 1;</code>
@@ -63589,8 +63725,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.GPS_Position}
      */
-    public static final class GPS_Position extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.GPS_Position)
-    GPS_PositionOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.GPS_Position)
+    GPS_Position extends // @@protoc_insertion_point(message_implements:context.GPS_Position)
+    com.google.protobuf.GeneratedMessageV3 implements GPS_PositionOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -63793,8 +63930,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.GPS_Position}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.GPS_Position)
-        context.ContextOuterClass.GPS_PositionOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.GPS_Position)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.GPS_Position)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.GPS_PositionOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_GPS_Position_descriptor;
@@ -64064,8 +64202,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface LocationOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Location)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.Location)
+    LocationOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>string region = 1;</code>
@@ -64144,8 +64282,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Location}
      */
-    public static final class Location extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Location)
-    LocationOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.Location)
+    Location extends // @@protoc_insertion_point(message_implements:context.Location)
+    com.google.protobuf.GeneratedMessageV3 implements LocationOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -64606,8 +64745,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Location}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Location)
-        context.ContextOuterClass.LocationOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.Location)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.Location)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.LocationOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Location_descriptor;
@@ -65302,8 +65442,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface Constraint_EndPointLocationOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Constraint_EndPointLocation)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.Constraint_EndPointLocation)
+    Constraint_EndPointLocationOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.EndPointId endpoint_id = 1;</code>
@@ -65343,8 +65483,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Constraint_EndPointLocation}
      */
-    public static final class Constraint_EndPointLocation extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Constraint_EndPointLocation)
-    Constraint_EndPointLocationOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.Constraint_EndPointLocation)
+    Constraint_EndPointLocation extends // @@protoc_insertion_point(message_implements:context.Constraint_EndPointLocation)
+    com.google.protobuf.GeneratedMessageV3 implements Constraint_EndPointLocationOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -65593,8 +65734,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Constraint_EndPointLocation}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Constraint_EndPointLocation)
-        context.ContextOuterClass.Constraint_EndPointLocationOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.Constraint_EndPointLocation)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.Constraint_EndPointLocation)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.Constraint_EndPointLocationOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Constraint_EndPointLocation_descriptor;
@@ -66040,8 +66182,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface Constraint_EndPointPriorityOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Constraint_EndPointPriority)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.Constraint_EndPointPriority)
+    Constraint_EndPointPriorityOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.EndPointId endpoint_id = 1;</code>
@@ -66070,8 +66212,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Constraint_EndPointPriority}
      */
-    public static final class Constraint_EndPointPriority extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Constraint_EndPointPriority)
-    Constraint_EndPointPriorityOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.Constraint_EndPointPriority)
+    Constraint_EndPointPriority extends // @@protoc_insertion_point(message_implements:context.Constraint_EndPointPriority)
+    com.google.protobuf.GeneratedMessageV3 implements Constraint_EndPointPriorityOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -66297,8 +66440,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Constraint_EndPointPriority}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Constraint_EndPointPriority)
-        context.ContextOuterClass.Constraint_EndPointPriorityOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.Constraint_EndPointPriority)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.Constraint_EndPointPriority)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.Constraint_EndPointPriorityOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Constraint_EndPointPriority_descriptor;
@@ -66656,8 +66800,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface Constraint_SLA_LatencyOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Constraint_SLA_Latency)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.Constraint_SLA_Latency)
+    Constraint_SLA_LatencyOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>float e2e_latency_ms = 1;</code>
@@ -66669,8 +66813,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Constraint_SLA_Latency}
      */
-    public static final class Constraint_SLA_Latency extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Constraint_SLA_Latency)
-    Constraint_SLA_LatencyOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.Constraint_SLA_Latency)
+    Constraint_SLA_Latency extends // @@protoc_insertion_point(message_implements:context.Constraint_SLA_Latency)
+    com.google.protobuf.GeneratedMessageV3 implements Constraint_SLA_LatencyOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -66850,8 +66995,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Constraint_SLA_Latency}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Constraint_SLA_Latency)
-        context.ContextOuterClass.Constraint_SLA_LatencyOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.Constraint_SLA_Latency)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.Constraint_SLA_Latency)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.Constraint_SLA_LatencyOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Constraint_SLA_Latency_descriptor;
@@ -67073,8 +67219,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface Constraint_SLA_CapacityOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Constraint_SLA_Capacity)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.Constraint_SLA_Capacity)
+    Constraint_SLA_CapacityOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>float capacity_gbps = 1;</code>
@@ -67086,8 +67232,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Constraint_SLA_Capacity}
      */
-    public static final class Constraint_SLA_Capacity extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Constraint_SLA_Capacity)
-    Constraint_SLA_CapacityOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.Constraint_SLA_Capacity)
+    Constraint_SLA_Capacity extends // @@protoc_insertion_point(message_implements:context.Constraint_SLA_Capacity)
+    com.google.protobuf.GeneratedMessageV3 implements Constraint_SLA_CapacityOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -67267,8 +67414,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Constraint_SLA_Capacity}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Constraint_SLA_Capacity)
-        context.ContextOuterClass.Constraint_SLA_CapacityOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.Constraint_SLA_Capacity)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.Constraint_SLA_Capacity)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.Constraint_SLA_CapacityOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Constraint_SLA_Capacity_descriptor;
@@ -67490,8 +67638,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface Constraint_SLA_AvailabilityOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Constraint_SLA_Availability)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.Constraint_SLA_Availability)
+    Constraint_SLA_AvailabilityOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>uint32 num_disjoint_paths = 1;</code>
@@ -67519,8 +67667,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Constraint_SLA_Availability}
      */
-    public static final class Constraint_SLA_Availability extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Constraint_SLA_Availability)
-    Constraint_SLA_AvailabilityOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.Constraint_SLA_Availability)
+    Constraint_SLA_Availability extends // @@protoc_insertion_point(message_implements:context.Constraint_SLA_Availability)
+    com.google.protobuf.GeneratedMessageV3 implements Constraint_SLA_AvailabilityOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -67750,8 +67899,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Constraint_SLA_Availability}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Constraint_SLA_Availability)
-        context.ContextOuterClass.Constraint_SLA_AvailabilityOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.Constraint_SLA_Availability)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.Constraint_SLA_Availability)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.Constraint_SLA_AvailabilityOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Constraint_SLA_Availability_descriptor;
@@ -68081,8 +68231,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface Constraint_SLA_Isolation_levelOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Constraint_SLA_Isolation_level)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.Constraint_SLA_Isolation_level)
+    Constraint_SLA_Isolation_levelOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.IsolationLevelEnum isolation_level = 1;</code>
@@ -68120,8 +68270,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Constraint_SLA_Isolation_level}
      */
-    public static final class Constraint_SLA_Isolation_level extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Constraint_SLA_Isolation_level)
-    Constraint_SLA_Isolation_levelOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.Constraint_SLA_Isolation_level)
+    Constraint_SLA_Isolation_level extends // @@protoc_insertion_point(message_implements:context.Constraint_SLA_Isolation_level)
+    com.google.protobuf.GeneratedMessageV3 implements Constraint_SLA_Isolation_levelOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -68367,8 +68518,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Constraint_SLA_Isolation_level}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Constraint_SLA_Isolation_level)
-        context.ContextOuterClass.Constraint_SLA_Isolation_levelOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.Constraint_SLA_Isolation_level)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.Constraint_SLA_Isolation_level)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.Constraint_SLA_Isolation_levelOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Constraint_SLA_Isolation_level_descriptor;
@@ -68730,8 +68882,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface Constraint_ExclusionsOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Constraint_Exclusions)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.Constraint_Exclusions)
+    Constraint_ExclusionsOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>bool is_permanent = 1;</code>
@@ -68818,8 +68970,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Constraint_Exclusions}
      */
-    public static final class Constraint_Exclusions extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Constraint_Exclusions)
-    Constraint_ExclusionsOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.Constraint_Exclusions)
+    Constraint_Exclusions extends // @@protoc_insertion_point(message_implements:context.Constraint_Exclusions)
+    com.google.protobuf.GeneratedMessageV3 implements Constraint_ExclusionsOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -69173,8 +69326,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Constraint_Exclusions}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Constraint_Exclusions)
-        context.ContextOuterClass.Constraint_ExclusionsOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.Constraint_Exclusions)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.Constraint_Exclusions)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.Constraint_ExclusionsOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Constraint_Exclusions_descriptor;
@@ -70267,8 +70421,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface QoSProfileIdOrBuilder extends // @@protoc_insertion_point(interface_extends:context.QoSProfileId)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.QoSProfileId)
+    QoSProfileIdOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Uuid qos_profile_id = 1;</code>
@@ -70291,8 +70445,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.QoSProfileId}
      */
-    public static final class QoSProfileId extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.QoSProfileId)
-    QoSProfileIdOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.QoSProfileId)
+    QoSProfileId extends // @@protoc_insertion_point(message_implements:context.QoSProfileId)
+    com.google.protobuf.GeneratedMessageV3 implements QoSProfileIdOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -70495,8 +70650,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.QoSProfileId}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.QoSProfileId)
-        context.ContextOuterClass.QoSProfileIdOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.QoSProfileId)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.QoSProfileId)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.QoSProfileIdOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_QoSProfileId_descriptor;
@@ -70806,8 +70962,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface Constraint_QoSProfileOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Constraint_QoSProfile)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.Constraint_QoSProfile)
+    Constraint_QoSProfileOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.QoSProfileId qos_profile_id = 1;</code>
@@ -70842,8 +70998,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Constraint_QoSProfile}
      */
-    public static final class Constraint_QoSProfile extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Constraint_QoSProfile)
-    Constraint_QoSProfileOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.Constraint_QoSProfile)
+    Constraint_QoSProfile extends // @@protoc_insertion_point(message_implements:context.Constraint_QoSProfile)
+    com.google.protobuf.GeneratedMessageV3 implements Constraint_QoSProfileOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -71095,8 +71252,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Constraint_QoSProfile}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Constraint_QoSProfile)
-        context.ContextOuterClass.Constraint_QoSProfileOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.Constraint_QoSProfile)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.Constraint_QoSProfile)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.Constraint_QoSProfileOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Constraint_QoSProfile_descriptor;
@@ -71497,8 +71655,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface ConstraintOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Constraint)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.Constraint)
+    ConstraintOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.ConstraintActionEnum action = 1;</code>
@@ -71688,8 +71846,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Constraint}
      */
-    public static final class Constraint extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Constraint)
-    ConstraintOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.Constraint)
+    Constraint extends // @@protoc_insertion_point(message_implements:context.Constraint)
+    com.google.protobuf.GeneratedMessageV3 implements ConstraintOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -72443,8 +72602,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Constraint}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Constraint)
-        context.ContextOuterClass.ConstraintOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.Constraint)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.Constraint)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ConstraintOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Constraint_descriptor;
@@ -74310,8 +74470,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface TeraFlowControllerOrBuilder extends // @@protoc_insertion_point(interface_extends:context.TeraFlowController)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.TeraFlowController)
+    TeraFlowControllerOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.ContextId context_id = 1;</code>
@@ -74356,8 +74516,9 @@ public final class ContextOuterClass {
      *
      * Protobuf type {@code context.TeraFlowController}
      */
-    public static final class TeraFlowController extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.TeraFlowController)
-    TeraFlowControllerOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.TeraFlowController)
+    TeraFlowController extends // @@protoc_insertion_point(message_implements:context.TeraFlowController)
+    com.google.protobuf.GeneratedMessageV3 implements TeraFlowControllerOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -74636,8 +74797,9 @@ public final class ContextOuterClass {
          *
          * Protobuf type {@code context.TeraFlowController}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.TeraFlowController)
-        context.ContextOuterClass.TeraFlowControllerOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.TeraFlowController)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.TeraFlowController)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.TeraFlowControllerOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_TeraFlowController_descriptor;
@@ -75086,8 +75248,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface AuthenticationResultOrBuilder extends // @@protoc_insertion_point(interface_extends:context.AuthenticationResult)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.AuthenticationResult)
+    AuthenticationResultOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.ContextId context_id = 1;</code>
@@ -75116,8 +75278,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.AuthenticationResult}
      */
-    public static final class AuthenticationResult extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.AuthenticationResult)
-    AuthenticationResultOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.AuthenticationResult)
+    AuthenticationResult extends // @@protoc_insertion_point(message_implements:context.AuthenticationResult)
+    com.google.protobuf.GeneratedMessageV3 implements AuthenticationResultOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -75343,8 +75506,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.AuthenticationResult}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.AuthenticationResult)
-        context.ContextOuterClass.AuthenticationResultOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.AuthenticationResult)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.AuthenticationResult)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.AuthenticationResultOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_AuthenticationResult_descriptor;
@@ -75702,8 +75866,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface OpticalConfigIdOrBuilder extends // @@protoc_insertion_point(interface_extends:context.OpticalConfigId)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.OpticalConfigId)
+    OpticalConfigIdOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>string opticalconfig_uuid = 1;</code>
@@ -75725,8 +75889,9 @@ public final class ContextOuterClass {
      *
      * Protobuf type {@code context.OpticalConfigId}
      */
-    public static final class OpticalConfigId extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.OpticalConfigId)
-    OpticalConfigIdOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.OpticalConfigId)
+    OpticalConfigId extends // @@protoc_insertion_point(message_implements:context.OpticalConfigId)
+    com.google.protobuf.GeneratedMessageV3 implements OpticalConfigIdOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -75936,8 +76101,9 @@ public final class ContextOuterClass {
          *
          * Protobuf type {@code context.OpticalConfigId}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.OpticalConfigId)
-        context.ContextOuterClass.OpticalConfigIdOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.OpticalConfigId)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.OpticalConfigId)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.OpticalConfigIdOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_OpticalConfigId_descriptor;
@@ -76202,8 +76368,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface OpticalConfigOrBuilder extends // @@protoc_insertion_point(interface_extends:context.OpticalConfig)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.OpticalConfig)
+    OpticalConfigOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.OpticalConfigId opticalconfig_id = 1;</code>
@@ -76255,8 +76421,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.OpticalConfig}
      */
-    public static final class OpticalConfig extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.OpticalConfig)
-    OpticalConfigOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.OpticalConfig)
+    OpticalConfig extends // @@protoc_insertion_point(message_implements:context.OpticalConfig)
+    com.google.protobuf.GeneratedMessageV3 implements OpticalConfigOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -76554,8 +76721,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.OpticalConfig}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.OpticalConfig)
-        context.ContextOuterClass.OpticalConfigOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.OpticalConfig)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.OpticalConfig)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.OpticalConfigOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_OpticalConfig_descriptor;
@@ -77092,8 +77260,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface OpticalConfigListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.OpticalConfigList)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.OpticalConfigList)
+    OpticalConfigListOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.OpticalConfig opticalconfigs = 1;</code>
@@ -77124,8 +77292,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.OpticalConfigList}
      */
-    public static final class OpticalConfigList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.OpticalConfigList)
-    OpticalConfigListOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.OpticalConfigList)
+    OpticalConfigList extends // @@protoc_insertion_point(message_implements:context.OpticalConfigList)
+    com.google.protobuf.GeneratedMessageV3 implements OpticalConfigListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -77340,8 +77509,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.OpticalConfigList}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.OpticalConfigList)
-        context.ContextOuterClass.OpticalConfigListOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.OpticalConfigList)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.OpticalConfigList)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.OpticalConfigListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_OpticalConfigList_descriptor;
@@ -77808,8 +77978,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface OpticalConfigEventOrBuilder extends // @@protoc_insertion_point(interface_extends:context.OpticalConfigEvent)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.OpticalConfigEvent)
+    OpticalConfigEventOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Event event = 1;</code>
@@ -77849,8 +78019,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.OpticalConfigEvent}
      */
-    public static final class OpticalConfigEvent extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.OpticalConfigEvent)
-    OpticalConfigEventOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.OpticalConfigEvent)
+    OpticalConfigEvent extends // @@protoc_insertion_point(message_implements:context.OpticalConfigEvent)
+    com.google.protobuf.GeneratedMessageV3 implements OpticalConfigEventOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -78099,8 +78270,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.OpticalConfigEvent}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.OpticalConfigEvent)
-        context.ContextOuterClass.OpticalConfigEventOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.OpticalConfigEvent)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.OpticalConfigEvent)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.OpticalConfigEventOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_OpticalConfigEvent_descriptor;
@@ -78546,8 +78718,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface OpticalEndPointIdOrBuilder extends // @@protoc_insertion_point(interface_extends:context.OpticalEndPointId)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.OpticalEndPointId)
+    OpticalEndPointIdOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.DeviceId device_id = 2;</code>
@@ -78587,8 +78759,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.OpticalEndPointId}
      */
-    public static final class OpticalEndPointId extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.OpticalEndPointId)
-    OpticalEndPointIdOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.OpticalEndPointId)
+    OpticalEndPointId extends // @@protoc_insertion_point(message_implements:context.OpticalEndPointId)
+    com.google.protobuf.GeneratedMessageV3 implements OpticalEndPointIdOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -78837,8 +79010,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.OpticalEndPointId}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.OpticalEndPointId)
-        context.ContextOuterClass.OpticalEndPointIdOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.OpticalEndPointId)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.OpticalEndPointId)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.OpticalEndPointIdOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_OpticalEndPointId_descriptor;
@@ -79284,8 +79458,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface OpticalLinkListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.OpticalLinkList)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.OpticalLinkList)
+    OpticalLinkListOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.OpticalLink optical_links = 1;</code>
@@ -79316,8 +79490,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.OpticalLinkList}
      */
-    public static final class OpticalLinkList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.OpticalLinkList)
-    OpticalLinkListOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.OpticalLinkList)
+    OpticalLinkList extends // @@protoc_insertion_point(message_implements:context.OpticalLinkList)
+    com.google.protobuf.GeneratedMessageV3 implements OpticalLinkListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -79532,8 +79707,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.OpticalLinkList}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.OpticalLinkList)
-        context.ContextOuterClass.OpticalLinkListOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.OpticalLinkList)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.OpticalLinkList)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.OpticalLinkListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_OpticalLinkList_descriptor;
@@ -80000,8 +80176,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface OpticalLinkDetailsOrBuilder extends // @@protoc_insertion_point(interface_extends:context.OpticalLinkDetails)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.OpticalLinkDetails)
+    OpticalLinkDetailsOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>float length = 1;</code>
@@ -80160,8 +80336,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.OpticalLinkDetails}
      */
-    public static final class OpticalLinkDetails extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.OpticalLinkDetails)
-    OpticalLinkDetailsOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.OpticalLinkDetails)
+    OpticalLinkDetails extends // @@protoc_insertion_point(message_implements:context.OpticalLinkDetails)
+    com.google.protobuf.GeneratedMessageV3 implements OpticalLinkDetailsOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -80836,8 +81013,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.OpticalLinkDetails}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.OpticalLinkDetails)
-        context.ContextOuterClass.OpticalLinkDetailsOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.OpticalLinkDetails)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.OpticalLinkDetails)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.OpticalLinkDetailsOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_OpticalLinkDetails_descriptor;
@@ -81925,8 +82103,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface OpticalLinkOrBuilder extends // @@protoc_insertion_point(interface_extends:context.OpticalLink)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.OpticalLink)
+    OpticalLinkOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>string name = 1;</code>
@@ -82003,8 +82181,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.OpticalLink}
      */
-    public static final class OpticalLink extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.OpticalLink)
-    OpticalLinkOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.OpticalLink)
+    OpticalLink extends // @@protoc_insertion_point(message_implements:context.OpticalLink)
+    com.google.protobuf.GeneratedMessageV3 implements OpticalLinkOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -82360,8 +82539,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.OpticalLink}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.OpticalLink)
-        context.ContextOuterClass.OpticalLinkOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.OpticalLink)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.OpticalLink)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.OpticalLinkOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_OpticalLink_descriptor;
@@ -83191,8 +83371,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface ChannelIdOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ChannelId)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.ChannelId)
+    ChannelIdOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Uuid channel_uuid = 1;</code>
@@ -83215,8 +83395,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ChannelId}
      */
-    public static final class ChannelId extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ChannelId)
-    ChannelIdOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.ChannelId)
+    ChannelId extends // @@protoc_insertion_point(message_implements:context.ChannelId)
+    com.google.protobuf.GeneratedMessageV3 implements ChannelIdOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -83419,8 +83600,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ChannelId}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ChannelId)
-        context.ContextOuterClass.ChannelIdOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.ChannelId)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.ChannelId)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ChannelIdOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ChannelId_descriptor;
@@ -83730,8 +83912,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface OpticalBandIdOrBuilder extends // @@protoc_insertion_point(interface_extends:context.OpticalBandId)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.OpticalBandId)
+    OpticalBandIdOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Uuid opticalband_uuid = 1;</code>
@@ -83754,8 +83936,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.OpticalBandId}
      */
-    public static final class OpticalBandId extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.OpticalBandId)
-    OpticalBandIdOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.OpticalBandId)
+    OpticalBandId extends // @@protoc_insertion_point(message_implements:context.OpticalBandId)
+    com.google.protobuf.GeneratedMessageV3 implements OpticalBandIdOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -83958,8 +84141,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.OpticalBandId}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.OpticalBandId)
-        context.ContextOuterClass.OpticalBandIdOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.OpticalBandId)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.OpticalBandId)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.OpticalBandIdOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_OpticalBandId_descriptor;
@@ -84269,8 +84453,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface OpticalBandOrBuilder extends // @@protoc_insertion_point(interface_extends:context.OpticalBand)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.OpticalBand)
+    OpticalBandOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.OpticalBandId opticalband_id = 1;</code>
@@ -84398,8 +84582,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.OpticalBand}
      */
-    public static final class OpticalBand extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.OpticalBand)
-    OpticalBandOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.OpticalBand)
+    OpticalBand extends // @@protoc_insertion_point(message_implements:context.OpticalBand)
+    com.google.protobuf.GeneratedMessageV3 implements OpticalBandOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -84960,8 +85145,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.OpticalBand}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.OpticalBand)
-        context.ContextOuterClass.OpticalBandOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.OpticalBand)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.OpticalBand)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.OpticalBandOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_OpticalBand_descriptor;
@@ -86137,8 +86323,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface OpticalBandListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.OpticalBandList)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.OpticalBandList)
+    OpticalBandListOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.OpticalBand opticalbands = 1;</code>
@@ -86169,8 +86355,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.OpticalBandList}
      */
-    public static final class OpticalBandList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.OpticalBandList)
-    OpticalBandListOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.OpticalBandList)
+    OpticalBandList extends // @@protoc_insertion_point(message_implements:context.OpticalBandList)
+    com.google.protobuf.GeneratedMessageV3 implements OpticalBandListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -86385,8 +86572,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.OpticalBandList}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.OpticalBandList)
-        context.ContextOuterClass.OpticalBandListOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.OpticalBandList)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.OpticalBandList)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.OpticalBandListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_OpticalBandList_descriptor;
@@ -86853,8 +87041,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface ServiceConfigRuleOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ServiceConfigRule)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.ServiceConfigRule)
+    ServiceConfigRuleOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.ServiceId service_id = 1;</code>
@@ -86894,8 +87082,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ServiceConfigRule}
      */
-    public static final class ServiceConfigRule extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ServiceConfigRule)
-    ServiceConfigRuleOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.ServiceConfigRule)
+    ServiceConfigRule extends // @@protoc_insertion_point(message_implements:context.ServiceConfigRule)
+    com.google.protobuf.GeneratedMessageV3 implements ServiceConfigRuleOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -87144,8 +87333,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ServiceConfigRule}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ServiceConfigRule)
-        context.ContextOuterClass.ServiceConfigRuleOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.ServiceConfigRule)
+        Builder extends // @@protoc_insertion_point(builder_implements:context.ServiceConfigRule)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ServiceConfigRuleOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ServiceConfigRule_descriptor;
diff --git a/src/policy/target/generated-sources/grpc/device/Device.java b/src/policy/target/generated-sources/grpc/device/Device.java
index 87c434732..51f0b742d 100644
--- a/src/policy/target/generated-sources/grpc/device/Device.java
+++ b/src/policy/target/generated-sources/grpc/device/Device.java
@@ -14,8 +14,8 @@ public final class Device {
         registerAllExtensions((com.google.protobuf.ExtensionRegistryLite) registry);
     }
 
-    public interface MonitoringSettingsOrBuilder extends // @@protoc_insertion_point(interface_extends:device.MonitoringSettings)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:device.MonitoringSettings)
+    MonitoringSettingsOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <pre>
@@ -91,8 +91,9 @@ public final class Device {
     /**
      * Protobuf type {@code device.MonitoringSettings}
      */
-    public static final class MonitoringSettings extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:device.MonitoringSettings)
-    MonitoringSettingsOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:device.MonitoringSettings)
+    MonitoringSettings extends // @@protoc_insertion_point(message_implements:device.MonitoringSettings)
+    com.google.protobuf.GeneratedMessageV3 implements MonitoringSettingsOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -411,8 +412,9 @@ public final class Device {
         /**
          * Protobuf type {@code device.MonitoringSettings}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:device.MonitoringSettings)
-        device.Device.MonitoringSettingsOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:device.MonitoringSettings)
+        Builder extends // @@protoc_insertion_point(builder_implements:device.MonitoringSettings)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements device.Device.MonitoringSettingsOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return device.Device.internal_static_device_MonitoringSettings_descriptor;
diff --git a/src/policy/target/generated-sources/grpc/ip_link/IpLink.java b/src/policy/target/generated-sources/grpc/ip_link/IpLink.java
index 865a27401..f8ed44bf2 100644
--- a/src/policy/target/generated-sources/grpc/ip_link/IpLink.java
+++ b/src/policy/target/generated-sources/grpc/ip_link/IpLink.java
@@ -14,8 +14,8 @@ public final class IpLink {
         registerAllExtensions((com.google.protobuf.ExtensionRegistryLite) registry);
     }
 
-    public interface IpLinkRuleSetOrBuilder extends // @@protoc_insertion_point(interface_extends:ip_link.IpLinkRuleSet)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:ip_link.IpLinkRuleSet)
+    IpLinkRuleSetOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>string ip = 1;</code>
@@ -57,8 +57,9 @@ public final class IpLink {
     /**
      * Protobuf type {@code ip_link.IpLinkRuleSet}
      */
-    public static final class IpLinkRuleSet extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:ip_link.IpLinkRuleSet)
-    IpLinkRuleSetOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:ip_link.IpLinkRuleSet)
+    IpLinkRuleSet extends // @@protoc_insertion_point(message_implements:ip_link.IpLinkRuleSet)
+    com.google.protobuf.GeneratedMessageV3 implements IpLinkRuleSetOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -362,8 +363,9 @@ public final class IpLink {
         /**
          * Protobuf type {@code ip_link.IpLinkRuleSet}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:ip_link.IpLinkRuleSet)
-        ip_link.IpLink.IpLinkRuleSetOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:ip_link.IpLinkRuleSet)
+        Builder extends // @@protoc_insertion_point(builder_implements:ip_link.IpLinkRuleSet)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements ip_link.IpLink.IpLinkRuleSetOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return ip_link.IpLink.internal_static_ip_link_IpLinkRuleSet_descriptor;
diff --git a/src/policy/target/generated-sources/grpc/monitoring/Monitoring.java b/src/policy/target/generated-sources/grpc/monitoring/Monitoring.java
index 8394fe275..ed1f1a40e 100644
--- a/src/policy/target/generated-sources/grpc/monitoring/Monitoring.java
+++ b/src/policy/target/generated-sources/grpc/monitoring/Monitoring.java
@@ -14,8 +14,8 @@ public final class Monitoring {
         registerAllExtensions((com.google.protobuf.ExtensionRegistryLite) registry);
     }
 
-    public interface KpiDescriptorOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.KpiDescriptor)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:monitoring.KpiDescriptor)
+    KpiDescriptorOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.monitoring.KpiId kpi_id = 1;</code>
@@ -189,8 +189,9 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.KpiDescriptor}
      */
-    public static final class KpiDescriptor extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.KpiDescriptor)
-    KpiDescriptorOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:monitoring.KpiDescriptor)
+    KpiDescriptor extends // @@protoc_insertion_point(message_implements:monitoring.KpiDescriptor)
+    com.google.protobuf.GeneratedMessageV3 implements KpiDescriptorOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -810,8 +811,9 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.KpiDescriptor}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.KpiDescriptor)
-        monitoring.Monitoring.KpiDescriptorOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:monitoring.KpiDescriptor)
+        Builder extends // @@protoc_insertion_point(builder_implements:monitoring.KpiDescriptor)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.KpiDescriptorOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_KpiDescriptor_descriptor;
@@ -2394,8 +2396,8 @@ public final class Monitoring {
         }
     }
 
-    public interface MonitorKpiRequestOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.MonitorKpiRequest)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:monitoring.MonitorKpiRequest)
+    MonitorKpiRequestOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.monitoring.KpiId kpi_id = 1;</code>
@@ -2434,8 +2436,9 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.MonitorKpiRequest}
      */
-    public static final class MonitorKpiRequest extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.MonitorKpiRequest)
-    MonitorKpiRequestOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:monitoring.MonitorKpiRequest)
+    MonitorKpiRequest extends // @@protoc_insertion_point(message_implements:monitoring.MonitorKpiRequest)
+    com.google.protobuf.GeneratedMessageV3 implements MonitorKpiRequestOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -2688,8 +2691,9 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.MonitorKpiRequest}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.MonitorKpiRequest)
-        monitoring.Monitoring.MonitorKpiRequestOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:monitoring.MonitorKpiRequest)
+        Builder extends // @@protoc_insertion_point(builder_implements:monitoring.MonitorKpiRequest)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.MonitorKpiRequestOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_MonitorKpiRequest_descriptor;
@@ -3107,8 +3111,8 @@ public final class Monitoring {
         }
     }
 
-    public interface KpiQueryOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.KpiQuery)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:monitoring.KpiQuery)
+    KpiQueryOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .monitoring.KpiId kpi_ids = 1;</code>
@@ -3213,8 +3217,9 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.KpiQuery}
      */
-    public static final class KpiQuery extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.KpiQuery)
-    KpiQueryOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:monitoring.KpiQuery)
+    KpiQuery extends // @@protoc_insertion_point(message_implements:monitoring.KpiQuery)
+    com.google.protobuf.GeneratedMessageV3 implements KpiQueryOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -3595,8 +3600,9 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.KpiQuery}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.KpiQuery)
-        monitoring.Monitoring.KpiQueryOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:monitoring.KpiQuery)
+        Builder extends // @@protoc_insertion_point(builder_implements:monitoring.KpiQuery)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.KpiQueryOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_KpiQuery_descriptor;
@@ -4515,8 +4521,8 @@ public final class Monitoring {
         }
     }
 
-    public interface RawKpiOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.RawKpi)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:monitoring.RawKpi)
+    RawKpiOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Timestamp timestamp = 1;</code>
@@ -4560,8 +4566,9 @@ public final class Monitoring {
      *
      * Protobuf type {@code monitoring.RawKpi}
      */
-    public static final class RawKpi extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.RawKpi)
-    RawKpiOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:monitoring.RawKpi)
+    RawKpi extends // @@protoc_insertion_point(message_implements:monitoring.RawKpi)
+    com.google.protobuf.GeneratedMessageV3 implements RawKpiOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -4814,8 +4821,9 @@ public final class Monitoring {
          *
          * Protobuf type {@code monitoring.RawKpi}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.RawKpi)
-        monitoring.Monitoring.RawKpiOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:monitoring.RawKpi)
+        Builder extends // @@protoc_insertion_point(builder_implements:monitoring.RawKpi)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.RawKpiOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_RawKpi_descriptor;
@@ -5261,8 +5269,8 @@ public final class Monitoring {
         }
     }
 
-    public interface RawKpiListOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.RawKpiList)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:monitoring.RawKpiList)
+    RawKpiListOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.monitoring.KpiId kpi_id = 1;</code>
@@ -5314,8 +5322,9 @@ public final class Monitoring {
      *
      * Protobuf type {@code monitoring.RawKpiList}
      */
-    public static final class RawKpiList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.RawKpiList)
-    RawKpiListOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:monitoring.RawKpiList)
+    RawKpiList extends // @@protoc_insertion_point(message_implements:monitoring.RawKpiList)
+    com.google.protobuf.GeneratedMessageV3 implements RawKpiListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -5580,8 +5589,9 @@ public final class Monitoring {
          *
          * Protobuf type {@code monitoring.RawKpiList}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.RawKpiList)
-        monitoring.Monitoring.RawKpiListOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:monitoring.RawKpiList)
+        Builder extends // @@protoc_insertion_point(builder_implements:monitoring.RawKpiList)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.RawKpiListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_RawKpiList_descriptor;
@@ -6184,8 +6194,8 @@ public final class Monitoring {
         }
     }
 
-    public interface RawKpiTableOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.RawKpiTable)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:monitoring.RawKpiTable)
+    RawKpiTableOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .monitoring.RawKpiList raw_kpi_lists = 1;</code>
@@ -6220,8 +6230,9 @@ public final class Monitoring {
      *
      * Protobuf type {@code monitoring.RawKpiTable}
      */
-    public static final class RawKpiTable extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.RawKpiTable)
-    RawKpiTableOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:monitoring.RawKpiTable)
+    RawKpiTable extends // @@protoc_insertion_point(message_implements:monitoring.RawKpiTable)
+    com.google.protobuf.GeneratedMessageV3 implements RawKpiTableOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -6440,8 +6451,9 @@ public final class Monitoring {
          *
          * Protobuf type {@code monitoring.RawKpiTable}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.RawKpiTable)
-        monitoring.Monitoring.RawKpiTableOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:monitoring.RawKpiTable)
+        Builder extends // @@protoc_insertion_point(builder_implements:monitoring.RawKpiTable)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.RawKpiTableOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_RawKpiTable_descriptor;
@@ -6908,8 +6920,8 @@ public final class Monitoring {
         }
     }
 
-    public interface KpiIdOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.KpiId)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:monitoring.KpiId)
+    KpiIdOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Uuid kpi_id = 1;</code>
@@ -6932,8 +6944,9 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.KpiId}
      */
-    public static final class KpiId extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.KpiId)
-    KpiIdOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:monitoring.KpiId)
+    KpiId extends // @@protoc_insertion_point(message_implements:monitoring.KpiId)
+    com.google.protobuf.GeneratedMessageV3 implements KpiIdOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -7136,8 +7149,9 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.KpiId}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.KpiId)
-        monitoring.Monitoring.KpiIdOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:monitoring.KpiId)
+        Builder extends // @@protoc_insertion_point(builder_implements:monitoring.KpiId)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.KpiIdOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_KpiId_descriptor;
@@ -7447,8 +7461,8 @@ public final class Monitoring {
         }
     }
 
-    public interface KpiOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.Kpi)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:monitoring.Kpi)
+    KpiOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.monitoring.KpiId kpi_id = 1;</code>
@@ -7505,8 +7519,9 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.Kpi}
      */
-    public static final class Kpi extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.Kpi)
-    KpiOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:monitoring.Kpi)
+    Kpi extends // @@protoc_insertion_point(message_implements:monitoring.Kpi)
+    com.google.protobuf.GeneratedMessageV3 implements KpiOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -7801,8 +7816,9 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.Kpi}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.Kpi)
-        monitoring.Monitoring.KpiOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:monitoring.Kpi)
+        Builder extends // @@protoc_insertion_point(builder_implements:monitoring.Kpi)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.KpiOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_Kpi_descriptor;
@@ -8384,8 +8400,8 @@ public final class Monitoring {
         }
     }
 
-    public interface KpiValueRangeOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.KpiValueRange)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:monitoring.KpiValueRange)
+    KpiValueRangeOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.monitoring.KpiValue kpiMinValue = 1;</code>
@@ -8455,8 +8471,9 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.KpiValueRange}
      */
-    public static final class KpiValueRange extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.KpiValueRange)
-    KpiValueRangeOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:monitoring.KpiValueRange)
+    KpiValueRange extends // @@protoc_insertion_point(message_implements:monitoring.KpiValueRange)
+    com.google.protobuf.GeneratedMessageV3 implements KpiValueRangeOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -8786,8 +8803,9 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.KpiValueRange}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.KpiValueRange)
-        monitoring.Monitoring.KpiValueRangeOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:monitoring.KpiValueRange)
+        Builder extends // @@protoc_insertion_point(builder_implements:monitoring.KpiValueRange)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.KpiValueRangeOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_KpiValueRange_descriptor;
@@ -9413,8 +9431,8 @@ public final class Monitoring {
         }
     }
 
-    public interface KpiValueOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.KpiValue)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:monitoring.KpiValue)
+    KpiValueOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>int32 int32Val = 1;</code>
@@ -9512,8 +9530,9 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.KpiValue}
      */
-    public static final class KpiValue extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.KpiValue)
-    KpiValueOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:monitoring.KpiValue)
+    KpiValue extends // @@protoc_insertion_point(message_implements:monitoring.KpiValue)
+    com.google.protobuf.GeneratedMessageV3 implements KpiValueOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -10031,8 +10050,9 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.KpiValue}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.KpiValue)
-        monitoring.Monitoring.KpiValueOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:monitoring.KpiValue)
+        Builder extends // @@protoc_insertion_point(builder_implements:monitoring.KpiValue)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.KpiValueOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_KpiValue_descriptor;
@@ -10682,8 +10702,8 @@ public final class Monitoring {
         }
     }
 
-    public interface KpiListOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.KpiList)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:monitoring.KpiList)
+    KpiListOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .monitoring.Kpi kpi = 1;</code>
@@ -10714,8 +10734,9 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.KpiList}
      */
-    public static final class KpiList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.KpiList)
-    KpiListOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:monitoring.KpiList)
+    KpiList extends // @@protoc_insertion_point(message_implements:monitoring.KpiList)
+    com.google.protobuf.GeneratedMessageV3 implements KpiListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -10930,8 +10951,9 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.KpiList}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.KpiList)
-        monitoring.Monitoring.KpiListOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:monitoring.KpiList)
+        Builder extends // @@protoc_insertion_point(builder_implements:monitoring.KpiList)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.KpiListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_KpiList_descriptor;
@@ -11398,8 +11420,8 @@ public final class Monitoring {
         }
     }
 
-    public interface KpiDescriptorListOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.KpiDescriptorList)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:monitoring.KpiDescriptorList)
+    KpiDescriptorListOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1;</code>
@@ -11430,8 +11452,9 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.KpiDescriptorList}
      */
-    public static final class KpiDescriptorList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.KpiDescriptorList)
-    KpiDescriptorListOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:monitoring.KpiDescriptorList)
+    KpiDescriptorList extends // @@protoc_insertion_point(message_implements:monitoring.KpiDescriptorList)
+    com.google.protobuf.GeneratedMessageV3 implements KpiDescriptorListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -11646,8 +11669,9 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.KpiDescriptorList}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.KpiDescriptorList)
-        monitoring.Monitoring.KpiDescriptorListOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:monitoring.KpiDescriptorList)
+        Builder extends // @@protoc_insertion_point(builder_implements:monitoring.KpiDescriptorList)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.KpiDescriptorListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_KpiDescriptorList_descriptor;
@@ -12114,8 +12138,8 @@ public final class Monitoring {
         }
     }
 
-    public interface SubsDescriptorOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.SubsDescriptor)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:monitoring.SubsDescriptor)
+    SubsDescriptorOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.monitoring.SubscriptionID subs_id = 1;</code>
@@ -12225,8 +12249,9 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.SubsDescriptor}
      */
-    public static final class SubsDescriptor extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.SubsDescriptor)
-    SubsDescriptorOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:monitoring.SubsDescriptor)
+    SubsDescriptor extends // @@protoc_insertion_point(message_implements:monitoring.SubsDescriptor)
+    com.google.protobuf.GeneratedMessageV3 implements SubsDescriptorOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -12637,8 +12662,9 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.SubsDescriptor}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.SubsDescriptor)
-        monitoring.Monitoring.SubsDescriptorOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:monitoring.SubsDescriptor)
+        Builder extends // @@protoc_insertion_point(builder_implements:monitoring.SubsDescriptor)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.SubsDescriptorOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_SubsDescriptor_descriptor;
@@ -13524,8 +13550,8 @@ public final class Monitoring {
         }
     }
 
-    public interface SubscriptionIDOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.SubscriptionID)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:monitoring.SubscriptionID)
+    SubscriptionIDOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Uuid subs_id = 1;</code>
@@ -13548,8 +13574,9 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.SubscriptionID}
      */
-    public static final class SubscriptionID extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.SubscriptionID)
-    SubscriptionIDOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:monitoring.SubscriptionID)
+    SubscriptionID extends // @@protoc_insertion_point(message_implements:monitoring.SubscriptionID)
+    com.google.protobuf.GeneratedMessageV3 implements SubscriptionIDOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -13752,8 +13779,9 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.SubscriptionID}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.SubscriptionID)
-        monitoring.Monitoring.SubscriptionIDOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:monitoring.SubscriptionID)
+        Builder extends // @@protoc_insertion_point(builder_implements:monitoring.SubscriptionID)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.SubscriptionIDOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_SubscriptionID_descriptor;
@@ -14063,8 +14091,8 @@ public final class Monitoring {
         }
     }
 
-    public interface SubsResponseOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.SubsResponse)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:monitoring.SubsResponse)
+    SubsResponseOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.monitoring.SubscriptionID subs_id = 1;</code>
@@ -14104,8 +14132,9 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.SubsResponse}
      */
-    public static final class SubsResponse extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.SubsResponse)
-    SubsResponseOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:monitoring.SubsResponse)
+    SubsResponse extends // @@protoc_insertion_point(message_implements:monitoring.SubsResponse)
+    com.google.protobuf.GeneratedMessageV3 implements SubsResponseOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -14354,8 +14383,9 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.SubsResponse}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.SubsResponse)
-        monitoring.Monitoring.SubsResponseOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:monitoring.SubsResponse)
+        Builder extends // @@protoc_insertion_point(builder_implements:monitoring.SubsResponse)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.SubsResponseOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_SubsResponse_descriptor;
@@ -14801,8 +14831,8 @@ public final class Monitoring {
         }
     }
 
-    public interface SubsListOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.SubsList)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:monitoring.SubsList)
+    SubsListOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .monitoring.SubsDescriptor subs_descriptor = 1;</code>
@@ -14833,8 +14863,9 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.SubsList}
      */
-    public static final class SubsList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.SubsList)
-    SubsListOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:monitoring.SubsList)
+    SubsList extends // @@protoc_insertion_point(message_implements:monitoring.SubsList)
+    com.google.protobuf.GeneratedMessageV3 implements SubsListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -15049,8 +15080,9 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.SubsList}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.SubsList)
-        monitoring.Monitoring.SubsListOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:monitoring.SubsList)
+        Builder extends // @@protoc_insertion_point(builder_implements:monitoring.SubsList)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.SubsListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_SubsList_descriptor;
@@ -15517,8 +15549,8 @@ public final class Monitoring {
         }
     }
 
-    public interface AlarmDescriptorOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.AlarmDescriptor)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:monitoring.AlarmDescriptor)
+    AlarmDescriptorOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.monitoring.AlarmID alarm_id = 1;</code>
@@ -15616,8 +15648,9 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.AlarmDescriptor}
      */
-    public static final class AlarmDescriptor extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.AlarmDescriptor)
-    AlarmDescriptorOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:monitoring.AlarmDescriptor)
+    AlarmDescriptor extends // @@protoc_insertion_point(message_implements:monitoring.AlarmDescriptor)
+    com.google.protobuf.GeneratedMessageV3 implements AlarmDescriptorOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -16056,8 +16089,9 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.AlarmDescriptor}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.AlarmDescriptor)
-        monitoring.Monitoring.AlarmDescriptorOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:monitoring.AlarmDescriptor)
+        Builder extends // @@protoc_insertion_point(builder_implements:monitoring.AlarmDescriptor)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.AlarmDescriptorOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_AlarmDescriptor_descriptor;
@@ -16957,8 +16991,8 @@ public final class Monitoring {
         }
     }
 
-    public interface AlarmIDOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.AlarmID)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:monitoring.AlarmID)
+    AlarmIDOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Uuid alarm_id = 1;</code>
@@ -16981,8 +17015,9 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.AlarmID}
      */
-    public static final class AlarmID extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.AlarmID)
-    AlarmIDOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:monitoring.AlarmID)
+    AlarmID extends // @@protoc_insertion_point(message_implements:monitoring.AlarmID)
+    com.google.protobuf.GeneratedMessageV3 implements AlarmIDOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -17185,8 +17220,9 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.AlarmID}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.AlarmID)
-        monitoring.Monitoring.AlarmIDOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:monitoring.AlarmID)
+        Builder extends // @@protoc_insertion_point(builder_implements:monitoring.AlarmID)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.AlarmIDOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_AlarmID_descriptor;
@@ -17496,8 +17532,8 @@ public final class Monitoring {
         }
     }
 
-    public interface AlarmSubscriptionOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.AlarmSubscription)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:monitoring.AlarmSubscription)
+    AlarmSubscriptionOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.monitoring.AlarmID alarm_id = 1;</code>
@@ -17532,8 +17568,9 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.AlarmSubscription}
      */
-    public static final class AlarmSubscription extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.AlarmSubscription)
-    AlarmSubscriptionOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:monitoring.AlarmSubscription)
+    AlarmSubscription extends // @@protoc_insertion_point(message_implements:monitoring.AlarmSubscription)
+    com.google.protobuf.GeneratedMessageV3 implements AlarmSubscriptionOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -17782,8 +17819,9 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.AlarmSubscription}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.AlarmSubscription)
-        monitoring.Monitoring.AlarmSubscriptionOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:monitoring.AlarmSubscription)
+        Builder extends // @@protoc_insertion_point(builder_implements:monitoring.AlarmSubscription)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.AlarmSubscriptionOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_AlarmSubscription_descriptor;
@@ -18189,8 +18227,8 @@ public final class Monitoring {
         }
     }
 
-    public interface AlarmResponseOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.AlarmResponse)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:monitoring.AlarmResponse)
+    AlarmResponseOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.monitoring.AlarmID alarm_id = 1;</code>
@@ -18242,8 +18280,9 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.AlarmResponse}
      */
-    public static final class AlarmResponse extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.AlarmResponse)
-    AlarmResponseOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:monitoring.AlarmResponse)
+    AlarmResponse extends // @@protoc_insertion_point(message_implements:monitoring.AlarmResponse)
+    com.google.protobuf.GeneratedMessageV3 implements AlarmResponseOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -18541,8 +18580,9 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.AlarmResponse}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.AlarmResponse)
-        monitoring.Monitoring.AlarmResponseOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:monitoring.AlarmResponse)
+        Builder extends // @@protoc_insertion_point(builder_implements:monitoring.AlarmResponse)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.AlarmResponseOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_AlarmResponse_descriptor;
@@ -19079,8 +19119,8 @@ public final class Monitoring {
         }
     }
 
-    public interface AlarmListOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.AlarmList)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:monitoring.AlarmList)
+    AlarmListOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .monitoring.AlarmDescriptor alarm_descriptor = 1;</code>
@@ -19111,8 +19151,9 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.AlarmList}
      */
-    public static final class AlarmList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.AlarmList)
-    AlarmListOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:monitoring.AlarmList)
+    AlarmList extends // @@protoc_insertion_point(message_implements:monitoring.AlarmList)
+    com.google.protobuf.GeneratedMessageV3 implements AlarmListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -19327,8 +19368,9 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.AlarmList}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.AlarmList)
-        monitoring.Monitoring.AlarmListOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:monitoring.AlarmList)
+        Builder extends // @@protoc_insertion_point(builder_implements:monitoring.AlarmList)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.AlarmListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_AlarmList_descriptor;
@@ -19795,8 +19837,8 @@ public final class Monitoring {
         }
     }
 
-    public interface SSEMonitoringSubscriptionConfigOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.SSEMonitoringSubscriptionConfig)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:monitoring.SSEMonitoringSubscriptionConfig)
+    SSEMonitoringSubscriptionConfigOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.DeviceId device_id = 1;</code>
@@ -19875,8 +19917,9 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.SSEMonitoringSubscriptionConfig}
      */
-    public static final class SSEMonitoringSubscriptionConfig extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.SSEMonitoringSubscriptionConfig)
-    SSEMonitoringSubscriptionConfigOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:monitoring.SSEMonitoringSubscriptionConfig)
+    SSEMonitoringSubscriptionConfig extends // @@protoc_insertion_point(message_implements:monitoring.SSEMonitoringSubscriptionConfig)
+    com.google.protobuf.GeneratedMessageV3 implements SSEMonitoringSubscriptionConfigOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -20381,8 +20424,9 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.SSEMonitoringSubscriptionConfig}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.SSEMonitoringSubscriptionConfig)
-        monitoring.Monitoring.SSEMonitoringSubscriptionConfigOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:monitoring.SSEMonitoringSubscriptionConfig)
+        Builder extends // @@protoc_insertion_point(builder_implements:monitoring.SSEMonitoringSubscriptionConfig)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.SSEMonitoringSubscriptionConfigOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_SSEMonitoringSubscriptionConfig_descriptor;
@@ -21058,8 +21102,8 @@ public final class Monitoring {
         }
     }
 
-    public interface SSEMonitoringSubscriptionResponseOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.SSEMonitoringSubscriptionResponse)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:monitoring.SSEMonitoringSubscriptionResponse)
+    SSEMonitoringSubscriptionResponseOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>string identifier = 1;</code>
@@ -21089,8 +21133,9 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.SSEMonitoringSubscriptionResponse}
      */
-    public static final class SSEMonitoringSubscriptionResponse extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.SSEMonitoringSubscriptionResponse)
-    SSEMonitoringSubscriptionResponseOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:monitoring.SSEMonitoringSubscriptionResponse)
+    SSEMonitoringSubscriptionResponse extends // @@protoc_insertion_point(message_implements:monitoring.SSEMonitoringSubscriptionResponse)
+    com.google.protobuf.GeneratedMessageV3 implements SSEMonitoringSubscriptionResponseOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -21345,8 +21390,9 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.SSEMonitoringSubscriptionResponse}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.SSEMonitoringSubscriptionResponse)
-        monitoring.Monitoring.SSEMonitoringSubscriptionResponseOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:monitoring.SSEMonitoringSubscriptionResponse)
+        Builder extends // @@protoc_insertion_point(builder_implements:monitoring.SSEMonitoringSubscriptionResponse)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.SSEMonitoringSubscriptionResponseOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_SSEMonitoringSubscriptionResponse_descriptor;
diff --git a/src/policy/target/generated-sources/grpc/policy/Policy.java b/src/policy/target/generated-sources/grpc/policy/Policy.java
index 04d033e66..9f07cd0de 100644
--- a/src/policy/target/generated-sources/grpc/policy/Policy.java
+++ b/src/policy/target/generated-sources/grpc/policy/Policy.java
@@ -303,8 +303,8 @@ public final class Policy {
         }
     }
 
-    public interface PolicyRuleIdOrBuilder extends // @@protoc_insertion_point(interface_extends:policy.PolicyRuleId)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:policy.PolicyRuleId)
+    PolicyRuleIdOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Uuid uuid = 1;</code>
@@ -327,8 +327,9 @@ public final class Policy {
     /**
      * Protobuf type {@code policy.PolicyRuleId}
      */
-    public static final class PolicyRuleId extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:policy.PolicyRuleId)
-    PolicyRuleIdOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:policy.PolicyRuleId)
+    PolicyRuleId extends // @@protoc_insertion_point(message_implements:policy.PolicyRuleId)
+    com.google.protobuf.GeneratedMessageV3 implements PolicyRuleIdOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -531,8 +532,9 @@ public final class Policy {
         /**
          * Protobuf type {@code policy.PolicyRuleId}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:policy.PolicyRuleId)
-        policy.Policy.PolicyRuleIdOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:policy.PolicyRuleId)
+        Builder extends // @@protoc_insertion_point(builder_implements:policy.PolicyRuleId)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements policy.Policy.PolicyRuleIdOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return policy.Policy.internal_static_policy_PolicyRuleId_descriptor;
@@ -842,8 +844,8 @@ public final class Policy {
         }
     }
 
-    public interface PolicyRuleStateOrBuilder extends // @@protoc_insertion_point(interface_extends:policy.PolicyRuleState)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:policy.PolicyRuleState)
+    PolicyRuleStateOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.policy.PolicyRuleStateEnum policyRuleState = 1;</code>
@@ -873,8 +875,9 @@ public final class Policy {
     /**
      * Protobuf type {@code policy.PolicyRuleState}
      */
-    public static final class PolicyRuleState extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:policy.PolicyRuleState)
-    PolicyRuleStateOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:policy.PolicyRuleState)
+    PolicyRuleState extends // @@protoc_insertion_point(message_implements:policy.PolicyRuleState)
+    com.google.protobuf.GeneratedMessageV3 implements PolicyRuleStateOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -1114,8 +1117,9 @@ public final class Policy {
         /**
          * Protobuf type {@code policy.PolicyRuleState}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:policy.PolicyRuleState)
-        policy.Policy.PolicyRuleStateOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:policy.PolicyRuleState)
+        Builder extends // @@protoc_insertion_point(builder_implements:policy.PolicyRuleState)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements policy.Policy.PolicyRuleStateOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return policy.Policy.internal_static_policy_PolicyRuleState_descriptor;
@@ -1453,8 +1457,8 @@ public final class Policy {
         }
     }
 
-    public interface PolicyRuleBasicOrBuilder extends // @@protoc_insertion_point(interface_extends:policy.PolicyRuleBasic)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:policy.PolicyRuleBasic)
+    PolicyRuleBasicOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.policy.PolicyRuleId policyRuleId = 1;</code>
@@ -1590,8 +1594,9 @@ public final class Policy {
      *
      * Protobuf type {@code policy.PolicyRuleBasic}
      */
-    public static final class PolicyRuleBasic extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:policy.PolicyRuleBasic)
-    PolicyRuleBasicOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:policy.PolicyRuleBasic)
+    PolicyRuleBasic extends // @@protoc_insertion_point(message_implements:policy.PolicyRuleBasic)
+    com.google.protobuf.GeneratedMessageV3 implements PolicyRuleBasicOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -2015,8 +2020,9 @@ public final class Policy {
          *
          * Protobuf type {@code policy.PolicyRuleBasic}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:policy.PolicyRuleBasic)
-        policy.Policy.PolicyRuleBasicOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:policy.PolicyRuleBasic)
+        Builder extends // @@protoc_insertion_point(builder_implements:policy.PolicyRuleBasic)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements policy.Policy.PolicyRuleBasicOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return policy.Policy.internal_static_policy_PolicyRuleBasic_descriptor;
@@ -3083,8 +3089,8 @@ public final class Policy {
         }
     }
 
-    public interface PolicyRuleServiceOrBuilder extends // @@protoc_insertion_point(interface_extends:policy.PolicyRuleService)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:policy.PolicyRuleService)
+    PolicyRuleServiceOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <pre>
@@ -3197,8 +3203,9 @@ public final class Policy {
      *
      * Protobuf type {@code policy.PolicyRuleService}
      */
-    public static final class PolicyRuleService extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:policy.PolicyRuleService)
-    PolicyRuleServiceOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:policy.PolicyRuleService)
+    PolicyRuleService extends // @@protoc_insertion_point(message_implements:policy.PolicyRuleService)
+    com.google.protobuf.GeneratedMessageV3 implements PolicyRuleServiceOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -3553,8 +3560,9 @@ public final class Policy {
          *
          * Protobuf type {@code policy.PolicyRuleService}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:policy.PolicyRuleService)
-        policy.Policy.PolicyRuleServiceOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:policy.PolicyRuleService)
+        Builder extends // @@protoc_insertion_point(builder_implements:policy.PolicyRuleService)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements policy.Policy.PolicyRuleServiceOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return policy.Policy.internal_static_policy_PolicyRuleService_descriptor;
@@ -4437,8 +4445,8 @@ public final class Policy {
         }
     }
 
-    public interface PolicyRuleDeviceOrBuilder extends // @@protoc_insertion_point(interface_extends:policy.PolicyRuleDevice)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:policy.PolicyRuleDevice)
+    PolicyRuleDeviceOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <pre>
@@ -4522,8 +4530,9 @@ public final class Policy {
      *
      * Protobuf type {@code policy.PolicyRuleDevice}
      */
-    public static final class PolicyRuleDevice extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:policy.PolicyRuleDevice)
-    PolicyRuleDeviceOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:policy.PolicyRuleDevice)
+    PolicyRuleDevice extends // @@protoc_insertion_point(message_implements:policy.PolicyRuleDevice)
+    com.google.protobuf.GeneratedMessageV3 implements PolicyRuleDeviceOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -4820,8 +4829,9 @@ public final class Policy {
          *
          * Protobuf type {@code policy.PolicyRuleDevice}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:policy.PolicyRuleDevice)
-        policy.Policy.PolicyRuleDeviceOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:policy.PolicyRuleDevice)
+        Builder extends // @@protoc_insertion_point(builder_implements:policy.PolicyRuleDevice)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements policy.Policy.PolicyRuleDeviceOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return policy.Policy.internal_static_policy_PolicyRuleDevice_descriptor;
@@ -5532,8 +5542,8 @@ public final class Policy {
         }
     }
 
-    public interface PolicyRuleOrBuilder extends // @@protoc_insertion_point(interface_extends:policy.PolicyRule)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:policy.PolicyRule)
+    PolicyRuleOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.policy.PolicyRuleService service = 1;</code>
@@ -5579,8 +5589,9 @@ public final class Policy {
      *
      * Protobuf type {@code policy.PolicyRule}
      */
-    public static final class PolicyRule extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:policy.PolicyRule)
-    PolicyRuleOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:policy.PolicyRule)
+    PolicyRule extends // @@protoc_insertion_point(message_implements:policy.PolicyRule)
+    com.google.protobuf.GeneratedMessageV3 implements PolicyRuleOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -5894,8 +5905,9 @@ public final class Policy {
          *
          * Protobuf type {@code policy.PolicyRule}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:policy.PolicyRule)
-        policy.Policy.PolicyRuleOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:policy.PolicyRule)
+        Builder extends // @@protoc_insertion_point(builder_implements:policy.PolicyRule)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements policy.Policy.PolicyRuleOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return policy.Policy.internal_static_policy_PolicyRule_descriptor;
@@ -6416,8 +6428,8 @@ public final class Policy {
         }
     }
 
-    public interface PolicyRuleIdListOrBuilder extends // @@protoc_insertion_point(interface_extends:policy.PolicyRuleIdList)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:policy.PolicyRuleIdList)
+    PolicyRuleIdListOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .policy.PolicyRuleId policyRuleIdList = 1;</code>
@@ -6452,8 +6464,9 @@ public final class Policy {
      *
      * Protobuf type {@code policy.PolicyRuleIdList}
      */
-    public static final class PolicyRuleIdList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:policy.PolicyRuleIdList)
-    PolicyRuleIdListOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:policy.PolicyRuleIdList)
+    PolicyRuleIdList extends // @@protoc_insertion_point(message_implements:policy.PolicyRuleIdList)
+    com.google.protobuf.GeneratedMessageV3 implements PolicyRuleIdListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -6672,8 +6685,9 @@ public final class Policy {
          *
          * Protobuf type {@code policy.PolicyRuleIdList}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:policy.PolicyRuleIdList)
-        policy.Policy.PolicyRuleIdListOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:policy.PolicyRuleIdList)
+        Builder extends // @@protoc_insertion_point(builder_implements:policy.PolicyRuleIdList)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements policy.Policy.PolicyRuleIdListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return policy.Policy.internal_static_policy_PolicyRuleIdList_descriptor;
@@ -7140,8 +7154,8 @@ public final class Policy {
         }
     }
 
-    public interface PolicyRuleServiceListOrBuilder extends // @@protoc_insertion_point(interface_extends:policy.PolicyRuleServiceList)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:policy.PolicyRuleServiceList)
+    PolicyRuleServiceListOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .policy.PolicyRuleService policyRuleServiceList = 1;</code>
@@ -7176,8 +7190,9 @@ public final class Policy {
      *
      * Protobuf type {@code policy.PolicyRuleServiceList}
      */
-    public static final class PolicyRuleServiceList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:policy.PolicyRuleServiceList)
-    PolicyRuleServiceListOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:policy.PolicyRuleServiceList)
+    PolicyRuleServiceList extends // @@protoc_insertion_point(message_implements:policy.PolicyRuleServiceList)
+    com.google.protobuf.GeneratedMessageV3 implements PolicyRuleServiceListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -7396,8 +7411,9 @@ public final class Policy {
          *
          * Protobuf type {@code policy.PolicyRuleServiceList}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:policy.PolicyRuleServiceList)
-        policy.Policy.PolicyRuleServiceListOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:policy.PolicyRuleServiceList)
+        Builder extends // @@protoc_insertion_point(builder_implements:policy.PolicyRuleServiceList)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements policy.Policy.PolicyRuleServiceListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return policy.Policy.internal_static_policy_PolicyRuleServiceList_descriptor;
@@ -7864,8 +7880,8 @@ public final class Policy {
         }
     }
 
-    public interface PolicyRuleDeviceListOrBuilder extends // @@protoc_insertion_point(interface_extends:policy.PolicyRuleDeviceList)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:policy.PolicyRuleDeviceList)
+    PolicyRuleDeviceListOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .policy.PolicyRuleDevice policyRuleDeviceList = 1;</code>
@@ -7900,8 +7916,9 @@ public final class Policy {
      *
      * Protobuf type {@code policy.PolicyRuleDeviceList}
      */
-    public static final class PolicyRuleDeviceList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:policy.PolicyRuleDeviceList)
-    PolicyRuleDeviceListOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:policy.PolicyRuleDeviceList)
+    PolicyRuleDeviceList extends // @@protoc_insertion_point(message_implements:policy.PolicyRuleDeviceList)
+    com.google.protobuf.GeneratedMessageV3 implements PolicyRuleDeviceListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -8120,8 +8137,9 @@ public final class Policy {
          *
          * Protobuf type {@code policy.PolicyRuleDeviceList}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:policy.PolicyRuleDeviceList)
-        policy.Policy.PolicyRuleDeviceListOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:policy.PolicyRuleDeviceList)
+        Builder extends // @@protoc_insertion_point(builder_implements:policy.PolicyRuleDeviceList)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements policy.Policy.PolicyRuleDeviceListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return policy.Policy.internal_static_policy_PolicyRuleDeviceList_descriptor;
@@ -8588,8 +8606,8 @@ public final class Policy {
         }
     }
 
-    public interface PolicyRuleListOrBuilder extends // @@protoc_insertion_point(interface_extends:policy.PolicyRuleList)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:policy.PolicyRuleList)
+    PolicyRuleListOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .policy.PolicyRule policyRules = 1;</code>
@@ -8624,8 +8642,9 @@ public final class Policy {
      *
      * Protobuf type {@code policy.PolicyRuleList}
      */
-    public static final class PolicyRuleList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:policy.PolicyRuleList)
-    PolicyRuleListOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:policy.PolicyRuleList)
+    PolicyRuleList extends // @@protoc_insertion_point(message_implements:policy.PolicyRuleList)
+    com.google.protobuf.GeneratedMessageV3 implements PolicyRuleListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -8844,8 +8863,9 @@ public final class Policy {
          *
          * Protobuf type {@code policy.PolicyRuleList}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:policy.PolicyRuleList)
-        policy.Policy.PolicyRuleListOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:policy.PolicyRuleList)
+        Builder extends // @@protoc_insertion_point(builder_implements:policy.PolicyRuleList)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements policy.Policy.PolicyRuleListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return policy.Policy.internal_static_policy_PolicyRuleList_descriptor;
diff --git a/src/policy/target/generated-sources/grpc/policy/PolicyAction.java b/src/policy/target/generated-sources/grpc/policy/PolicyAction.java
index 097097d6f..eb5ee9f5e 100644
--- a/src/policy/target/generated-sources/grpc/policy/PolicyAction.java
+++ b/src/policy/target/generated-sources/grpc/policy/PolicyAction.java
@@ -160,8 +160,8 @@ public final class PolicyAction {
         }
     }
 
-    public interface PolicyRuleActionOrBuilder extends // @@protoc_insertion_point(interface_extends:policy.PolicyRuleAction)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:policy.PolicyRuleAction)
+    PolicyRuleActionOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.policy.PolicyRuleActionEnum action = 1;</code>
@@ -208,8 +208,9 @@ public final class PolicyAction {
      *
      * Protobuf type {@code policy.PolicyRuleAction}
      */
-    public static final class PolicyRuleAction extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:policy.PolicyRuleAction)
-    PolicyRuleActionOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:policy.PolicyRuleAction)
+    PolicyRuleAction extends // @@protoc_insertion_point(message_implements:policy.PolicyRuleAction)
+    com.google.protobuf.GeneratedMessageV3 implements PolicyRuleActionOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -462,8 +463,9 @@ public final class PolicyAction {
          *
          * Protobuf type {@code policy.PolicyRuleAction}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:policy.PolicyRuleAction)
-        policy.PolicyAction.PolicyRuleActionOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:policy.PolicyRuleAction)
+        Builder extends // @@protoc_insertion_point(builder_implements:policy.PolicyRuleAction)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements policy.PolicyAction.PolicyRuleActionOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return policy.PolicyAction.internal_static_policy_PolicyRuleAction_descriptor;
@@ -1003,8 +1005,8 @@ public final class PolicyAction {
         }
     }
 
-    public interface PolicyRuleActionConfigOrBuilder extends // @@protoc_insertion_point(interface_extends:policy.PolicyRuleActionConfig)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:policy.PolicyRuleActionConfig)
+    PolicyRuleActionConfigOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>string action_key = 1;</code>
@@ -1038,8 +1040,9 @@ public final class PolicyAction {
      *
      * Protobuf type {@code policy.PolicyRuleActionConfig}
      */
-    public static final class PolicyRuleActionConfig extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:policy.PolicyRuleActionConfig)
-    PolicyRuleActionConfigOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:policy.PolicyRuleActionConfig)
+    PolicyRuleActionConfig extends // @@protoc_insertion_point(message_implements:policy.PolicyRuleActionConfig)
+    com.google.protobuf.GeneratedMessageV3 implements PolicyRuleActionConfigOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -1298,8 +1301,9 @@ public final class PolicyAction {
          *
          * Protobuf type {@code policy.PolicyRuleActionConfig}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:policy.PolicyRuleActionConfig)
-        policy.PolicyAction.PolicyRuleActionConfigOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:policy.PolicyRuleActionConfig)
+        Builder extends // @@protoc_insertion_point(builder_implements:policy.PolicyRuleActionConfig)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements policy.PolicyAction.PolicyRuleActionConfigOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return policy.PolicyAction.internal_static_policy_PolicyRuleActionConfig_descriptor;
diff --git a/src/policy/target/generated-sources/grpc/policy/PolicyCondition.java b/src/policy/target/generated-sources/grpc/policy/PolicyCondition.java
index f5b5fd967..9dd6ed753 100644
--- a/src/policy/target/generated-sources/grpc/policy/PolicyCondition.java
+++ b/src/policy/target/generated-sources/grpc/policy/PolicyCondition.java
@@ -372,8 +372,8 @@ public final class PolicyCondition {
         }
     }
 
-    public interface PolicyRuleConditionOrBuilder extends // @@protoc_insertion_point(interface_extends:policy.PolicyRuleCondition)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:policy.PolicyRuleCondition)
+    PolicyRuleConditionOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <pre>
@@ -441,8 +441,9 @@ public final class PolicyCondition {
      *
      * Protobuf type {@code policy.PolicyRuleCondition}
      */
-    public static final class PolicyRuleCondition extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:policy.PolicyRuleCondition)
-    PolicyRuleConditionOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:policy.PolicyRuleCondition)
+    PolicyRuleCondition extends // @@protoc_insertion_point(message_implements:policy.PolicyRuleCondition)
+    com.google.protobuf.GeneratedMessageV3 implements PolicyRuleConditionOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -741,8 +742,9 @@ public final class PolicyCondition {
          *
          * Protobuf type {@code policy.PolicyRuleCondition}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:policy.PolicyRuleCondition)
-        policy.PolicyCondition.PolicyRuleConditionOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:policy.PolicyRuleCondition)
+        Builder extends // @@protoc_insertion_point(builder_implements:policy.PolicyRuleCondition)
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements policy.PolicyCondition.PolicyRuleConditionOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return policy.PolicyCondition.internal_static_policy_PolicyRuleCondition_descriptor;
diff --git a/src/ztp/target/generated-sources/grpc/acl/Acl.java b/src/ztp/target/generated-sources/grpc/acl/Acl.java
index 037bd3858..69677b4cc 100644
--- a/src/ztp/target/generated-sources/grpc/acl/Acl.java
+++ b/src/ztp/target/generated-sources/grpc/acl/Acl.java
@@ -397,8 +397,8 @@ public final class Acl {
         }
     }
 
-    public interface AclMatchOrBuilder extends // @@protoc_insertion_point(interface_extends:acl.AclMatch)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:acl.AclMatch)
+    AclMatchOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>uint32 dscp = 1;</code>
@@ -476,8 +476,9 @@ public final class Acl {
     /**
      * Protobuf type {@code acl.AclMatch}
      */
-    public static final class AclMatch extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:acl.AclMatch)
-    AclMatchOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:acl.AclMatch)
+    // @@protoc_insertion_point(message_implements:acl.AclMatch)
+    AclMatch extends com.google.protobuf.GeneratedMessageV3 implements AclMatchOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -919,8 +920,9 @@ public final class Acl {
         /**
          * Protobuf type {@code acl.AclMatch}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:acl.AclMatch)
-        acl.Acl.AclMatchOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:acl.AclMatch)
+        // @@protoc_insertion_point(builder_implements:acl.AclMatch)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements acl.Acl.AclMatchOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return acl.Acl.internal_static_acl_AclMatch_descriptor;
@@ -1655,8 +1657,8 @@ public final class Acl {
         }
     }
 
-    public interface AclActionOrBuilder extends // @@protoc_insertion_point(interface_extends:acl.AclAction)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:acl.AclAction)
+    AclActionOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.acl.AclForwardActionEnum forward_action = 1;</code>
@@ -1686,8 +1688,9 @@ public final class Acl {
     /**
      * Protobuf type {@code acl.AclAction}
      */
-    public static final class AclAction extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:acl.AclAction)
-    AclActionOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:acl.AclAction)
+    // @@protoc_insertion_point(message_implements:acl.AclAction)
+    AclAction extends com.google.protobuf.GeneratedMessageV3 implements AclActionOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -1912,8 +1915,9 @@ public final class Acl {
         /**
          * Protobuf type {@code acl.AclAction}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:acl.AclAction)
-        acl.Acl.AclActionOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:acl.AclAction)
+        // @@protoc_insertion_point(builder_implements:acl.AclAction)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements acl.Acl.AclActionOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return acl.Acl.internal_static_acl_AclAction_descriptor;
@@ -2233,8 +2237,8 @@ public final class Acl {
         }
     }
 
-    public interface AclEntryOrBuilder extends // @@protoc_insertion_point(interface_extends:acl.AclEntry)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:acl.AclEntry)
+    AclEntryOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>uint32 sequence_id = 1;</code>
@@ -2292,8 +2296,9 @@ public final class Acl {
     /**
      * Protobuf type {@code acl.AclEntry}
      */
-    public static final class AclEntry extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:acl.AclEntry)
-    AclEntryOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:acl.AclEntry)
+    // @@protoc_insertion_point(message_implements:acl.AclEntry)
+    AclEntry extends com.google.protobuf.GeneratedMessageV3 implements AclEntryOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -2614,8 +2619,9 @@ public final class Acl {
         /**
          * Protobuf type {@code acl.AclEntry}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:acl.AclEntry)
-        acl.Acl.AclEntryOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:acl.AclEntry)
+        // @@protoc_insertion_point(builder_implements:acl.AclEntry)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements acl.Acl.AclEntryOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return acl.Acl.internal_static_acl_AclEntry_descriptor;
@@ -3200,8 +3206,8 @@ public final class Acl {
         }
     }
 
-    public interface AclRuleSetOrBuilder extends // @@protoc_insertion_point(interface_extends:acl.AclRuleSet)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:acl.AclRuleSet)
+    AclRuleSetOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>string name = 1;</code>
@@ -3280,8 +3286,9 @@ public final class Acl {
     /**
      * Protobuf type {@code acl.AclRuleSet}
      */
-    public static final class AclRuleSet extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:acl.AclRuleSet)
-    AclRuleSetOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:acl.AclRuleSet)
+    // @@protoc_insertion_point(message_implements:acl.AclRuleSet)
+    AclRuleSet extends com.google.protobuf.GeneratedMessageV3 implements AclRuleSetOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -3677,8 +3684,9 @@ public final class Acl {
         /**
          * Protobuf type {@code acl.AclRuleSet}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:acl.AclRuleSet)
-        acl.Acl.AclRuleSetOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:acl.AclRuleSet)
+        // @@protoc_insertion_point(builder_implements:acl.AclRuleSet)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements acl.Acl.AclRuleSetOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return acl.Acl.internal_static_acl_AclRuleSet_descriptor;
diff --git a/src/ztp/target/generated-sources/grpc/context/ContextOuterClass.java b/src/ztp/target/generated-sources/grpc/context/ContextOuterClass.java
index ceec864c6..a6770316d 100644
--- a/src/ztp/target/generated-sources/grpc/context/ContextOuterClass.java
+++ b/src/ztp/target/generated-sources/grpc/context/ContextOuterClass.java
@@ -1652,8 +1652,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface EmptyOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Empty)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.Empty)
+    EmptyOrBuilder extends com.google.protobuf.MessageOrBuilder {
     }
 
     /**
@@ -1663,8 +1663,9 @@ public final class ContextOuterClass {
      *
      * Protobuf type {@code context.Empty}
      */
-    public static final class Empty extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Empty)
-    EmptyOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.Empty)
+    // @@protoc_insertion_point(message_implements:context.Empty)
+    Empty extends com.google.protobuf.GeneratedMessageV3 implements EmptyOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -1825,8 +1826,9 @@ public final class ContextOuterClass {
          *
          * Protobuf type {@code context.Empty}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Empty)
-        context.ContextOuterClass.EmptyOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.Empty)
+        // @@protoc_insertion_point(builder_implements:context.Empty)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.EmptyOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Empty_descriptor;
@@ -1990,8 +1992,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface UuidOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Uuid)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.Uuid)
+    UuidOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>string uuid = 1;</code>
@@ -2009,8 +2011,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Uuid}
      */
-    public static final class Uuid extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Uuid)
-    UuidOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.Uuid)
+    // @@protoc_insertion_point(message_implements:context.Uuid)
+    Uuid extends com.google.protobuf.GeneratedMessageV3 implements UuidOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -2216,8 +2219,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Uuid}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Uuid)
-        context.ContextOuterClass.UuidOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.Uuid)
+        // @@protoc_insertion_point(builder_implements:context.Uuid)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.UuidOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Uuid_descriptor;
@@ -2482,8 +2486,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface TimestampOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Timestamp)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.Timestamp)
+    TimestampOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>double timestamp = 1;</code>
@@ -2495,8 +2499,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Timestamp}
      */
-    public static final class Timestamp extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Timestamp)
-    TimestampOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.Timestamp)
+    // @@protoc_insertion_point(message_implements:context.Timestamp)
+    Timestamp extends com.google.protobuf.GeneratedMessageV3 implements TimestampOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -2676,8 +2681,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Timestamp}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Timestamp)
-        context.ContextOuterClass.TimestampOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.Timestamp)
+        // @@protoc_insertion_point(builder_implements:context.Timestamp)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.TimestampOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Timestamp_descriptor;
@@ -2899,8 +2905,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface EventOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Event)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.Event)
+    EventOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Timestamp timestamp = 1;</code>
@@ -2935,8 +2941,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Event}
      */
-    public static final class Event extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Event)
-    EventOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.Event)
+    // @@protoc_insertion_point(message_implements:context.Event)
+    Event extends com.google.protobuf.GeneratedMessageV3 implements EventOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -3173,8 +3180,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Event}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Event)
-        context.ContextOuterClass.EventOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.Event)
+        // @@protoc_insertion_point(builder_implements:context.Event)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.EventOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Event_descriptor;
@@ -3557,8 +3565,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface AnyEventOrBuilder extends // @@protoc_insertion_point(interface_extends:context.AnyEvent)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.AnyEvent)
+    AnyEventOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.ContextEvent context = 1;</code>
@@ -3685,8 +3693,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.AnyEvent}
      */
-    public static final class AnyEvent extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.AnyEvent)
-    AnyEventOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.AnyEvent)
+    // @@protoc_insertion_point(message_implements:context.AnyEvent)
+    AnyEvent extends com.google.protobuf.GeneratedMessageV3 implements AnyEventOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -4253,8 +4262,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.AnyEvent}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.AnyEvent)
-        context.ContextOuterClass.AnyEventOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.AnyEvent)
+        // @@protoc_insertion_point(builder_implements:context.AnyEvent)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.AnyEventOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_AnyEvent_descriptor;
@@ -5570,8 +5580,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface ContextIdOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ContextId)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.ContextId)
+    ContextIdOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Uuid context_uuid = 1;</code>
@@ -5598,8 +5608,9 @@ public final class ContextOuterClass {
      *
      * Protobuf type {@code context.ContextId}
      */
-    public static final class ContextId extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ContextId)
-    ContextIdOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.ContextId)
+    // @@protoc_insertion_point(message_implements:context.ContextId)
+    ContextId extends com.google.protobuf.GeneratedMessageV3 implements ContextIdOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -5806,8 +5817,9 @@ public final class ContextOuterClass {
          *
          * Protobuf type {@code context.ContextId}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ContextId)
-        context.ContextOuterClass.ContextIdOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.ContextId)
+        // @@protoc_insertion_point(builder_implements:context.ContextId)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ContextIdOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ContextId_descriptor;
@@ -6117,8 +6129,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface ContextOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Context)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.Context)
+    ContextOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.ContextId context_id = 1;</code>
@@ -6245,8 +6257,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Context}
      */
-    public static final class Context extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Context)
-    ContextOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.Context)
+    // @@protoc_insertion_point(message_implements:context.Context)
+    Context extends com.google.protobuf.GeneratedMessageV3 implements ContextOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -6718,8 +6731,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Context}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Context)
-        context.ContextOuterClass.ContextOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.Context)
+        // @@protoc_insertion_point(builder_implements:context.Context)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ContextOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Context_descriptor;
@@ -8127,8 +8141,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface ContextIdListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ContextIdList)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.ContextIdList)
+    ContextIdListOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.ContextId context_ids = 1;</code>
@@ -8159,8 +8173,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ContextIdList}
      */
-    public static final class ContextIdList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ContextIdList)
-    ContextIdListOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.ContextIdList)
+    // @@protoc_insertion_point(message_implements:context.ContextIdList)
+    ContextIdList extends com.google.protobuf.GeneratedMessageV3 implements ContextIdListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -8375,8 +8390,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ContextIdList}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ContextIdList)
-        context.ContextOuterClass.ContextIdListOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.ContextIdList)
+        // @@protoc_insertion_point(builder_implements:context.ContextIdList)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ContextIdListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ContextIdList_descriptor;
@@ -8843,8 +8859,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface ContextListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ContextList)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.ContextList)
+    ContextListOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.Context contexts = 1;</code>
@@ -8875,8 +8891,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ContextList}
      */
-    public static final class ContextList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ContextList)
-    ContextListOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.ContextList)
+    // @@protoc_insertion_point(message_implements:context.ContextList)
+    ContextList extends com.google.protobuf.GeneratedMessageV3 implements ContextListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -9091,8 +9108,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ContextList}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ContextList)
-        context.ContextOuterClass.ContextListOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.ContextList)
+        // @@protoc_insertion_point(builder_implements:context.ContextList)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ContextListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ContextList_descriptor;
@@ -9559,8 +9577,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface ContextEventOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ContextEvent)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.ContextEvent)
+    ContextEventOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Event event = 1;</code>
@@ -9600,8 +9618,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ContextEvent}
      */
-    public static final class ContextEvent extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ContextEvent)
-    ContextEventOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.ContextEvent)
+    // @@protoc_insertion_point(message_implements:context.ContextEvent)
+    ContextEvent extends com.google.protobuf.GeneratedMessageV3 implements ContextEventOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -9850,8 +9869,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ContextEvent}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ContextEvent)
-        context.ContextOuterClass.ContextEventOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.ContextEvent)
+        // @@protoc_insertion_point(builder_implements:context.ContextEvent)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ContextEventOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ContextEvent_descriptor;
@@ -10297,8 +10317,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface TopologyIdOrBuilder extends // @@protoc_insertion_point(interface_extends:context.TopologyId)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.TopologyId)
+    TopologyIdOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.ContextId context_id = 1;</code>
@@ -10342,8 +10362,9 @@ public final class ContextOuterClass {
      *
      * Protobuf type {@code context.TopologyId}
      */
-    public static final class TopologyId extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.TopologyId)
-    TopologyIdOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.TopologyId)
+    // @@protoc_insertion_point(message_implements:context.TopologyId)
+    TopologyId extends com.google.protobuf.GeneratedMessageV3 implements TopologyIdOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -10596,8 +10617,9 @@ public final class ContextOuterClass {
          *
          * Protobuf type {@code context.TopologyId}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.TopologyId)
-        context.ContextOuterClass.TopologyIdOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.TopologyId)
+        // @@protoc_insertion_point(builder_implements:context.TopologyId)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.TopologyIdOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_TopologyId_descriptor;
@@ -11043,8 +11065,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface TopologyOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Topology)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.Topology)
+    TopologyOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.TopologyId topology_id = 1;</code>
@@ -11154,8 +11176,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Topology}
      */
-    public static final class Topology extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Topology)
-    TopologyOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.Topology)
+    // @@protoc_insertion_point(message_implements:context.Topology)
+    Topology extends com.google.protobuf.GeneratedMessageV3 implements TopologyOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -11581,8 +11604,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Topology}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Topology)
-        context.ContextOuterClass.TopologyOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.Topology)
+        // @@protoc_insertion_point(builder_implements:context.Topology)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.TopologyOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Topology_descriptor;
@@ -12854,8 +12878,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface TopologyDetailsOrBuilder extends // @@protoc_insertion_point(interface_extends:context.TopologyDetails)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.TopologyDetails)
+    TopologyDetailsOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.TopologyId topology_id = 1;</code>
@@ -12965,8 +12989,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.TopologyDetails}
      */
-    public static final class TopologyDetails extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.TopologyDetails)
-    TopologyDetailsOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.TopologyDetails)
+    // @@protoc_insertion_point(message_implements:context.TopologyDetails)
+    TopologyDetails extends com.google.protobuf.GeneratedMessageV3 implements TopologyDetailsOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -13392,8 +13417,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.TopologyDetails}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.TopologyDetails)
-        context.ContextOuterClass.TopologyDetailsOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.TopologyDetails)
+        // @@protoc_insertion_point(builder_implements:context.TopologyDetails)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.TopologyDetailsOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_TopologyDetails_descriptor;
@@ -14665,8 +14691,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface TopologyIdListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.TopologyIdList)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.TopologyIdList)
+    TopologyIdListOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.TopologyId topology_ids = 1;</code>
@@ -14697,8 +14723,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.TopologyIdList}
      */
-    public static final class TopologyIdList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.TopologyIdList)
-    TopologyIdListOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.TopologyIdList)
+    // @@protoc_insertion_point(message_implements:context.TopologyIdList)
+    TopologyIdList extends com.google.protobuf.GeneratedMessageV3 implements TopologyIdListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -14913,8 +14940,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.TopologyIdList}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.TopologyIdList)
-        context.ContextOuterClass.TopologyIdListOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.TopologyIdList)
+        // @@protoc_insertion_point(builder_implements:context.TopologyIdList)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.TopologyIdListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_TopologyIdList_descriptor;
@@ -15381,8 +15409,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface TopologyListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.TopologyList)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.TopologyList)
+    TopologyListOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.Topology topologies = 1;</code>
@@ -15413,8 +15441,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.TopologyList}
      */
-    public static final class TopologyList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.TopologyList)
-    TopologyListOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.TopologyList)
+    // @@protoc_insertion_point(message_implements:context.TopologyList)
+    TopologyList extends com.google.protobuf.GeneratedMessageV3 implements TopologyListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -15629,8 +15658,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.TopologyList}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.TopologyList)
-        context.ContextOuterClass.TopologyListOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.TopologyList)
+        // @@protoc_insertion_point(builder_implements:context.TopologyList)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.TopologyListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_TopologyList_descriptor;
@@ -16097,8 +16127,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface TopologyEventOrBuilder extends // @@protoc_insertion_point(interface_extends:context.TopologyEvent)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.TopologyEvent)
+    TopologyEventOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Event event = 1;</code>
@@ -16138,8 +16168,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.TopologyEvent}
      */
-    public static final class TopologyEvent extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.TopologyEvent)
-    TopologyEventOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.TopologyEvent)
+    // @@protoc_insertion_point(message_implements:context.TopologyEvent)
+    TopologyEvent extends com.google.protobuf.GeneratedMessageV3 implements TopologyEventOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -16388,8 +16419,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.TopologyEvent}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.TopologyEvent)
-        context.ContextOuterClass.TopologyEventOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.TopologyEvent)
+        // @@protoc_insertion_point(builder_implements:context.TopologyEvent)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.TopologyEventOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_TopologyEvent_descriptor;
@@ -16835,8 +16867,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface DeviceIdOrBuilder extends // @@protoc_insertion_point(interface_extends:context.DeviceId)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.DeviceId)
+    DeviceIdOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Uuid device_uuid = 1;</code>
@@ -16863,8 +16895,9 @@ public final class ContextOuterClass {
      *
      * Protobuf type {@code context.DeviceId}
      */
-    public static final class DeviceId extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.DeviceId)
-    DeviceIdOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.DeviceId)
+    // @@protoc_insertion_point(message_implements:context.DeviceId)
+    DeviceId extends com.google.protobuf.GeneratedMessageV3 implements DeviceIdOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -17071,8 +17104,9 @@ public final class ContextOuterClass {
          *
          * Protobuf type {@code context.DeviceId}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.DeviceId)
-        context.ContextOuterClass.DeviceIdOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.DeviceId)
+        // @@protoc_insertion_point(builder_implements:context.DeviceId)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.DeviceIdOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_DeviceId_descriptor;
@@ -17382,8 +17416,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface DeviceOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Device)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.Device)
+    DeviceOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.DeviceId device_id = 1;</code>
@@ -17590,8 +17624,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Device}
      */
-    public static final class Device extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Device)
-    DeviceOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.Device)
+    // @@protoc_insertion_point(message_implements:context.Device)
+    Device extends com.google.protobuf.GeneratedMessageV3 implements DeviceOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -18255,8 +18290,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Device}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Device)
-        context.ContextOuterClass.DeviceOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.Device)
+        // @@protoc_insertion_point(builder_implements:context.Device)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.DeviceOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Device_descriptor;
@@ -19967,8 +20003,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface ComponentOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Component)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.Component)
+    ComponentOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Uuid component_uuid = 1;</code>
@@ -20084,8 +20120,9 @@ public final class ContextOuterClass {
      *
      * Protobuf type {@code context.Component}
      */
-    public static final class Component extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Component)
-    ComponentOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.Component)
+    // @@protoc_insertion_point(message_implements:context.Component)
+    Component extends com.google.protobuf.GeneratedMessageV3 implements ComponentOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -20555,8 +20592,9 @@ public final class ContextOuterClass {
          *
          * Protobuf type {@code context.Component}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Component)
-        context.ContextOuterClass.ComponentOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.Component)
+        // @@protoc_insertion_point(builder_implements:context.Component)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ComponentOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Component_descriptor;
@@ -21334,8 +21372,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface DeviceConfigOrBuilder extends // @@protoc_insertion_point(interface_extends:context.DeviceConfig)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.DeviceConfig)
+    DeviceConfigOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.ConfigRule config_rules = 1;</code>
@@ -21366,8 +21404,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.DeviceConfig}
      */
-    public static final class DeviceConfig extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.DeviceConfig)
-    DeviceConfigOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.DeviceConfig)
+    // @@protoc_insertion_point(message_implements:context.DeviceConfig)
+    DeviceConfig extends com.google.protobuf.GeneratedMessageV3 implements DeviceConfigOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -21582,8 +21621,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.DeviceConfig}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.DeviceConfig)
-        context.ContextOuterClass.DeviceConfigOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.DeviceConfig)
+        // @@protoc_insertion_point(builder_implements:context.DeviceConfig)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.DeviceConfigOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_DeviceConfig_descriptor;
@@ -22050,8 +22090,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface DeviceIdListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.DeviceIdList)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.DeviceIdList)
+    DeviceIdListOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.DeviceId device_ids = 1;</code>
@@ -22082,8 +22122,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.DeviceIdList}
      */
-    public static final class DeviceIdList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.DeviceIdList)
-    DeviceIdListOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.DeviceIdList)
+    // @@protoc_insertion_point(message_implements:context.DeviceIdList)
+    DeviceIdList extends com.google.protobuf.GeneratedMessageV3 implements DeviceIdListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -22298,8 +22339,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.DeviceIdList}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.DeviceIdList)
-        context.ContextOuterClass.DeviceIdListOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.DeviceIdList)
+        // @@protoc_insertion_point(builder_implements:context.DeviceIdList)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.DeviceIdListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_DeviceIdList_descriptor;
@@ -22766,8 +22808,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface DeviceListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.DeviceList)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.DeviceList)
+    DeviceListOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.Device devices = 1;</code>
@@ -22798,8 +22840,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.DeviceList}
      */
-    public static final class DeviceList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.DeviceList)
-    DeviceListOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.DeviceList)
+    // @@protoc_insertion_point(message_implements:context.DeviceList)
+    DeviceList extends com.google.protobuf.GeneratedMessageV3 implements DeviceListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -23014,8 +23057,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.DeviceList}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.DeviceList)
-        context.ContextOuterClass.DeviceListOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.DeviceList)
+        // @@protoc_insertion_point(builder_implements:context.DeviceList)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.DeviceListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_DeviceList_descriptor;
@@ -23482,8 +23526,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface DeviceFilterOrBuilder extends // @@protoc_insertion_point(interface_extends:context.DeviceFilter)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.DeviceFilter)
+    DeviceFilterOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.DeviceIdList device_ids = 1;</code>
@@ -23524,8 +23568,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.DeviceFilter}
      */
-    public static final class DeviceFilter extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.DeviceFilter)
-    DeviceFilterOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.DeviceFilter)
+    // @@protoc_insertion_point(message_implements:context.DeviceFilter)
+    DeviceFilter extends com.google.protobuf.GeneratedMessageV3 implements DeviceFilterOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -23797,8 +23842,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.DeviceFilter}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.DeviceFilter)
-        context.ContextOuterClass.DeviceFilterOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.DeviceFilter)
+        // @@protoc_insertion_point(builder_implements:context.DeviceFilter)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.DeviceFilterOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_DeviceFilter_descriptor;
@@ -24252,8 +24298,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface DeviceEventOrBuilder extends // @@protoc_insertion_point(interface_extends:context.DeviceEvent)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.DeviceEvent)
+    DeviceEventOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Event event = 1;</code>
@@ -24310,8 +24356,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.DeviceEvent}
      */
-    public static final class DeviceEvent extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.DeviceEvent)
-    DeviceEventOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.DeviceEvent)
+    // @@protoc_insertion_point(message_implements:context.DeviceEvent)
+    DeviceEvent extends com.google.protobuf.GeneratedMessageV3 implements DeviceEventOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -24606,8 +24653,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.DeviceEvent}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.DeviceEvent)
-        context.ContextOuterClass.DeviceEventOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.DeviceEvent)
+        // @@protoc_insertion_point(builder_implements:context.DeviceEvent)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.DeviceEventOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_DeviceEvent_descriptor;
@@ -25189,8 +25237,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface LinkIdOrBuilder extends // @@protoc_insertion_point(interface_extends:context.LinkId)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.LinkId)
+    LinkIdOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Uuid link_uuid = 1;</code>
@@ -25217,8 +25265,9 @@ public final class ContextOuterClass {
      *
      * Protobuf type {@code context.LinkId}
      */
-    public static final class LinkId extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.LinkId)
-    LinkIdOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.LinkId)
+    // @@protoc_insertion_point(message_implements:context.LinkId)
+    LinkId extends com.google.protobuf.GeneratedMessageV3 implements LinkIdOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -25425,8 +25474,9 @@ public final class ContextOuterClass {
          *
          * Protobuf type {@code context.LinkId}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.LinkId)
-        context.ContextOuterClass.LinkIdOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.LinkId)
+        // @@protoc_insertion_point(builder_implements:context.LinkId)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.LinkIdOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_LinkId_descriptor;
@@ -25736,8 +25786,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface LinkAttributesOrBuilder extends // @@protoc_insertion_point(interface_extends:context.LinkAttributes)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.LinkAttributes)
+    LinkAttributesOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>bool is_bidirectional = 1;</code>
@@ -25761,8 +25811,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.LinkAttributes}
      */
-    public static final class LinkAttributes extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.LinkAttributes)
-    LinkAttributesOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.LinkAttributes)
+    // @@protoc_insertion_point(message_implements:context.LinkAttributes)
+    LinkAttributes extends com.google.protobuf.GeneratedMessageV3 implements LinkAttributesOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -25988,8 +26039,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.LinkAttributes}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.LinkAttributes)
-        context.ContextOuterClass.LinkAttributesOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.LinkAttributes)
+        // @@protoc_insertion_point(builder_implements:context.LinkAttributes)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.LinkAttributesOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_LinkAttributes_descriptor;
@@ -26307,8 +26359,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface LinkOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Link)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.Link)
+    LinkOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.LinkId link_id = 1;</code>
@@ -26397,8 +26449,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Link}
      */
-    public static final class Link extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Link)
-    LinkOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.Link)
+    // @@protoc_insertion_point(message_implements:context.Link)
+    Link extends com.google.protobuf.GeneratedMessageV3 implements LinkOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -26788,8 +26841,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Link}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Link)
-        context.ContextOuterClass.LinkOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.Link)
+        // @@protoc_insertion_point(builder_implements:context.Link)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.LinkOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Link_descriptor;
@@ -27692,8 +27746,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface LinkIdListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.LinkIdList)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.LinkIdList)
+    LinkIdListOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.LinkId link_ids = 1;</code>
@@ -27724,8 +27778,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.LinkIdList}
      */
-    public static final class LinkIdList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.LinkIdList)
-    LinkIdListOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.LinkIdList)
+    // @@protoc_insertion_point(message_implements:context.LinkIdList)
+    LinkIdList extends com.google.protobuf.GeneratedMessageV3 implements LinkIdListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -27940,8 +27995,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.LinkIdList}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.LinkIdList)
-        context.ContextOuterClass.LinkIdListOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.LinkIdList)
+        // @@protoc_insertion_point(builder_implements:context.LinkIdList)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.LinkIdListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_LinkIdList_descriptor;
@@ -28408,8 +28464,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface LinkListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.LinkList)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.LinkList)
+    LinkListOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.Link links = 1;</code>
@@ -28440,8 +28496,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.LinkList}
      */
-    public static final class LinkList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.LinkList)
-    LinkListOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.LinkList)
+    // @@protoc_insertion_point(message_implements:context.LinkList)
+    LinkList extends com.google.protobuf.GeneratedMessageV3 implements LinkListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -28656,8 +28713,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.LinkList}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.LinkList)
-        context.ContextOuterClass.LinkListOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.LinkList)
+        // @@protoc_insertion_point(builder_implements:context.LinkList)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.LinkListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_LinkList_descriptor;
@@ -29124,8 +29182,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface LinkEventOrBuilder extends // @@protoc_insertion_point(interface_extends:context.LinkEvent)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.LinkEvent)
+    LinkEventOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Event event = 1;</code>
@@ -29165,8 +29223,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.LinkEvent}
      */
-    public static final class LinkEvent extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.LinkEvent)
-    LinkEventOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.LinkEvent)
+    // @@protoc_insertion_point(message_implements:context.LinkEvent)
+    LinkEvent extends com.google.protobuf.GeneratedMessageV3 implements LinkEventOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -29415,8 +29474,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.LinkEvent}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.LinkEvent)
-        context.ContextOuterClass.LinkEventOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.LinkEvent)
+        // @@protoc_insertion_point(builder_implements:context.LinkEvent)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.LinkEventOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_LinkEvent_descriptor;
@@ -29862,8 +29922,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface ServiceIdOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ServiceId)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.ServiceId)
+    ServiceIdOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.ContextId context_id = 1;</code>
@@ -29907,8 +29967,9 @@ public final class ContextOuterClass {
      *
      * Protobuf type {@code context.ServiceId}
      */
-    public static final class ServiceId extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ServiceId)
-    ServiceIdOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.ServiceId)
+    // @@protoc_insertion_point(message_implements:context.ServiceId)
+    ServiceId extends com.google.protobuf.GeneratedMessageV3 implements ServiceIdOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -30161,8 +30222,9 @@ public final class ContextOuterClass {
          *
          * Protobuf type {@code context.ServiceId}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ServiceId)
-        context.ContextOuterClass.ServiceIdOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.ServiceId)
+        // @@protoc_insertion_point(builder_implements:context.ServiceId)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ServiceIdOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ServiceId_descriptor;
@@ -30608,8 +30670,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface ServiceOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Service)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.Service)
+    ServiceOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.ServiceId service_id = 1;</code>
@@ -30757,8 +30819,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Service}
      */
-    public static final class Service extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Service)
-    ServiceOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.Service)
+    // @@protoc_insertion_point(message_implements:context.Service)
+    Service extends com.google.protobuf.GeneratedMessageV3 implements ServiceOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -31298,8 +31361,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Service}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Service)
-        context.ContextOuterClass.ServiceOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.Service)
+        // @@protoc_insertion_point(builder_implements:context.Service)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ServiceOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Service_descriptor;
@@ -32763,8 +32827,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface ServiceStatusOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ServiceStatus)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.ServiceStatus)
+    ServiceStatusOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.ServiceStatusEnum service_status = 1;</code>
@@ -32782,8 +32846,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ServiceStatus}
      */
-    public static final class ServiceStatus extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ServiceStatus)
-    ServiceStatusOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.ServiceStatus)
+    // @@protoc_insertion_point(message_implements:context.ServiceStatus)
+    ServiceStatus extends com.google.protobuf.GeneratedMessageV3 implements ServiceStatusOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -32974,8 +33039,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ServiceStatus}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ServiceStatus)
-        context.ContextOuterClass.ServiceStatusOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.ServiceStatus)
+        // @@protoc_insertion_point(builder_implements:context.ServiceStatus)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ServiceStatusOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ServiceStatus_descriptor;
@@ -33222,8 +33288,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface ServiceConfigOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ServiceConfig)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.ServiceConfig)
+    ServiceConfigOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.ConfigRule config_rules = 1;</code>
@@ -33254,8 +33320,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ServiceConfig}
      */
-    public static final class ServiceConfig extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ServiceConfig)
-    ServiceConfigOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.ServiceConfig)
+    // @@protoc_insertion_point(message_implements:context.ServiceConfig)
+    ServiceConfig extends com.google.protobuf.GeneratedMessageV3 implements ServiceConfigOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -33470,8 +33537,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ServiceConfig}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ServiceConfig)
-        context.ContextOuterClass.ServiceConfigOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.ServiceConfig)
+        // @@protoc_insertion_point(builder_implements:context.ServiceConfig)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ServiceConfigOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ServiceConfig_descriptor;
@@ -33938,8 +34006,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface ServiceIdListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ServiceIdList)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.ServiceIdList)
+    ServiceIdListOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.ServiceId service_ids = 1;</code>
@@ -33970,8 +34038,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ServiceIdList}
      */
-    public static final class ServiceIdList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ServiceIdList)
-    ServiceIdListOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.ServiceIdList)
+    // @@protoc_insertion_point(message_implements:context.ServiceIdList)
+    ServiceIdList extends com.google.protobuf.GeneratedMessageV3 implements ServiceIdListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -34186,8 +34255,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ServiceIdList}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ServiceIdList)
-        context.ContextOuterClass.ServiceIdListOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.ServiceIdList)
+        // @@protoc_insertion_point(builder_implements:context.ServiceIdList)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ServiceIdListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ServiceIdList_descriptor;
@@ -34654,8 +34724,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface ServiceListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ServiceList)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.ServiceList)
+    ServiceListOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.Service services = 1;</code>
@@ -34686,8 +34756,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ServiceList}
      */
-    public static final class ServiceList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ServiceList)
-    ServiceListOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.ServiceList)
+    // @@protoc_insertion_point(message_implements:context.ServiceList)
+    ServiceList extends com.google.protobuf.GeneratedMessageV3 implements ServiceListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -34902,8 +34973,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ServiceList}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ServiceList)
-        context.ContextOuterClass.ServiceListOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.ServiceList)
+        // @@protoc_insertion_point(builder_implements:context.ServiceList)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ServiceListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ServiceList_descriptor;
@@ -35370,8 +35442,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface ServiceFilterOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ServiceFilter)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.ServiceFilter)
+    ServiceFilterOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.ServiceIdList service_ids = 1;</code>
@@ -35412,8 +35484,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ServiceFilter}
      */
-    public static final class ServiceFilter extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ServiceFilter)
-    ServiceFilterOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.ServiceFilter)
+    // @@protoc_insertion_point(message_implements:context.ServiceFilter)
+    ServiceFilter extends com.google.protobuf.GeneratedMessageV3 implements ServiceFilterOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -35685,8 +35758,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ServiceFilter}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ServiceFilter)
-        context.ContextOuterClass.ServiceFilterOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.ServiceFilter)
+        // @@protoc_insertion_point(builder_implements:context.ServiceFilter)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ServiceFilterOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ServiceFilter_descriptor;
@@ -36140,8 +36214,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface ServiceEventOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ServiceEvent)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.ServiceEvent)
+    ServiceEventOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Event event = 1;</code>
@@ -36181,8 +36255,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ServiceEvent}
      */
-    public static final class ServiceEvent extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ServiceEvent)
-    ServiceEventOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.ServiceEvent)
+    // @@protoc_insertion_point(message_implements:context.ServiceEvent)
+    ServiceEvent extends com.google.protobuf.GeneratedMessageV3 implements ServiceEventOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -36431,8 +36506,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ServiceEvent}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ServiceEvent)
-        context.ContextOuterClass.ServiceEventOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.ServiceEvent)
+        // @@protoc_insertion_point(builder_implements:context.ServiceEvent)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ServiceEventOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ServiceEvent_descriptor;
@@ -36878,8 +36954,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface SliceIdOrBuilder extends // @@protoc_insertion_point(interface_extends:context.SliceId)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.SliceId)
+    SliceIdOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.ContextId context_id = 1;</code>
@@ -36923,8 +36999,9 @@ public final class ContextOuterClass {
      *
      * Protobuf type {@code context.SliceId}
      */
-    public static final class SliceId extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.SliceId)
-    SliceIdOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.SliceId)
+    // @@protoc_insertion_point(message_implements:context.SliceId)
+    SliceId extends com.google.protobuf.GeneratedMessageV3 implements SliceIdOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -37177,8 +37254,9 @@ public final class ContextOuterClass {
          *
          * Protobuf type {@code context.SliceId}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.SliceId)
-        context.ContextOuterClass.SliceIdOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.SliceId)
+        // @@protoc_insertion_point(builder_implements:context.SliceId)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.SliceIdOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_SliceId_descriptor;
@@ -37624,8 +37702,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface SliceOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Slice)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.Slice)
+    SliceOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.SliceId slice_id = 1;</code>
@@ -37828,8 +37906,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Slice}
      */
-    public static final class Slice extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Slice)
-    SliceOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.Slice)
+    // @@protoc_insertion_point(message_implements:context.Slice)
+    Slice extends com.google.protobuf.GeneratedMessageV3 implements SliceOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -38497,8 +38576,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Slice}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Slice)
-        context.ContextOuterClass.SliceOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.Slice)
+        // @@protoc_insertion_point(builder_implements:context.Slice)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.SliceOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Slice_descriptor;
@@ -40603,8 +40683,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface SliceOwnerOrBuilder extends // @@protoc_insertion_point(interface_extends:context.SliceOwner)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.SliceOwner)
+    SliceOwnerOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Uuid owner_uuid = 1;</code>
@@ -40639,8 +40719,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.SliceOwner}
      */
-    public static final class SliceOwner extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.SliceOwner)
-    SliceOwnerOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.SliceOwner)
+    // @@protoc_insertion_point(message_implements:context.SliceOwner)
+    SliceOwner extends com.google.protobuf.GeneratedMessageV3 implements SliceOwnerOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -40892,8 +40973,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.SliceOwner}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.SliceOwner)
-        context.ContextOuterClass.SliceOwnerOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.SliceOwner)
+        // @@protoc_insertion_point(builder_implements:context.SliceOwner)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.SliceOwnerOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_SliceOwner_descriptor;
@@ -41294,8 +41376,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface SliceStatusOrBuilder extends // @@protoc_insertion_point(interface_extends:context.SliceStatus)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.SliceStatus)
+    SliceStatusOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.SliceStatusEnum slice_status = 1;</code>
@@ -41313,8 +41395,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.SliceStatus}
      */
-    public static final class SliceStatus extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.SliceStatus)
-    SliceStatusOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.SliceStatus)
+    // @@protoc_insertion_point(message_implements:context.SliceStatus)
+    SliceStatus extends com.google.protobuf.GeneratedMessageV3 implements SliceStatusOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -41505,8 +41588,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.SliceStatus}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.SliceStatus)
-        context.ContextOuterClass.SliceStatusOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.SliceStatus)
+        // @@protoc_insertion_point(builder_implements:context.SliceStatus)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.SliceStatusOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_SliceStatus_descriptor;
@@ -41753,8 +41837,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface SliceConfigOrBuilder extends // @@protoc_insertion_point(interface_extends:context.SliceConfig)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.SliceConfig)
+    SliceConfigOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.ConfigRule config_rules = 1;</code>
@@ -41785,8 +41869,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.SliceConfig}
      */
-    public static final class SliceConfig extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.SliceConfig)
-    SliceConfigOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.SliceConfig)
+    // @@protoc_insertion_point(message_implements:context.SliceConfig)
+    SliceConfig extends com.google.protobuf.GeneratedMessageV3 implements SliceConfigOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -42001,8 +42086,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.SliceConfig}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.SliceConfig)
-        context.ContextOuterClass.SliceConfigOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.SliceConfig)
+        // @@protoc_insertion_point(builder_implements:context.SliceConfig)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.SliceConfigOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_SliceConfig_descriptor;
@@ -42469,8 +42555,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface SliceIdListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.SliceIdList)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.SliceIdList)
+    SliceIdListOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.SliceId slice_ids = 1;</code>
@@ -42501,8 +42587,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.SliceIdList}
      */
-    public static final class SliceIdList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.SliceIdList)
-    SliceIdListOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.SliceIdList)
+    // @@protoc_insertion_point(message_implements:context.SliceIdList)
+    SliceIdList extends com.google.protobuf.GeneratedMessageV3 implements SliceIdListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -42717,8 +42804,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.SliceIdList}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.SliceIdList)
-        context.ContextOuterClass.SliceIdListOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.SliceIdList)
+        // @@protoc_insertion_point(builder_implements:context.SliceIdList)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.SliceIdListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_SliceIdList_descriptor;
@@ -43185,8 +43273,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface SliceListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.SliceList)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.SliceList)
+    SliceListOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.Slice slices = 1;</code>
@@ -43217,8 +43305,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.SliceList}
      */
-    public static final class SliceList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.SliceList)
-    SliceListOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.SliceList)
+    // @@protoc_insertion_point(message_implements:context.SliceList)
+    SliceList extends com.google.protobuf.GeneratedMessageV3 implements SliceListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -43433,8 +43522,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.SliceList}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.SliceList)
-        context.ContextOuterClass.SliceListOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.SliceList)
+        // @@protoc_insertion_point(builder_implements:context.SliceList)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.SliceListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_SliceList_descriptor;
@@ -43901,8 +43991,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface SliceFilterOrBuilder extends // @@protoc_insertion_point(interface_extends:context.SliceFilter)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.SliceFilter)
+    SliceFilterOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.SliceIdList slice_ids = 1;</code>
@@ -43955,8 +44045,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.SliceFilter}
      */
-    public static final class SliceFilter extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.SliceFilter)
-    SliceFilterOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.SliceFilter)
+    // @@protoc_insertion_point(message_implements:context.SliceFilter)
+    SliceFilter extends com.google.protobuf.GeneratedMessageV3 implements SliceFilterOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -44274,8 +44365,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.SliceFilter}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.SliceFilter)
-        context.ContextOuterClass.SliceFilterOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.SliceFilter)
+        // @@protoc_insertion_point(builder_implements:context.SliceFilter)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.SliceFilterOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_SliceFilter_descriptor;
@@ -44825,8 +44917,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface SliceEventOrBuilder extends // @@protoc_insertion_point(interface_extends:context.SliceEvent)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.SliceEvent)
+    SliceEventOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Event event = 1;</code>
@@ -44866,8 +44958,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.SliceEvent}
      */
-    public static final class SliceEvent extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.SliceEvent)
-    SliceEventOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.SliceEvent)
+    // @@protoc_insertion_point(message_implements:context.SliceEvent)
+    SliceEvent extends com.google.protobuf.GeneratedMessageV3 implements SliceEventOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -45116,8 +45209,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.SliceEvent}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.SliceEvent)
-        context.ContextOuterClass.SliceEventOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.SliceEvent)
+        // @@protoc_insertion_point(builder_implements:context.SliceEvent)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.SliceEventOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_SliceEvent_descriptor;
@@ -45563,8 +45657,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface ConnectionIdOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ConnectionId)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.ConnectionId)
+    ConnectionIdOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Uuid connection_uuid = 1;</code>
@@ -45591,8 +45685,9 @@ public final class ContextOuterClass {
      *
      * Protobuf type {@code context.ConnectionId}
      */
-    public static final class ConnectionId extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ConnectionId)
-    ConnectionIdOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.ConnectionId)
+    // @@protoc_insertion_point(message_implements:context.ConnectionId)
+    ConnectionId extends com.google.protobuf.GeneratedMessageV3 implements ConnectionIdOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -45799,8 +45894,9 @@ public final class ContextOuterClass {
          *
          * Protobuf type {@code context.ConnectionId}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ConnectionId)
-        context.ContextOuterClass.ConnectionIdOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.ConnectionId)
+        // @@protoc_insertion_point(builder_implements:context.ConnectionId)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ConnectionIdOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ConnectionId_descriptor;
@@ -46110,8 +46206,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface ConnectionSettings_L0OrBuilder extends // @@protoc_insertion_point(interface_extends:context.ConnectionSettings_L0)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.ConnectionSettings_L0)
+    ConnectionSettings_L0OrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>string lsp_symbolic_name = 1;</code>
@@ -46129,8 +46225,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ConnectionSettings_L0}
      */
-    public static final class ConnectionSettings_L0 extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ConnectionSettings_L0)
-    ConnectionSettings_L0OrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.ConnectionSettings_L0)
+    // @@protoc_insertion_point(message_implements:context.ConnectionSettings_L0)
+    ConnectionSettings_L0 extends com.google.protobuf.GeneratedMessageV3 implements ConnectionSettings_L0OrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -46336,8 +46433,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ConnectionSettings_L0}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ConnectionSettings_L0)
-        context.ContextOuterClass.ConnectionSettings_L0OrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.ConnectionSettings_L0)
+        // @@protoc_insertion_point(builder_implements:context.ConnectionSettings_L0)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ConnectionSettings_L0OrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ConnectionSettings_L0_descriptor;
@@ -46602,8 +46700,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface ConnectionSettings_L2OrBuilder extends // @@protoc_insertion_point(interface_extends:context.ConnectionSettings_L2)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.ConnectionSettings_L2)
+    ConnectionSettings_L2OrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>string src_mac_address = 1;</code>
@@ -46657,8 +46755,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ConnectionSettings_L2}
      */
-    public static final class ConnectionSettings_L2 extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ConnectionSettings_L2)
-    ConnectionSettings_L2OrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.ConnectionSettings_L2)
+    // @@protoc_insertion_point(message_implements:context.ConnectionSettings_L2)
+    ConnectionSettings_L2 extends com.google.protobuf.GeneratedMessageV3 implements ConnectionSettings_L2OrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -47005,8 +47104,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ConnectionSettings_L2}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ConnectionSettings_L2)
-        context.ContextOuterClass.ConnectionSettings_L2OrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.ConnectionSettings_L2)
+        // @@protoc_insertion_point(builder_implements:context.ConnectionSettings_L2)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ConnectionSettings_L2OrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ConnectionSettings_L2_descriptor;
@@ -47554,8 +47654,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface ConnectionSettings_L3OrBuilder extends // @@protoc_insertion_point(interface_extends:context.ConnectionSettings_L3)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.ConnectionSettings_L3)
+    ConnectionSettings_L3OrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>string src_ip_address = 1;</code>
@@ -47603,8 +47703,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ConnectionSettings_L3}
      */
-    public static final class ConnectionSettings_L3 extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ConnectionSettings_L3)
-    ConnectionSettings_L3OrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.ConnectionSettings_L3)
+    // @@protoc_insertion_point(message_implements:context.ConnectionSettings_L3)
+    ConnectionSettings_L3 extends com.google.protobuf.GeneratedMessageV3 implements ConnectionSettings_L3OrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -47928,8 +48029,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ConnectionSettings_L3}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ConnectionSettings_L3)
-        context.ContextOuterClass.ConnectionSettings_L3OrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.ConnectionSettings_L3)
+        // @@protoc_insertion_point(builder_implements:context.ConnectionSettings_L3)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ConnectionSettings_L3OrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ConnectionSettings_L3_descriptor;
@@ -48429,8 +48531,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface ConnectionSettings_L4OrBuilder extends // @@protoc_insertion_point(interface_extends:context.ConnectionSettings_L4)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.ConnectionSettings_L4)
+    ConnectionSettings_L4OrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>uint32 src_port = 1;</code>
@@ -48460,8 +48562,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ConnectionSettings_L4}
      */
-    public static final class ConnectionSettings_L4 extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ConnectionSettings_L4)
-    ConnectionSettings_L4OrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.ConnectionSettings_L4)
+    // @@protoc_insertion_point(message_implements:context.ConnectionSettings_L4)
+    ConnectionSettings_L4 extends com.google.protobuf.GeneratedMessageV3 implements ConnectionSettings_L4OrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -48710,8 +48813,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ConnectionSettings_L4}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ConnectionSettings_L4)
-        context.ContextOuterClass.ConnectionSettings_L4OrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.ConnectionSettings_L4)
+        // @@protoc_insertion_point(builder_implements:context.ConnectionSettings_L4)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ConnectionSettings_L4OrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ConnectionSettings_L4_descriptor;
@@ -49077,8 +49181,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface ConnectionSettingsOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ConnectionSettings)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.ConnectionSettings)
+    ConnectionSettingsOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.ConnectionSettings_L0 l0 = 1;</code>
@@ -49152,8 +49256,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ConnectionSettings}
      */
-    public static final class ConnectionSettings extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ConnectionSettings)
-    ConnectionSettingsOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.ConnectionSettings)
+    // @@protoc_insertion_point(message_implements:context.ConnectionSettings)
+    ConnectionSettings extends com.google.protobuf.GeneratedMessageV3 implements ConnectionSettingsOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -49494,8 +49599,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ConnectionSettings}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ConnectionSettings)
-        context.ContextOuterClass.ConnectionSettingsOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.ConnectionSettings)
+        // @@protoc_insertion_point(builder_implements:context.ConnectionSettings)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ConnectionSettingsOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ConnectionSettings_descriptor;
@@ -50213,8 +50319,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface ConnectionOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Connection)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.Connection)
+    ConnectionOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.ConnectionId connection_id = 1;</code>
@@ -50321,8 +50427,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Connection}
      */
-    public static final class Connection extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Connection)
-    ConnectionOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.Connection)
+    // @@protoc_insertion_point(message_implements:context.Connection)
+    Connection extends com.google.protobuf.GeneratedMessageV3 implements ConnectionOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -50733,8 +50840,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Connection}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Connection)
-        context.ContextOuterClass.ConnectionOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.Connection)
+        // @@protoc_insertion_point(builder_implements:context.Connection)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ConnectionOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Connection_descriptor;
@@ -51898,8 +52006,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface ConnectionIdListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ConnectionIdList)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.ConnectionIdList)
+    ConnectionIdListOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.ConnectionId connection_ids = 1;</code>
@@ -51930,8 +52038,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ConnectionIdList}
      */
-    public static final class ConnectionIdList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ConnectionIdList)
-    ConnectionIdListOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.ConnectionIdList)
+    // @@protoc_insertion_point(message_implements:context.ConnectionIdList)
+    ConnectionIdList extends com.google.protobuf.GeneratedMessageV3 implements ConnectionIdListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -52146,8 +52255,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ConnectionIdList}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ConnectionIdList)
-        context.ContextOuterClass.ConnectionIdListOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.ConnectionIdList)
+        // @@protoc_insertion_point(builder_implements:context.ConnectionIdList)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ConnectionIdListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ConnectionIdList_descriptor;
@@ -52614,8 +52724,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface ConnectionListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ConnectionList)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.ConnectionList)
+    ConnectionListOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.Connection connections = 1;</code>
@@ -52646,8 +52756,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ConnectionList}
      */
-    public static final class ConnectionList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ConnectionList)
-    ConnectionListOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.ConnectionList)
+    // @@protoc_insertion_point(message_implements:context.ConnectionList)
+    ConnectionList extends com.google.protobuf.GeneratedMessageV3 implements ConnectionListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -52862,8 +52973,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ConnectionList}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ConnectionList)
-        context.ContextOuterClass.ConnectionListOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.ConnectionList)
+        // @@protoc_insertion_point(builder_implements:context.ConnectionList)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ConnectionListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ConnectionList_descriptor;
@@ -53330,8 +53442,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface ConnectionEventOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ConnectionEvent)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.ConnectionEvent)
+    ConnectionEventOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Event event = 1;</code>
@@ -53371,8 +53483,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ConnectionEvent}
      */
-    public static final class ConnectionEvent extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ConnectionEvent)
-    ConnectionEventOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.ConnectionEvent)
+    // @@protoc_insertion_point(message_implements:context.ConnectionEvent)
+    ConnectionEvent extends com.google.protobuf.GeneratedMessageV3 implements ConnectionEventOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -53621,8 +53734,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ConnectionEvent}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ConnectionEvent)
-        context.ContextOuterClass.ConnectionEventOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.ConnectionEvent)
+        // @@protoc_insertion_point(builder_implements:context.ConnectionEvent)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ConnectionEventOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ConnectionEvent_descriptor;
@@ -54068,8 +54182,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface EndPointIdOrBuilder extends // @@protoc_insertion_point(interface_extends:context.EndPointId)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.EndPointId)
+    EndPointIdOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.TopologyId topology_id = 1;</code>
@@ -54130,8 +54244,9 @@ public final class ContextOuterClass {
      *
      * Protobuf type {@code context.EndPointId}
      */
-    public static final class EndPointId extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.EndPointId)
-    EndPointIdOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.EndPointId)
+    // @@protoc_insertion_point(message_implements:context.EndPointId)
+    EndPointId extends com.google.protobuf.GeneratedMessageV3 implements EndPointIdOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -54430,8 +54545,9 @@ public final class ContextOuterClass {
          *
          * Protobuf type {@code context.EndPointId}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.EndPointId)
-        context.ContextOuterClass.EndPointIdOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.EndPointId)
+        // @@protoc_insertion_point(builder_implements:context.EndPointId)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.EndPointIdOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_EndPointId_descriptor;
@@ -55013,8 +55129,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface EndPointOrBuilder extends // @@protoc_insertion_point(interface_extends:context.EndPoint)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.EndPoint)
+    EndPointOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.EndPointId endpoint_id = 1;</code>
@@ -55143,8 +55259,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.EndPoint}
      */
-    public static final class EndPoint extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.EndPoint)
-    EndPointOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.EndPoint)
+    // @@protoc_insertion_point(message_implements:context.EndPoint)
+    EndPoint extends com.google.protobuf.GeneratedMessageV3 implements EndPointOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -55680,8 +55797,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.EndPoint}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.EndPoint)
-        context.ContextOuterClass.EndPointOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.EndPoint)
+        // @@protoc_insertion_point(builder_implements:context.EndPoint)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.EndPointOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_EndPoint_descriptor;
@@ -56664,8 +56782,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface EndPointNameOrBuilder extends // @@protoc_insertion_point(interface_extends:context.EndPointName)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.EndPointName)
+    EndPointNameOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.EndPointId endpoint_id = 1;</code>
@@ -56724,8 +56842,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.EndPointName}
      */
-    public static final class EndPointName extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.EndPointName)
-    EndPointNameOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.EndPointName)
+    // @@protoc_insertion_point(message_implements:context.EndPointName)
+    EndPointName extends com.google.protobuf.GeneratedMessageV3 implements EndPointNameOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -57075,8 +57194,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.EndPointName}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.EndPointName)
-        context.ContextOuterClass.EndPointNameOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.EndPointName)
+        // @@protoc_insertion_point(builder_implements:context.EndPointName)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.EndPointNameOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_EndPointName_descriptor;
@@ -57659,8 +57779,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface EndPointIdListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.EndPointIdList)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.EndPointIdList)
+    EndPointIdListOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.EndPointId endpoint_ids = 1;</code>
@@ -57691,8 +57811,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.EndPointIdList}
      */
-    public static final class EndPointIdList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.EndPointIdList)
-    EndPointIdListOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.EndPointIdList)
+    // @@protoc_insertion_point(message_implements:context.EndPointIdList)
+    EndPointIdList extends com.google.protobuf.GeneratedMessageV3 implements EndPointIdListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -57907,8 +58028,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.EndPointIdList}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.EndPointIdList)
-        context.ContextOuterClass.EndPointIdListOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.EndPointIdList)
+        // @@protoc_insertion_point(builder_implements:context.EndPointIdList)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.EndPointIdListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_EndPointIdList_descriptor;
@@ -58375,8 +58497,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface EndPointNameListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.EndPointNameList)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.EndPointNameList)
+    EndPointNameListOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.EndPointName endpoint_names = 1;</code>
@@ -58407,8 +58529,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.EndPointNameList}
      */
-    public static final class EndPointNameList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.EndPointNameList)
-    EndPointNameListOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.EndPointNameList)
+    // @@protoc_insertion_point(message_implements:context.EndPointNameList)
+    EndPointNameList extends com.google.protobuf.GeneratedMessageV3 implements EndPointNameListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -58623,8 +58746,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.EndPointNameList}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.EndPointNameList)
-        context.ContextOuterClass.EndPointNameListOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.EndPointNameList)
+        // @@protoc_insertion_point(builder_implements:context.EndPointNameList)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.EndPointNameListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_EndPointNameList_descriptor;
@@ -59091,8 +59215,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface ConfigRule_CustomOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ConfigRule_Custom)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.ConfigRule_Custom)
+    ConfigRule_CustomOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>string resource_key = 1;</code>
@@ -59122,8 +59246,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ConfigRule_Custom}
      */
-    public static final class ConfigRule_Custom extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ConfigRule_Custom)
-    ConfigRule_CustomOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.ConfigRule_Custom)
+    // @@protoc_insertion_point(message_implements:context.ConfigRule_Custom)
+    ConfigRule_Custom extends com.google.protobuf.GeneratedMessageV3 implements ConfigRule_CustomOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -59378,8 +59503,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ConfigRule_Custom}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ConfigRule_Custom)
-        context.ContextOuterClass.ConfigRule_CustomOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.ConfigRule_Custom)
+        // @@protoc_insertion_point(builder_implements:context.ConfigRule_Custom)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ConfigRule_CustomOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ConfigRule_Custom_descriptor;
@@ -59735,8 +59861,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface ConfigRule_ACLOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ConfigRule_ACL)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.ConfigRule_ACL)
+    ConfigRule_ACLOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.EndPointId endpoint_id = 1;</code>
@@ -59776,8 +59902,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ConfigRule_ACL}
      */
-    public static final class ConfigRule_ACL extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ConfigRule_ACL)
-    ConfigRule_ACLOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.ConfigRule_ACL)
+    // @@protoc_insertion_point(message_implements:context.ConfigRule_ACL)
+    ConfigRule_ACL extends com.google.protobuf.GeneratedMessageV3 implements ConfigRule_ACLOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -60026,8 +60153,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ConfigRule_ACL}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ConfigRule_ACL)
-        context.ContextOuterClass.ConfigRule_ACLOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.ConfigRule_ACL)
+        // @@protoc_insertion_point(builder_implements:context.ConfigRule_ACL)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ConfigRule_ACLOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ConfigRule_ACL_descriptor;
@@ -60473,8 +60601,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface ConfigRule_IP_LINKOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ConfigRule_IP_LINK)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.ConfigRule_IP_LINK)
+    ConfigRule_IP_LINKOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.EndPointId endpoint_id = 1;</code>
@@ -60514,8 +60642,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ConfigRule_IP_LINK}
      */
-    public static final class ConfigRule_IP_LINK extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ConfigRule_IP_LINK)
-    ConfigRule_IP_LINKOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.ConfigRule_IP_LINK)
+    // @@protoc_insertion_point(message_implements:context.ConfigRule_IP_LINK)
+    ConfigRule_IP_LINK extends com.google.protobuf.GeneratedMessageV3 implements ConfigRule_IP_LINKOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -60764,8 +60893,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ConfigRule_IP_LINK}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ConfigRule_IP_LINK)
-        context.ContextOuterClass.ConfigRule_IP_LINKOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.ConfigRule_IP_LINK)
+        // @@protoc_insertion_point(builder_implements:context.ConfigRule_IP_LINK)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ConfigRule_IP_LINKOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ConfigRule_IP_LINK_descriptor;
@@ -61211,8 +61341,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface ConfigRuleOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ConfigRule)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.ConfigRule)
+    ConfigRuleOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.ConfigActionEnum action = 1;</code>
@@ -61283,8 +61413,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ConfigRule}
      */
-    public static final class ConfigRule extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ConfigRule)
-    ConfigRuleOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.ConfigRule)
+    // @@protoc_insertion_point(message_implements:context.ConfigRule)
+    ConfigRule extends com.google.protobuf.GeneratedMessageV3 implements ConfigRuleOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -61678,8 +61809,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ConfigRule}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ConfigRule)
-        context.ContextOuterClass.ConfigRuleOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.ConfigRule)
+        // @@protoc_insertion_point(builder_implements:context.ConfigRule)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ConfigRuleOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ConfigRule_descriptor;
@@ -62432,8 +62564,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface Constraint_CustomOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Constraint_Custom)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.Constraint_Custom)
+    Constraint_CustomOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>string constraint_type = 1;</code>
@@ -62463,8 +62595,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Constraint_Custom}
      */
-    public static final class Constraint_Custom extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Constraint_Custom)
-    Constraint_CustomOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.Constraint_Custom)
+    // @@protoc_insertion_point(message_implements:context.Constraint_Custom)
+    Constraint_Custom extends com.google.protobuf.GeneratedMessageV3 implements Constraint_CustomOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -62719,8 +62852,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Constraint_Custom}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Constraint_Custom)
-        context.ContextOuterClass.Constraint_CustomOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.Constraint_Custom)
+        // @@protoc_insertion_point(builder_implements:context.Constraint_Custom)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.Constraint_CustomOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Constraint_Custom_descriptor;
@@ -63076,8 +63210,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface Constraint_ScheduleOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Constraint_Schedule)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.Constraint_Schedule)
+    Constraint_ScheduleOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>double start_timestamp = 1;</code>
@@ -63095,8 +63229,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Constraint_Schedule}
      */
-    public static final class Constraint_Schedule extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Constraint_Schedule)
-    Constraint_ScheduleOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.Constraint_Schedule)
+    // @@protoc_insertion_point(message_implements:context.Constraint_Schedule)
+    Constraint_Schedule extends com.google.protobuf.GeneratedMessageV3 implements Constraint_ScheduleOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -63299,8 +63434,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Constraint_Schedule}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Constraint_Schedule)
-        context.ContextOuterClass.Constraint_ScheduleOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.Constraint_Schedule)
+        // @@protoc_insertion_point(builder_implements:context.Constraint_Schedule)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.Constraint_ScheduleOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Constraint_Schedule_descriptor;
@@ -63570,8 +63706,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface GPS_PositionOrBuilder extends // @@protoc_insertion_point(interface_extends:context.GPS_Position)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.GPS_Position)
+    GPS_PositionOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>float latitude = 1;</code>
@@ -63589,8 +63725,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.GPS_Position}
      */
-    public static final class GPS_Position extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.GPS_Position)
-    GPS_PositionOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.GPS_Position)
+    // @@protoc_insertion_point(message_implements:context.GPS_Position)
+    GPS_Position extends com.google.protobuf.GeneratedMessageV3 implements GPS_PositionOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -63793,8 +63930,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.GPS_Position}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.GPS_Position)
-        context.ContextOuterClass.GPS_PositionOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.GPS_Position)
+        // @@protoc_insertion_point(builder_implements:context.GPS_Position)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.GPS_PositionOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_GPS_Position_descriptor;
@@ -64064,8 +64202,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface LocationOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Location)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.Location)
+    LocationOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>string region = 1;</code>
@@ -64144,8 +64282,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Location}
      */
-    public static final class Location extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Location)
-    LocationOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.Location)
+    // @@protoc_insertion_point(message_implements:context.Location)
+    Location extends com.google.protobuf.GeneratedMessageV3 implements LocationOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -64606,8 +64745,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Location}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Location)
-        context.ContextOuterClass.LocationOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.Location)
+        // @@protoc_insertion_point(builder_implements:context.Location)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.LocationOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Location_descriptor;
@@ -65302,8 +65442,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface Constraint_EndPointLocationOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Constraint_EndPointLocation)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.Constraint_EndPointLocation)
+    Constraint_EndPointLocationOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.EndPointId endpoint_id = 1;</code>
@@ -65343,8 +65483,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Constraint_EndPointLocation}
      */
-    public static final class Constraint_EndPointLocation extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Constraint_EndPointLocation)
-    Constraint_EndPointLocationOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.Constraint_EndPointLocation)
+    // @@protoc_insertion_point(message_implements:context.Constraint_EndPointLocation)
+    Constraint_EndPointLocation extends com.google.protobuf.GeneratedMessageV3 implements Constraint_EndPointLocationOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -65593,8 +65734,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Constraint_EndPointLocation}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Constraint_EndPointLocation)
-        context.ContextOuterClass.Constraint_EndPointLocationOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.Constraint_EndPointLocation)
+        // @@protoc_insertion_point(builder_implements:context.Constraint_EndPointLocation)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.Constraint_EndPointLocationOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Constraint_EndPointLocation_descriptor;
@@ -66040,8 +66182,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface Constraint_EndPointPriorityOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Constraint_EndPointPriority)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.Constraint_EndPointPriority)
+    Constraint_EndPointPriorityOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.EndPointId endpoint_id = 1;</code>
@@ -66070,8 +66212,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Constraint_EndPointPriority}
      */
-    public static final class Constraint_EndPointPriority extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Constraint_EndPointPriority)
-    Constraint_EndPointPriorityOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.Constraint_EndPointPriority)
+    // @@protoc_insertion_point(message_implements:context.Constraint_EndPointPriority)
+    Constraint_EndPointPriority extends com.google.protobuf.GeneratedMessageV3 implements Constraint_EndPointPriorityOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -66297,8 +66440,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Constraint_EndPointPriority}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Constraint_EndPointPriority)
-        context.ContextOuterClass.Constraint_EndPointPriorityOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.Constraint_EndPointPriority)
+        // @@protoc_insertion_point(builder_implements:context.Constraint_EndPointPriority)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.Constraint_EndPointPriorityOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Constraint_EndPointPriority_descriptor;
@@ -66656,8 +66800,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface Constraint_SLA_LatencyOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Constraint_SLA_Latency)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.Constraint_SLA_Latency)
+    Constraint_SLA_LatencyOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>float e2e_latency_ms = 1;</code>
@@ -66669,8 +66813,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Constraint_SLA_Latency}
      */
-    public static final class Constraint_SLA_Latency extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Constraint_SLA_Latency)
-    Constraint_SLA_LatencyOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.Constraint_SLA_Latency)
+    // @@protoc_insertion_point(message_implements:context.Constraint_SLA_Latency)
+    Constraint_SLA_Latency extends com.google.protobuf.GeneratedMessageV3 implements Constraint_SLA_LatencyOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -66850,8 +66995,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Constraint_SLA_Latency}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Constraint_SLA_Latency)
-        context.ContextOuterClass.Constraint_SLA_LatencyOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.Constraint_SLA_Latency)
+        // @@protoc_insertion_point(builder_implements:context.Constraint_SLA_Latency)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.Constraint_SLA_LatencyOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Constraint_SLA_Latency_descriptor;
@@ -67073,8 +67219,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface Constraint_SLA_CapacityOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Constraint_SLA_Capacity)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.Constraint_SLA_Capacity)
+    Constraint_SLA_CapacityOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>float capacity_gbps = 1;</code>
@@ -67086,8 +67232,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Constraint_SLA_Capacity}
      */
-    public static final class Constraint_SLA_Capacity extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Constraint_SLA_Capacity)
-    Constraint_SLA_CapacityOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.Constraint_SLA_Capacity)
+    // @@protoc_insertion_point(message_implements:context.Constraint_SLA_Capacity)
+    Constraint_SLA_Capacity extends com.google.protobuf.GeneratedMessageV3 implements Constraint_SLA_CapacityOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -67267,8 +67414,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Constraint_SLA_Capacity}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Constraint_SLA_Capacity)
-        context.ContextOuterClass.Constraint_SLA_CapacityOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.Constraint_SLA_Capacity)
+        // @@protoc_insertion_point(builder_implements:context.Constraint_SLA_Capacity)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.Constraint_SLA_CapacityOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Constraint_SLA_Capacity_descriptor;
@@ -67490,8 +67638,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface Constraint_SLA_AvailabilityOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Constraint_SLA_Availability)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.Constraint_SLA_Availability)
+    Constraint_SLA_AvailabilityOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>uint32 num_disjoint_paths = 1;</code>
@@ -67519,8 +67667,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Constraint_SLA_Availability}
      */
-    public static final class Constraint_SLA_Availability extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Constraint_SLA_Availability)
-    Constraint_SLA_AvailabilityOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.Constraint_SLA_Availability)
+    // @@protoc_insertion_point(message_implements:context.Constraint_SLA_Availability)
+    Constraint_SLA_Availability extends com.google.protobuf.GeneratedMessageV3 implements Constraint_SLA_AvailabilityOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -67750,8 +67899,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Constraint_SLA_Availability}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Constraint_SLA_Availability)
-        context.ContextOuterClass.Constraint_SLA_AvailabilityOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.Constraint_SLA_Availability)
+        // @@protoc_insertion_point(builder_implements:context.Constraint_SLA_Availability)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.Constraint_SLA_AvailabilityOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Constraint_SLA_Availability_descriptor;
@@ -68081,8 +68231,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface Constraint_SLA_Isolation_levelOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Constraint_SLA_Isolation_level)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.Constraint_SLA_Isolation_level)
+    Constraint_SLA_Isolation_levelOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.IsolationLevelEnum isolation_level = 1;</code>
@@ -68120,8 +68270,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Constraint_SLA_Isolation_level}
      */
-    public static final class Constraint_SLA_Isolation_level extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Constraint_SLA_Isolation_level)
-    Constraint_SLA_Isolation_levelOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.Constraint_SLA_Isolation_level)
+    // @@protoc_insertion_point(message_implements:context.Constraint_SLA_Isolation_level)
+    Constraint_SLA_Isolation_level extends com.google.protobuf.GeneratedMessageV3 implements Constraint_SLA_Isolation_levelOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -68367,8 +68518,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Constraint_SLA_Isolation_level}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Constraint_SLA_Isolation_level)
-        context.ContextOuterClass.Constraint_SLA_Isolation_levelOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.Constraint_SLA_Isolation_level)
+        // @@protoc_insertion_point(builder_implements:context.Constraint_SLA_Isolation_level)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.Constraint_SLA_Isolation_levelOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Constraint_SLA_Isolation_level_descriptor;
@@ -68730,8 +68882,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface Constraint_ExclusionsOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Constraint_Exclusions)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.Constraint_Exclusions)
+    Constraint_ExclusionsOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>bool is_permanent = 1;</code>
@@ -68818,8 +68970,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Constraint_Exclusions}
      */
-    public static final class Constraint_Exclusions extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Constraint_Exclusions)
-    Constraint_ExclusionsOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.Constraint_Exclusions)
+    // @@protoc_insertion_point(message_implements:context.Constraint_Exclusions)
+    Constraint_Exclusions extends com.google.protobuf.GeneratedMessageV3 implements Constraint_ExclusionsOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -69173,8 +69326,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Constraint_Exclusions}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Constraint_Exclusions)
-        context.ContextOuterClass.Constraint_ExclusionsOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.Constraint_Exclusions)
+        // @@protoc_insertion_point(builder_implements:context.Constraint_Exclusions)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.Constraint_ExclusionsOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Constraint_Exclusions_descriptor;
@@ -70267,8 +70421,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface QoSProfileIdOrBuilder extends // @@protoc_insertion_point(interface_extends:context.QoSProfileId)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.QoSProfileId)
+    QoSProfileIdOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Uuid qos_profile_id = 1;</code>
@@ -70291,8 +70445,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.QoSProfileId}
      */
-    public static final class QoSProfileId extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.QoSProfileId)
-    QoSProfileIdOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.QoSProfileId)
+    // @@protoc_insertion_point(message_implements:context.QoSProfileId)
+    QoSProfileId extends com.google.protobuf.GeneratedMessageV3 implements QoSProfileIdOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -70495,8 +70650,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.QoSProfileId}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.QoSProfileId)
-        context.ContextOuterClass.QoSProfileIdOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.QoSProfileId)
+        // @@protoc_insertion_point(builder_implements:context.QoSProfileId)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.QoSProfileIdOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_QoSProfileId_descriptor;
@@ -70806,8 +70962,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface Constraint_QoSProfileOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Constraint_QoSProfile)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.Constraint_QoSProfile)
+    Constraint_QoSProfileOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.QoSProfileId qos_profile_id = 1;</code>
@@ -70842,8 +70998,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Constraint_QoSProfile}
      */
-    public static final class Constraint_QoSProfile extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Constraint_QoSProfile)
-    Constraint_QoSProfileOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.Constraint_QoSProfile)
+    // @@protoc_insertion_point(message_implements:context.Constraint_QoSProfile)
+    Constraint_QoSProfile extends com.google.protobuf.GeneratedMessageV3 implements Constraint_QoSProfileOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -71095,8 +71252,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Constraint_QoSProfile}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Constraint_QoSProfile)
-        context.ContextOuterClass.Constraint_QoSProfileOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.Constraint_QoSProfile)
+        // @@protoc_insertion_point(builder_implements:context.Constraint_QoSProfile)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.Constraint_QoSProfileOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Constraint_QoSProfile_descriptor;
@@ -71497,8 +71655,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface ConstraintOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Constraint)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.Constraint)
+    ConstraintOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.ConstraintActionEnum action = 1;</code>
@@ -71688,8 +71846,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Constraint}
      */
-    public static final class Constraint extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Constraint)
-    ConstraintOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.Constraint)
+    // @@protoc_insertion_point(message_implements:context.Constraint)
+    Constraint extends com.google.protobuf.GeneratedMessageV3 implements ConstraintOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -72443,8 +72602,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Constraint}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Constraint)
-        context.ContextOuterClass.ConstraintOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.Constraint)
+        // @@protoc_insertion_point(builder_implements:context.Constraint)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ConstraintOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Constraint_descriptor;
@@ -74310,8 +74470,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface TeraFlowControllerOrBuilder extends // @@protoc_insertion_point(interface_extends:context.TeraFlowController)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.TeraFlowController)
+    TeraFlowControllerOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.ContextId context_id = 1;</code>
@@ -74356,8 +74516,9 @@ public final class ContextOuterClass {
      *
      * Protobuf type {@code context.TeraFlowController}
      */
-    public static final class TeraFlowController extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.TeraFlowController)
-    TeraFlowControllerOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.TeraFlowController)
+    // @@protoc_insertion_point(message_implements:context.TeraFlowController)
+    TeraFlowController extends com.google.protobuf.GeneratedMessageV3 implements TeraFlowControllerOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -74636,8 +74797,9 @@ public final class ContextOuterClass {
          *
          * Protobuf type {@code context.TeraFlowController}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.TeraFlowController)
-        context.ContextOuterClass.TeraFlowControllerOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.TeraFlowController)
+        // @@protoc_insertion_point(builder_implements:context.TeraFlowController)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.TeraFlowControllerOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_TeraFlowController_descriptor;
@@ -75086,8 +75248,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface AuthenticationResultOrBuilder extends // @@protoc_insertion_point(interface_extends:context.AuthenticationResult)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.AuthenticationResult)
+    AuthenticationResultOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.ContextId context_id = 1;</code>
@@ -75116,8 +75278,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.AuthenticationResult}
      */
-    public static final class AuthenticationResult extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.AuthenticationResult)
-    AuthenticationResultOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.AuthenticationResult)
+    // @@protoc_insertion_point(message_implements:context.AuthenticationResult)
+    AuthenticationResult extends com.google.protobuf.GeneratedMessageV3 implements AuthenticationResultOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -75343,8 +75506,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.AuthenticationResult}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.AuthenticationResult)
-        context.ContextOuterClass.AuthenticationResultOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.AuthenticationResult)
+        // @@protoc_insertion_point(builder_implements:context.AuthenticationResult)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.AuthenticationResultOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_AuthenticationResult_descriptor;
@@ -75702,8 +75866,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface OpticalConfigIdOrBuilder extends // @@protoc_insertion_point(interface_extends:context.OpticalConfigId)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.OpticalConfigId)
+    OpticalConfigIdOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>string opticalconfig_uuid = 1;</code>
@@ -75725,8 +75889,9 @@ public final class ContextOuterClass {
      *
      * Protobuf type {@code context.OpticalConfigId}
      */
-    public static final class OpticalConfigId extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.OpticalConfigId)
-    OpticalConfigIdOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.OpticalConfigId)
+    // @@protoc_insertion_point(message_implements:context.OpticalConfigId)
+    OpticalConfigId extends com.google.protobuf.GeneratedMessageV3 implements OpticalConfigIdOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -75936,8 +76101,9 @@ public final class ContextOuterClass {
          *
          * Protobuf type {@code context.OpticalConfigId}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.OpticalConfigId)
-        context.ContextOuterClass.OpticalConfigIdOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.OpticalConfigId)
+        // @@protoc_insertion_point(builder_implements:context.OpticalConfigId)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.OpticalConfigIdOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_OpticalConfigId_descriptor;
@@ -76202,8 +76368,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface OpticalConfigOrBuilder extends // @@protoc_insertion_point(interface_extends:context.OpticalConfig)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.OpticalConfig)
+    OpticalConfigOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.OpticalConfigId opticalconfig_id = 1;</code>
@@ -76255,8 +76421,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.OpticalConfig}
      */
-    public static final class OpticalConfig extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.OpticalConfig)
-    OpticalConfigOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.OpticalConfig)
+    // @@protoc_insertion_point(message_implements:context.OpticalConfig)
+    OpticalConfig extends com.google.protobuf.GeneratedMessageV3 implements OpticalConfigOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -76554,8 +76721,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.OpticalConfig}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.OpticalConfig)
-        context.ContextOuterClass.OpticalConfigOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.OpticalConfig)
+        // @@protoc_insertion_point(builder_implements:context.OpticalConfig)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.OpticalConfigOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_OpticalConfig_descriptor;
@@ -77092,8 +77260,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface OpticalConfigListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.OpticalConfigList)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.OpticalConfigList)
+    OpticalConfigListOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.OpticalConfig opticalconfigs = 1;</code>
@@ -77124,8 +77292,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.OpticalConfigList}
      */
-    public static final class OpticalConfigList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.OpticalConfigList)
-    OpticalConfigListOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.OpticalConfigList)
+    // @@protoc_insertion_point(message_implements:context.OpticalConfigList)
+    OpticalConfigList extends com.google.protobuf.GeneratedMessageV3 implements OpticalConfigListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -77340,8 +77509,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.OpticalConfigList}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.OpticalConfigList)
-        context.ContextOuterClass.OpticalConfigListOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.OpticalConfigList)
+        // @@protoc_insertion_point(builder_implements:context.OpticalConfigList)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.OpticalConfigListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_OpticalConfigList_descriptor;
@@ -77808,8 +77978,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface OpticalConfigEventOrBuilder extends // @@protoc_insertion_point(interface_extends:context.OpticalConfigEvent)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.OpticalConfigEvent)
+    OpticalConfigEventOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Event event = 1;</code>
@@ -77849,8 +78019,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.OpticalConfigEvent}
      */
-    public static final class OpticalConfigEvent extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.OpticalConfigEvent)
-    OpticalConfigEventOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.OpticalConfigEvent)
+    // @@protoc_insertion_point(message_implements:context.OpticalConfigEvent)
+    OpticalConfigEvent extends com.google.protobuf.GeneratedMessageV3 implements OpticalConfigEventOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -78099,8 +78270,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.OpticalConfigEvent}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.OpticalConfigEvent)
-        context.ContextOuterClass.OpticalConfigEventOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.OpticalConfigEvent)
+        // @@protoc_insertion_point(builder_implements:context.OpticalConfigEvent)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.OpticalConfigEventOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_OpticalConfigEvent_descriptor;
@@ -78546,8 +78718,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface OpticalEndPointIdOrBuilder extends // @@protoc_insertion_point(interface_extends:context.OpticalEndPointId)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.OpticalEndPointId)
+    OpticalEndPointIdOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.DeviceId device_id = 2;</code>
@@ -78587,8 +78759,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.OpticalEndPointId}
      */
-    public static final class OpticalEndPointId extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.OpticalEndPointId)
-    OpticalEndPointIdOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.OpticalEndPointId)
+    // @@protoc_insertion_point(message_implements:context.OpticalEndPointId)
+    OpticalEndPointId extends com.google.protobuf.GeneratedMessageV3 implements OpticalEndPointIdOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -78837,8 +79010,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.OpticalEndPointId}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.OpticalEndPointId)
-        context.ContextOuterClass.OpticalEndPointIdOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.OpticalEndPointId)
+        // @@protoc_insertion_point(builder_implements:context.OpticalEndPointId)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.OpticalEndPointIdOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_OpticalEndPointId_descriptor;
@@ -79284,8 +79458,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface OpticalLinkListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.OpticalLinkList)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.OpticalLinkList)
+    OpticalLinkListOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.OpticalLink optical_links = 1;</code>
@@ -79316,8 +79490,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.OpticalLinkList}
      */
-    public static final class OpticalLinkList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.OpticalLinkList)
-    OpticalLinkListOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.OpticalLinkList)
+    // @@protoc_insertion_point(message_implements:context.OpticalLinkList)
+    OpticalLinkList extends com.google.protobuf.GeneratedMessageV3 implements OpticalLinkListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -79532,8 +79707,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.OpticalLinkList}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.OpticalLinkList)
-        context.ContextOuterClass.OpticalLinkListOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.OpticalLinkList)
+        // @@protoc_insertion_point(builder_implements:context.OpticalLinkList)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.OpticalLinkListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_OpticalLinkList_descriptor;
@@ -80000,8 +80176,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface OpticalLinkDetailsOrBuilder extends // @@protoc_insertion_point(interface_extends:context.OpticalLinkDetails)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.OpticalLinkDetails)
+    OpticalLinkDetailsOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>float length = 1;</code>
@@ -80160,8 +80336,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.OpticalLinkDetails}
      */
-    public static final class OpticalLinkDetails extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.OpticalLinkDetails)
-    OpticalLinkDetailsOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.OpticalLinkDetails)
+    // @@protoc_insertion_point(message_implements:context.OpticalLinkDetails)
+    OpticalLinkDetails extends com.google.protobuf.GeneratedMessageV3 implements OpticalLinkDetailsOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -80836,8 +81013,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.OpticalLinkDetails}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.OpticalLinkDetails)
-        context.ContextOuterClass.OpticalLinkDetailsOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.OpticalLinkDetails)
+        // @@protoc_insertion_point(builder_implements:context.OpticalLinkDetails)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.OpticalLinkDetailsOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_OpticalLinkDetails_descriptor;
@@ -81925,8 +82103,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface OpticalLinkOrBuilder extends // @@protoc_insertion_point(interface_extends:context.OpticalLink)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.OpticalLink)
+    OpticalLinkOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>string name = 1;</code>
@@ -82003,8 +82181,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.OpticalLink}
      */
-    public static final class OpticalLink extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.OpticalLink)
-    OpticalLinkOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.OpticalLink)
+    // @@protoc_insertion_point(message_implements:context.OpticalLink)
+    OpticalLink extends com.google.protobuf.GeneratedMessageV3 implements OpticalLinkOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -82360,8 +82539,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.OpticalLink}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.OpticalLink)
-        context.ContextOuterClass.OpticalLinkOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.OpticalLink)
+        // @@protoc_insertion_point(builder_implements:context.OpticalLink)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.OpticalLinkOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_OpticalLink_descriptor;
@@ -83191,8 +83371,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface ChannelIdOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ChannelId)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.ChannelId)
+    ChannelIdOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Uuid channel_uuid = 1;</code>
@@ -83215,8 +83395,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ChannelId}
      */
-    public static final class ChannelId extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ChannelId)
-    ChannelIdOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.ChannelId)
+    // @@protoc_insertion_point(message_implements:context.ChannelId)
+    ChannelId extends com.google.protobuf.GeneratedMessageV3 implements ChannelIdOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -83419,8 +83600,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ChannelId}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ChannelId)
-        context.ContextOuterClass.ChannelIdOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.ChannelId)
+        // @@protoc_insertion_point(builder_implements:context.ChannelId)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ChannelIdOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ChannelId_descriptor;
@@ -83730,8 +83912,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface OpticalBandIdOrBuilder extends // @@protoc_insertion_point(interface_extends:context.OpticalBandId)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.OpticalBandId)
+    OpticalBandIdOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Uuid opticalband_uuid = 1;</code>
@@ -83754,8 +83936,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.OpticalBandId}
      */
-    public static final class OpticalBandId extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.OpticalBandId)
-    OpticalBandIdOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.OpticalBandId)
+    // @@protoc_insertion_point(message_implements:context.OpticalBandId)
+    OpticalBandId extends com.google.protobuf.GeneratedMessageV3 implements OpticalBandIdOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -83958,8 +84141,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.OpticalBandId}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.OpticalBandId)
-        context.ContextOuterClass.OpticalBandIdOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.OpticalBandId)
+        // @@protoc_insertion_point(builder_implements:context.OpticalBandId)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.OpticalBandIdOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_OpticalBandId_descriptor;
@@ -84269,8 +84453,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface OpticalBandOrBuilder extends // @@protoc_insertion_point(interface_extends:context.OpticalBand)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.OpticalBand)
+    OpticalBandOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.OpticalBandId opticalband_id = 1;</code>
@@ -84398,8 +84582,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.OpticalBand}
      */
-    public static final class OpticalBand extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.OpticalBand)
-    OpticalBandOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.OpticalBand)
+    // @@protoc_insertion_point(message_implements:context.OpticalBand)
+    OpticalBand extends com.google.protobuf.GeneratedMessageV3 implements OpticalBandOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -84960,8 +85145,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.OpticalBand}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.OpticalBand)
-        context.ContextOuterClass.OpticalBandOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.OpticalBand)
+        // @@protoc_insertion_point(builder_implements:context.OpticalBand)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.OpticalBandOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_OpticalBand_descriptor;
@@ -86137,8 +86323,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface OpticalBandListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.OpticalBandList)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.OpticalBandList)
+    OpticalBandListOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.OpticalBand opticalbands = 1;</code>
@@ -86169,8 +86355,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.OpticalBandList}
      */
-    public static final class OpticalBandList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.OpticalBandList)
-    OpticalBandListOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.OpticalBandList)
+    // @@protoc_insertion_point(message_implements:context.OpticalBandList)
+    OpticalBandList extends com.google.protobuf.GeneratedMessageV3 implements OpticalBandListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -86385,8 +86572,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.OpticalBandList}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.OpticalBandList)
-        context.ContextOuterClass.OpticalBandListOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.OpticalBandList)
+        // @@protoc_insertion_point(builder_implements:context.OpticalBandList)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.OpticalBandListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_OpticalBandList_descriptor;
@@ -86853,8 +87041,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface ServiceConfigRuleOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ServiceConfigRule)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:context.ServiceConfigRule)
+    ServiceConfigRuleOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.ServiceId service_id = 1;</code>
@@ -86894,8 +87082,9 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ServiceConfigRule}
      */
-    public static final class ServiceConfigRule extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ServiceConfigRule)
-    ServiceConfigRuleOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:context.ServiceConfigRule)
+    // @@protoc_insertion_point(message_implements:context.ServiceConfigRule)
+    ServiceConfigRule extends com.google.protobuf.GeneratedMessageV3 implements ServiceConfigRuleOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -87144,8 +87333,9 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ServiceConfigRule}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ServiceConfigRule)
-        context.ContextOuterClass.ServiceConfigRuleOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:context.ServiceConfigRule)
+        // @@protoc_insertion_point(builder_implements:context.ServiceConfigRule)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ServiceConfigRuleOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ServiceConfigRule_descriptor;
diff --git a/src/ztp/target/generated-sources/grpc/device/Device.java b/src/ztp/target/generated-sources/grpc/device/Device.java
index 87c434732..2390aa92d 100644
--- a/src/ztp/target/generated-sources/grpc/device/Device.java
+++ b/src/ztp/target/generated-sources/grpc/device/Device.java
@@ -14,8 +14,8 @@ public final class Device {
         registerAllExtensions((com.google.protobuf.ExtensionRegistryLite) registry);
     }
 
-    public interface MonitoringSettingsOrBuilder extends // @@protoc_insertion_point(interface_extends:device.MonitoringSettings)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:device.MonitoringSettings)
+    MonitoringSettingsOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <pre>
@@ -91,8 +91,9 @@ public final class Device {
     /**
      * Protobuf type {@code device.MonitoringSettings}
      */
-    public static final class MonitoringSettings extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:device.MonitoringSettings)
-    MonitoringSettingsOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:device.MonitoringSettings)
+    // @@protoc_insertion_point(message_implements:device.MonitoringSettings)
+    MonitoringSettings extends com.google.protobuf.GeneratedMessageV3 implements MonitoringSettingsOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -411,8 +412,9 @@ public final class Device {
         /**
          * Protobuf type {@code device.MonitoringSettings}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:device.MonitoringSettings)
-        device.Device.MonitoringSettingsOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:device.MonitoringSettings)
+        // @@protoc_insertion_point(builder_implements:device.MonitoringSettings)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements device.Device.MonitoringSettingsOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return device.Device.internal_static_device_MonitoringSettings_descriptor;
diff --git a/src/ztp/target/generated-sources/grpc/ip_link/IpLink.java b/src/ztp/target/generated-sources/grpc/ip_link/IpLink.java
index 865a27401..6b89ffcef 100644
--- a/src/ztp/target/generated-sources/grpc/ip_link/IpLink.java
+++ b/src/ztp/target/generated-sources/grpc/ip_link/IpLink.java
@@ -14,8 +14,8 @@ public final class IpLink {
         registerAllExtensions((com.google.protobuf.ExtensionRegistryLite) registry);
     }
 
-    public interface IpLinkRuleSetOrBuilder extends // @@protoc_insertion_point(interface_extends:ip_link.IpLinkRuleSet)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:ip_link.IpLinkRuleSet)
+    IpLinkRuleSetOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>string ip = 1;</code>
@@ -57,8 +57,9 @@ public final class IpLink {
     /**
      * Protobuf type {@code ip_link.IpLinkRuleSet}
      */
-    public static final class IpLinkRuleSet extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:ip_link.IpLinkRuleSet)
-    IpLinkRuleSetOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:ip_link.IpLinkRuleSet)
+    // @@protoc_insertion_point(message_implements:ip_link.IpLinkRuleSet)
+    IpLinkRuleSet extends com.google.protobuf.GeneratedMessageV3 implements IpLinkRuleSetOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -362,8 +363,9 @@ public final class IpLink {
         /**
          * Protobuf type {@code ip_link.IpLinkRuleSet}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:ip_link.IpLinkRuleSet)
-        ip_link.IpLink.IpLinkRuleSetOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:ip_link.IpLinkRuleSet)
+        // @@protoc_insertion_point(builder_implements:ip_link.IpLinkRuleSet)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements ip_link.IpLink.IpLinkRuleSetOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return ip_link.IpLink.internal_static_ip_link_IpLinkRuleSet_descriptor;
diff --git a/src/ztp/target/generated-sources/grpc/monitoring/Monitoring.java b/src/ztp/target/generated-sources/grpc/monitoring/Monitoring.java
index 8394fe275..ddd75a0db 100644
--- a/src/ztp/target/generated-sources/grpc/monitoring/Monitoring.java
+++ b/src/ztp/target/generated-sources/grpc/monitoring/Monitoring.java
@@ -14,8 +14,8 @@ public final class Monitoring {
         registerAllExtensions((com.google.protobuf.ExtensionRegistryLite) registry);
     }
 
-    public interface KpiDescriptorOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.KpiDescriptor)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:monitoring.KpiDescriptor)
+    KpiDescriptorOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.monitoring.KpiId kpi_id = 1;</code>
@@ -189,8 +189,9 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.KpiDescriptor}
      */
-    public static final class KpiDescriptor extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.KpiDescriptor)
-    KpiDescriptorOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:monitoring.KpiDescriptor)
+    // @@protoc_insertion_point(message_implements:monitoring.KpiDescriptor)
+    KpiDescriptor extends com.google.protobuf.GeneratedMessageV3 implements KpiDescriptorOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -810,8 +811,9 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.KpiDescriptor}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.KpiDescriptor)
-        monitoring.Monitoring.KpiDescriptorOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:monitoring.KpiDescriptor)
+        // @@protoc_insertion_point(builder_implements:monitoring.KpiDescriptor)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.KpiDescriptorOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_KpiDescriptor_descriptor;
@@ -2394,8 +2396,8 @@ public final class Monitoring {
         }
     }
 
-    public interface MonitorKpiRequestOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.MonitorKpiRequest)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:monitoring.MonitorKpiRequest)
+    MonitorKpiRequestOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.monitoring.KpiId kpi_id = 1;</code>
@@ -2434,8 +2436,9 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.MonitorKpiRequest}
      */
-    public static final class MonitorKpiRequest extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.MonitorKpiRequest)
-    MonitorKpiRequestOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:monitoring.MonitorKpiRequest)
+    // @@protoc_insertion_point(message_implements:monitoring.MonitorKpiRequest)
+    MonitorKpiRequest extends com.google.protobuf.GeneratedMessageV3 implements MonitorKpiRequestOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -2688,8 +2691,9 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.MonitorKpiRequest}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.MonitorKpiRequest)
-        monitoring.Monitoring.MonitorKpiRequestOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:monitoring.MonitorKpiRequest)
+        // @@protoc_insertion_point(builder_implements:monitoring.MonitorKpiRequest)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.MonitorKpiRequestOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_MonitorKpiRequest_descriptor;
@@ -3107,8 +3111,8 @@ public final class Monitoring {
         }
     }
 
-    public interface KpiQueryOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.KpiQuery)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:monitoring.KpiQuery)
+    KpiQueryOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .monitoring.KpiId kpi_ids = 1;</code>
@@ -3213,8 +3217,9 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.KpiQuery}
      */
-    public static final class KpiQuery extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.KpiQuery)
-    KpiQueryOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:monitoring.KpiQuery)
+    // @@protoc_insertion_point(message_implements:monitoring.KpiQuery)
+    KpiQuery extends com.google.protobuf.GeneratedMessageV3 implements KpiQueryOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -3595,8 +3600,9 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.KpiQuery}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.KpiQuery)
-        monitoring.Monitoring.KpiQueryOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:monitoring.KpiQuery)
+        // @@protoc_insertion_point(builder_implements:monitoring.KpiQuery)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.KpiQueryOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_KpiQuery_descriptor;
@@ -4515,8 +4521,8 @@ public final class Monitoring {
         }
     }
 
-    public interface RawKpiOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.RawKpi)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:monitoring.RawKpi)
+    RawKpiOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Timestamp timestamp = 1;</code>
@@ -4560,8 +4566,9 @@ public final class Monitoring {
      *
      * Protobuf type {@code monitoring.RawKpi}
      */
-    public static final class RawKpi extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.RawKpi)
-    RawKpiOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:monitoring.RawKpi)
+    // @@protoc_insertion_point(message_implements:monitoring.RawKpi)
+    RawKpi extends com.google.protobuf.GeneratedMessageV3 implements RawKpiOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -4814,8 +4821,9 @@ public final class Monitoring {
          *
          * Protobuf type {@code monitoring.RawKpi}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.RawKpi)
-        monitoring.Monitoring.RawKpiOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:monitoring.RawKpi)
+        // @@protoc_insertion_point(builder_implements:monitoring.RawKpi)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.RawKpiOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_RawKpi_descriptor;
@@ -5261,8 +5269,8 @@ public final class Monitoring {
         }
     }
 
-    public interface RawKpiListOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.RawKpiList)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:monitoring.RawKpiList)
+    RawKpiListOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.monitoring.KpiId kpi_id = 1;</code>
@@ -5314,8 +5322,9 @@ public final class Monitoring {
      *
      * Protobuf type {@code monitoring.RawKpiList}
      */
-    public static final class RawKpiList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.RawKpiList)
-    RawKpiListOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:monitoring.RawKpiList)
+    // @@protoc_insertion_point(message_implements:monitoring.RawKpiList)
+    RawKpiList extends com.google.protobuf.GeneratedMessageV3 implements RawKpiListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -5580,8 +5589,9 @@ public final class Monitoring {
          *
          * Protobuf type {@code monitoring.RawKpiList}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.RawKpiList)
-        monitoring.Monitoring.RawKpiListOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:monitoring.RawKpiList)
+        // @@protoc_insertion_point(builder_implements:monitoring.RawKpiList)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.RawKpiListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_RawKpiList_descriptor;
@@ -6184,8 +6194,8 @@ public final class Monitoring {
         }
     }
 
-    public interface RawKpiTableOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.RawKpiTable)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:monitoring.RawKpiTable)
+    RawKpiTableOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .monitoring.RawKpiList raw_kpi_lists = 1;</code>
@@ -6220,8 +6230,9 @@ public final class Monitoring {
      *
      * Protobuf type {@code monitoring.RawKpiTable}
      */
-    public static final class RawKpiTable extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.RawKpiTable)
-    RawKpiTableOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:monitoring.RawKpiTable)
+    // @@protoc_insertion_point(message_implements:monitoring.RawKpiTable)
+    RawKpiTable extends com.google.protobuf.GeneratedMessageV3 implements RawKpiTableOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -6440,8 +6451,9 @@ public final class Monitoring {
          *
          * Protobuf type {@code monitoring.RawKpiTable}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.RawKpiTable)
-        monitoring.Monitoring.RawKpiTableOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:monitoring.RawKpiTable)
+        // @@protoc_insertion_point(builder_implements:monitoring.RawKpiTable)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.RawKpiTableOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_RawKpiTable_descriptor;
@@ -6908,8 +6920,8 @@ public final class Monitoring {
         }
     }
 
-    public interface KpiIdOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.KpiId)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:monitoring.KpiId)
+    KpiIdOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Uuid kpi_id = 1;</code>
@@ -6932,8 +6944,9 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.KpiId}
      */
-    public static final class KpiId extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.KpiId)
-    KpiIdOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:monitoring.KpiId)
+    // @@protoc_insertion_point(message_implements:monitoring.KpiId)
+    KpiId extends com.google.protobuf.GeneratedMessageV3 implements KpiIdOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -7136,8 +7149,9 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.KpiId}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.KpiId)
-        monitoring.Monitoring.KpiIdOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:monitoring.KpiId)
+        // @@protoc_insertion_point(builder_implements:monitoring.KpiId)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.KpiIdOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_KpiId_descriptor;
@@ -7447,8 +7461,8 @@ public final class Monitoring {
         }
     }
 
-    public interface KpiOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.Kpi)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:monitoring.Kpi)
+    KpiOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.monitoring.KpiId kpi_id = 1;</code>
@@ -7505,8 +7519,9 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.Kpi}
      */
-    public static final class Kpi extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.Kpi)
-    KpiOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:monitoring.Kpi)
+    // @@protoc_insertion_point(message_implements:monitoring.Kpi)
+    Kpi extends com.google.protobuf.GeneratedMessageV3 implements KpiOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -7801,8 +7816,9 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.Kpi}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.Kpi)
-        monitoring.Monitoring.KpiOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:monitoring.Kpi)
+        // @@protoc_insertion_point(builder_implements:monitoring.Kpi)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.KpiOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_Kpi_descriptor;
@@ -8384,8 +8400,8 @@ public final class Monitoring {
         }
     }
 
-    public interface KpiValueRangeOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.KpiValueRange)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:monitoring.KpiValueRange)
+    KpiValueRangeOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.monitoring.KpiValue kpiMinValue = 1;</code>
@@ -8455,8 +8471,9 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.KpiValueRange}
      */
-    public static final class KpiValueRange extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.KpiValueRange)
-    KpiValueRangeOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:monitoring.KpiValueRange)
+    // @@protoc_insertion_point(message_implements:monitoring.KpiValueRange)
+    KpiValueRange extends com.google.protobuf.GeneratedMessageV3 implements KpiValueRangeOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -8786,8 +8803,9 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.KpiValueRange}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.KpiValueRange)
-        monitoring.Monitoring.KpiValueRangeOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:monitoring.KpiValueRange)
+        // @@protoc_insertion_point(builder_implements:monitoring.KpiValueRange)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.KpiValueRangeOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_KpiValueRange_descriptor;
@@ -9413,8 +9431,8 @@ public final class Monitoring {
         }
     }
 
-    public interface KpiValueOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.KpiValue)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:monitoring.KpiValue)
+    KpiValueOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>int32 int32Val = 1;</code>
@@ -9512,8 +9530,9 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.KpiValue}
      */
-    public static final class KpiValue extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.KpiValue)
-    KpiValueOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:monitoring.KpiValue)
+    // @@protoc_insertion_point(message_implements:monitoring.KpiValue)
+    KpiValue extends com.google.protobuf.GeneratedMessageV3 implements KpiValueOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -10031,8 +10050,9 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.KpiValue}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.KpiValue)
-        monitoring.Monitoring.KpiValueOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:monitoring.KpiValue)
+        // @@protoc_insertion_point(builder_implements:monitoring.KpiValue)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.KpiValueOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_KpiValue_descriptor;
@@ -10682,8 +10702,8 @@ public final class Monitoring {
         }
     }
 
-    public interface KpiListOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.KpiList)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:monitoring.KpiList)
+    KpiListOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .monitoring.Kpi kpi = 1;</code>
@@ -10714,8 +10734,9 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.KpiList}
      */
-    public static final class KpiList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.KpiList)
-    KpiListOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:monitoring.KpiList)
+    // @@protoc_insertion_point(message_implements:monitoring.KpiList)
+    KpiList extends com.google.protobuf.GeneratedMessageV3 implements KpiListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -10930,8 +10951,9 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.KpiList}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.KpiList)
-        monitoring.Monitoring.KpiListOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:monitoring.KpiList)
+        // @@protoc_insertion_point(builder_implements:monitoring.KpiList)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.KpiListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_KpiList_descriptor;
@@ -11398,8 +11420,8 @@ public final class Monitoring {
         }
     }
 
-    public interface KpiDescriptorListOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.KpiDescriptorList)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:monitoring.KpiDescriptorList)
+    KpiDescriptorListOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1;</code>
@@ -11430,8 +11452,9 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.KpiDescriptorList}
      */
-    public static final class KpiDescriptorList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.KpiDescriptorList)
-    KpiDescriptorListOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:monitoring.KpiDescriptorList)
+    // @@protoc_insertion_point(message_implements:monitoring.KpiDescriptorList)
+    KpiDescriptorList extends com.google.protobuf.GeneratedMessageV3 implements KpiDescriptorListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -11646,8 +11669,9 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.KpiDescriptorList}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.KpiDescriptorList)
-        monitoring.Monitoring.KpiDescriptorListOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:monitoring.KpiDescriptorList)
+        // @@protoc_insertion_point(builder_implements:monitoring.KpiDescriptorList)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.KpiDescriptorListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_KpiDescriptorList_descriptor;
@@ -12114,8 +12138,8 @@ public final class Monitoring {
         }
     }
 
-    public interface SubsDescriptorOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.SubsDescriptor)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:monitoring.SubsDescriptor)
+    SubsDescriptorOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.monitoring.SubscriptionID subs_id = 1;</code>
@@ -12225,8 +12249,9 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.SubsDescriptor}
      */
-    public static final class SubsDescriptor extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.SubsDescriptor)
-    SubsDescriptorOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:monitoring.SubsDescriptor)
+    // @@protoc_insertion_point(message_implements:monitoring.SubsDescriptor)
+    SubsDescriptor extends com.google.protobuf.GeneratedMessageV3 implements SubsDescriptorOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -12637,8 +12662,9 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.SubsDescriptor}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.SubsDescriptor)
-        monitoring.Monitoring.SubsDescriptorOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:monitoring.SubsDescriptor)
+        // @@protoc_insertion_point(builder_implements:monitoring.SubsDescriptor)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.SubsDescriptorOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_SubsDescriptor_descriptor;
@@ -13524,8 +13550,8 @@ public final class Monitoring {
         }
     }
 
-    public interface SubscriptionIDOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.SubscriptionID)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:monitoring.SubscriptionID)
+    SubscriptionIDOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Uuid subs_id = 1;</code>
@@ -13548,8 +13574,9 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.SubscriptionID}
      */
-    public static final class SubscriptionID extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.SubscriptionID)
-    SubscriptionIDOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:monitoring.SubscriptionID)
+    // @@protoc_insertion_point(message_implements:monitoring.SubscriptionID)
+    SubscriptionID extends com.google.protobuf.GeneratedMessageV3 implements SubscriptionIDOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -13752,8 +13779,9 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.SubscriptionID}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.SubscriptionID)
-        monitoring.Monitoring.SubscriptionIDOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:monitoring.SubscriptionID)
+        // @@protoc_insertion_point(builder_implements:monitoring.SubscriptionID)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.SubscriptionIDOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_SubscriptionID_descriptor;
@@ -14063,8 +14091,8 @@ public final class Monitoring {
         }
     }
 
-    public interface SubsResponseOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.SubsResponse)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:monitoring.SubsResponse)
+    SubsResponseOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.monitoring.SubscriptionID subs_id = 1;</code>
@@ -14104,8 +14132,9 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.SubsResponse}
      */
-    public static final class SubsResponse extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.SubsResponse)
-    SubsResponseOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:monitoring.SubsResponse)
+    // @@protoc_insertion_point(message_implements:monitoring.SubsResponse)
+    SubsResponse extends com.google.protobuf.GeneratedMessageV3 implements SubsResponseOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -14354,8 +14383,9 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.SubsResponse}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.SubsResponse)
-        monitoring.Monitoring.SubsResponseOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:monitoring.SubsResponse)
+        // @@protoc_insertion_point(builder_implements:monitoring.SubsResponse)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.SubsResponseOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_SubsResponse_descriptor;
@@ -14801,8 +14831,8 @@ public final class Monitoring {
         }
     }
 
-    public interface SubsListOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.SubsList)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:monitoring.SubsList)
+    SubsListOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .monitoring.SubsDescriptor subs_descriptor = 1;</code>
@@ -14833,8 +14863,9 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.SubsList}
      */
-    public static final class SubsList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.SubsList)
-    SubsListOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:monitoring.SubsList)
+    // @@protoc_insertion_point(message_implements:monitoring.SubsList)
+    SubsList extends com.google.protobuf.GeneratedMessageV3 implements SubsListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -15049,8 +15080,9 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.SubsList}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.SubsList)
-        monitoring.Monitoring.SubsListOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:monitoring.SubsList)
+        // @@protoc_insertion_point(builder_implements:monitoring.SubsList)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.SubsListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_SubsList_descriptor;
@@ -15517,8 +15549,8 @@ public final class Monitoring {
         }
     }
 
-    public interface AlarmDescriptorOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.AlarmDescriptor)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:monitoring.AlarmDescriptor)
+    AlarmDescriptorOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.monitoring.AlarmID alarm_id = 1;</code>
@@ -15616,8 +15648,9 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.AlarmDescriptor}
      */
-    public static final class AlarmDescriptor extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.AlarmDescriptor)
-    AlarmDescriptorOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:monitoring.AlarmDescriptor)
+    // @@protoc_insertion_point(message_implements:monitoring.AlarmDescriptor)
+    AlarmDescriptor extends com.google.protobuf.GeneratedMessageV3 implements AlarmDescriptorOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -16056,8 +16089,9 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.AlarmDescriptor}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.AlarmDescriptor)
-        monitoring.Monitoring.AlarmDescriptorOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:monitoring.AlarmDescriptor)
+        // @@protoc_insertion_point(builder_implements:monitoring.AlarmDescriptor)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.AlarmDescriptorOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_AlarmDescriptor_descriptor;
@@ -16957,8 +16991,8 @@ public final class Monitoring {
         }
     }
 
-    public interface AlarmIDOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.AlarmID)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:monitoring.AlarmID)
+    AlarmIDOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Uuid alarm_id = 1;</code>
@@ -16981,8 +17015,9 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.AlarmID}
      */
-    public static final class AlarmID extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.AlarmID)
-    AlarmIDOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:monitoring.AlarmID)
+    // @@protoc_insertion_point(message_implements:monitoring.AlarmID)
+    AlarmID extends com.google.protobuf.GeneratedMessageV3 implements AlarmIDOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -17185,8 +17220,9 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.AlarmID}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.AlarmID)
-        monitoring.Monitoring.AlarmIDOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:monitoring.AlarmID)
+        // @@protoc_insertion_point(builder_implements:monitoring.AlarmID)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.AlarmIDOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_AlarmID_descriptor;
@@ -17496,8 +17532,8 @@ public final class Monitoring {
         }
     }
 
-    public interface AlarmSubscriptionOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.AlarmSubscription)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:monitoring.AlarmSubscription)
+    AlarmSubscriptionOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.monitoring.AlarmID alarm_id = 1;</code>
@@ -17532,8 +17568,9 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.AlarmSubscription}
      */
-    public static final class AlarmSubscription extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.AlarmSubscription)
-    AlarmSubscriptionOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:monitoring.AlarmSubscription)
+    // @@protoc_insertion_point(message_implements:monitoring.AlarmSubscription)
+    AlarmSubscription extends com.google.protobuf.GeneratedMessageV3 implements AlarmSubscriptionOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -17782,8 +17819,9 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.AlarmSubscription}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.AlarmSubscription)
-        monitoring.Monitoring.AlarmSubscriptionOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:monitoring.AlarmSubscription)
+        // @@protoc_insertion_point(builder_implements:monitoring.AlarmSubscription)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.AlarmSubscriptionOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_AlarmSubscription_descriptor;
@@ -18189,8 +18227,8 @@ public final class Monitoring {
         }
     }
 
-    public interface AlarmResponseOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.AlarmResponse)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:monitoring.AlarmResponse)
+    AlarmResponseOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.monitoring.AlarmID alarm_id = 1;</code>
@@ -18242,8 +18280,9 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.AlarmResponse}
      */
-    public static final class AlarmResponse extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.AlarmResponse)
-    AlarmResponseOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:monitoring.AlarmResponse)
+    // @@protoc_insertion_point(message_implements:monitoring.AlarmResponse)
+    AlarmResponse extends com.google.protobuf.GeneratedMessageV3 implements AlarmResponseOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -18541,8 +18580,9 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.AlarmResponse}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.AlarmResponse)
-        monitoring.Monitoring.AlarmResponseOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:monitoring.AlarmResponse)
+        // @@protoc_insertion_point(builder_implements:monitoring.AlarmResponse)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.AlarmResponseOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_AlarmResponse_descriptor;
@@ -19079,8 +19119,8 @@ public final class Monitoring {
         }
     }
 
-    public interface AlarmListOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.AlarmList)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:monitoring.AlarmList)
+    AlarmListOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .monitoring.AlarmDescriptor alarm_descriptor = 1;</code>
@@ -19111,8 +19151,9 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.AlarmList}
      */
-    public static final class AlarmList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.AlarmList)
-    AlarmListOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:monitoring.AlarmList)
+    // @@protoc_insertion_point(message_implements:monitoring.AlarmList)
+    AlarmList extends com.google.protobuf.GeneratedMessageV3 implements AlarmListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -19327,8 +19368,9 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.AlarmList}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.AlarmList)
-        monitoring.Monitoring.AlarmListOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:monitoring.AlarmList)
+        // @@protoc_insertion_point(builder_implements:monitoring.AlarmList)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.AlarmListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_AlarmList_descriptor;
@@ -19795,8 +19837,8 @@ public final class Monitoring {
         }
     }
 
-    public interface SSEMonitoringSubscriptionConfigOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.SSEMonitoringSubscriptionConfig)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:monitoring.SSEMonitoringSubscriptionConfig)
+    SSEMonitoringSubscriptionConfigOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.DeviceId device_id = 1;</code>
@@ -19875,8 +19917,9 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.SSEMonitoringSubscriptionConfig}
      */
-    public static final class SSEMonitoringSubscriptionConfig extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.SSEMonitoringSubscriptionConfig)
-    SSEMonitoringSubscriptionConfigOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:monitoring.SSEMonitoringSubscriptionConfig)
+    // @@protoc_insertion_point(message_implements:monitoring.SSEMonitoringSubscriptionConfig)
+    SSEMonitoringSubscriptionConfig extends com.google.protobuf.GeneratedMessageV3 implements SSEMonitoringSubscriptionConfigOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -20381,8 +20424,9 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.SSEMonitoringSubscriptionConfig}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.SSEMonitoringSubscriptionConfig)
-        monitoring.Monitoring.SSEMonitoringSubscriptionConfigOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:monitoring.SSEMonitoringSubscriptionConfig)
+        // @@protoc_insertion_point(builder_implements:monitoring.SSEMonitoringSubscriptionConfig)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.SSEMonitoringSubscriptionConfigOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_SSEMonitoringSubscriptionConfig_descriptor;
@@ -21058,8 +21102,8 @@ public final class Monitoring {
         }
     }
 
-    public interface SSEMonitoringSubscriptionResponseOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.SSEMonitoringSubscriptionResponse)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:monitoring.SSEMonitoringSubscriptionResponse)
+    SSEMonitoringSubscriptionResponseOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>string identifier = 1;</code>
@@ -21089,8 +21133,9 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.SSEMonitoringSubscriptionResponse}
      */
-    public static final class SSEMonitoringSubscriptionResponse extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.SSEMonitoringSubscriptionResponse)
-    SSEMonitoringSubscriptionResponseOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:monitoring.SSEMonitoringSubscriptionResponse)
+    // @@protoc_insertion_point(message_implements:monitoring.SSEMonitoringSubscriptionResponse)
+    SSEMonitoringSubscriptionResponse extends com.google.protobuf.GeneratedMessageV3 implements SSEMonitoringSubscriptionResponseOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -21345,8 +21390,9 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.SSEMonitoringSubscriptionResponse}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.SSEMonitoringSubscriptionResponse)
-        monitoring.Monitoring.SSEMonitoringSubscriptionResponseOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:monitoring.SSEMonitoringSubscriptionResponse)
+        // @@protoc_insertion_point(builder_implements:monitoring.SSEMonitoringSubscriptionResponse)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.SSEMonitoringSubscriptionResponseOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_SSEMonitoringSubscriptionResponse_descriptor;
diff --git a/src/ztp/target/generated-sources/grpc/ztp/Ztp.java b/src/ztp/target/generated-sources/grpc/ztp/Ztp.java
index 0812fc8eb..4e1c6ae37 100644
--- a/src/ztp/target/generated-sources/grpc/ztp/Ztp.java
+++ b/src/ztp/target/generated-sources/grpc/ztp/Ztp.java
@@ -262,8 +262,8 @@ public final class Ztp {
         }
     }
 
-    public interface DeviceRoleIdOrBuilder extends // @@protoc_insertion_point(interface_extends:ztp.DeviceRoleId)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:ztp.DeviceRoleId)
+    DeviceRoleIdOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Uuid devRoleId = 1;</code>
@@ -303,8 +303,9 @@ public final class Ztp {
     /**
      * Protobuf type {@code ztp.DeviceRoleId}
      */
-    public static final class DeviceRoleId extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:ztp.DeviceRoleId)
-    DeviceRoleIdOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:ztp.DeviceRoleId)
+    // @@protoc_insertion_point(message_implements:ztp.DeviceRoleId)
+    DeviceRoleId extends com.google.protobuf.GeneratedMessageV3 implements DeviceRoleIdOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -553,8 +554,9 @@ public final class Ztp {
         /**
          * Protobuf type {@code ztp.DeviceRoleId}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:ztp.DeviceRoleId)
-        ztp.Ztp.DeviceRoleIdOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:ztp.DeviceRoleId)
+        // @@protoc_insertion_point(builder_implements:ztp.DeviceRoleId)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements ztp.Ztp.DeviceRoleIdOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return ztp.Ztp.internal_static_ztp_DeviceRoleId_descriptor;
@@ -1000,8 +1002,8 @@ public final class Ztp {
         }
     }
 
-    public interface DeviceRoleOrBuilder extends // @@protoc_insertion_point(interface_extends:ztp.DeviceRole)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:ztp.DeviceRole)
+    DeviceRoleOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.ztp.DeviceRoleId devRoleId = 1;</code>
@@ -1036,8 +1038,9 @@ public final class Ztp {
     /**
      * Protobuf type {@code ztp.DeviceRole}
      */
-    public static final class DeviceRole extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:ztp.DeviceRole)
-    DeviceRoleOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:ztp.DeviceRole)
+    // @@protoc_insertion_point(message_implements:ztp.DeviceRole)
+    DeviceRole extends com.google.protobuf.GeneratedMessageV3 implements DeviceRoleOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -1274,8 +1277,9 @@ public final class Ztp {
         /**
          * Protobuf type {@code ztp.DeviceRole}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:ztp.DeviceRole)
-        ztp.Ztp.DeviceRoleOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:ztp.DeviceRole)
+        // @@protoc_insertion_point(builder_implements:ztp.DeviceRole)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements ztp.Ztp.DeviceRoleOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return ztp.Ztp.internal_static_ztp_DeviceRole_descriptor;
@@ -1658,8 +1662,8 @@ public final class Ztp {
         }
     }
 
-    public interface DeviceRoleConfigOrBuilder extends // @@protoc_insertion_point(interface_extends:ztp.DeviceRoleConfig)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:ztp.DeviceRoleConfig)
+    DeviceRoleConfigOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.ztp.DeviceRole devRole = 1;</code>
@@ -1699,8 +1703,9 @@ public final class Ztp {
     /**
      * Protobuf type {@code ztp.DeviceRoleConfig}
      */
-    public static final class DeviceRoleConfig extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:ztp.DeviceRoleConfig)
-    DeviceRoleConfigOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:ztp.DeviceRoleConfig)
+    // @@protoc_insertion_point(message_implements:ztp.DeviceRoleConfig)
+    DeviceRoleConfig extends com.google.protobuf.GeneratedMessageV3 implements DeviceRoleConfigOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -1949,8 +1954,9 @@ public final class Ztp {
         /**
          * Protobuf type {@code ztp.DeviceRoleConfig}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:ztp.DeviceRoleConfig)
-        ztp.Ztp.DeviceRoleConfigOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:ztp.DeviceRoleConfig)
+        // @@protoc_insertion_point(builder_implements:ztp.DeviceRoleConfig)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements ztp.Ztp.DeviceRoleConfigOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return ztp.Ztp.internal_static_ztp_DeviceRoleConfig_descriptor;
@@ -2396,8 +2402,8 @@ public final class Ztp {
         }
     }
 
-    public interface DeviceRoleListOrBuilder extends // @@protoc_insertion_point(interface_extends:ztp.DeviceRoleList)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:ztp.DeviceRoleList)
+    DeviceRoleListOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .ztp.DeviceRole devRole = 1;</code>
@@ -2428,8 +2434,9 @@ public final class Ztp {
     /**
      * Protobuf type {@code ztp.DeviceRoleList}
      */
-    public static final class DeviceRoleList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:ztp.DeviceRoleList)
-    DeviceRoleListOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:ztp.DeviceRoleList)
+    // @@protoc_insertion_point(message_implements:ztp.DeviceRoleList)
+    DeviceRoleList extends com.google.protobuf.GeneratedMessageV3 implements DeviceRoleListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -2644,8 +2651,9 @@ public final class Ztp {
         /**
          * Protobuf type {@code ztp.DeviceRoleList}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:ztp.DeviceRoleList)
-        ztp.Ztp.DeviceRoleListOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:ztp.DeviceRoleList)
+        // @@protoc_insertion_point(builder_implements:ztp.DeviceRoleList)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements ztp.Ztp.DeviceRoleListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return ztp.Ztp.internal_static_ztp_DeviceRoleList_descriptor;
@@ -3112,8 +3120,8 @@ public final class Ztp {
         }
     }
 
-    public interface DeviceRoleStateOrBuilder extends // @@protoc_insertion_point(interface_extends:ztp.DeviceRoleState)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:ztp.DeviceRoleState)
+    DeviceRoleStateOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.ztp.DeviceRoleId devRoleId = 1;</code>
@@ -3148,8 +3156,9 @@ public final class Ztp {
     /**
      * Protobuf type {@code ztp.DeviceRoleState}
      */
-    public static final class DeviceRoleState extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:ztp.DeviceRoleState)
-    DeviceRoleStateOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:ztp.DeviceRoleState)
+    // @@protoc_insertion_point(message_implements:ztp.DeviceRoleState)
+    DeviceRoleState extends com.google.protobuf.GeneratedMessageV3 implements DeviceRoleStateOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -3386,8 +3395,9 @@ public final class Ztp {
         /**
          * Protobuf type {@code ztp.DeviceRoleState}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:ztp.DeviceRoleState)
-        ztp.Ztp.DeviceRoleStateOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:ztp.DeviceRoleState)
+        // @@protoc_insertion_point(builder_implements:ztp.DeviceRoleState)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements ztp.Ztp.DeviceRoleStateOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return ztp.Ztp.internal_static_ztp_DeviceRoleState_descriptor;
@@ -3770,8 +3780,8 @@ public final class Ztp {
         }
     }
 
-    public interface DeviceDeletionResultOrBuilder extends // @@protoc_insertion_point(interface_extends:ztp.DeviceDeletionResult)
-    com.google.protobuf.MessageOrBuilder {
+    public interface // @@protoc_insertion_point(interface_extends:ztp.DeviceDeletionResult)
+    DeviceDeletionResultOrBuilder extends com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated string deleted = 1;</code>
@@ -3803,8 +3813,9 @@ public final class Ztp {
     /**
      * Protobuf type {@code ztp.DeviceDeletionResult}
      */
-    public static final class DeviceDeletionResult extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:ztp.DeviceDeletionResult)
-    DeviceDeletionResultOrBuilder {
+    public static final class // @@protoc_insertion_point(message_implements:ztp.DeviceDeletionResult)
+    // @@protoc_insertion_point(message_implements:ztp.DeviceDeletionResult)
+    DeviceDeletionResult extends com.google.protobuf.GeneratedMessageV3 implements DeviceDeletionResultOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -4018,8 +4029,9 @@ public final class Ztp {
         /**
          * Protobuf type {@code ztp.DeviceDeletionResult}
          */
-        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:ztp.DeviceDeletionResult)
-        ztp.Ztp.DeviceDeletionResultOrBuilder {
+        public static final class // @@protoc_insertion_point(builder_implements:ztp.DeviceDeletionResult)
+        // @@protoc_insertion_point(builder_implements:ztp.DeviceDeletionResult)
+        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements ztp.Ztp.DeviceDeletionResultOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return ztp.Ztp.internal_static_ztp_DeviceDeletionResult_descriptor;
-- 
GitLab


From c68f0fc985a5bce1b2fe14d2cc82ebfb1a680416 Mon Sep 17 00:00:00 2001
From: gifrerenom <lluis.gifre@cttc.es>
Date: Tue, 28 Oct 2025 10:25:08 +0000
Subject: [PATCH 6/7] Policy and ZTP components:

- Rebuild gRPC/Proto files
---
 .../generated-sources/grpc/acl/Acl.java       |   56 +-
 .../grpc/context/ContextOuterClass.java       | 1622 +++++++++--------
 .../generated-sources/grpc/device/Device.java |   14 +-
 .../grpc/ip_link/IpLink.java                  |   14 +-
 .../grpc/monitoring/Monitoring.java           |  322 ++--
 .../generated-sources/grpc/policy/Policy.java |  140 +-
 .../grpc/policy/PolicyAction.java             |   28 +-
 .../grpc/policy/PolicyCondition.java          |   14 +-
 src/policy/target/kubernetes/kubernetes.yml   |   38 +-
 .../generated-sources/grpc/acl/Acl.java       |   56 +-
 .../grpc/context/ContextOuterClass.java       | 1622 +++++++++--------
 .../generated-sources/grpc/device/Device.java |   14 +-
 .../grpc/ip_link/IpLink.java                  |   14 +-
 .../grpc/monitoring/Monitoring.java           |  322 ++--
 .../generated-sources/grpc/ztp/Ztp.java       |   84 +-
 src/ztp/target/kubernetes/kubernetes.yml      |   40 +-
 16 files changed, 2165 insertions(+), 2235 deletions(-)

diff --git a/src/policy/target/generated-sources/grpc/acl/Acl.java b/src/policy/target/generated-sources/grpc/acl/Acl.java
index 64d70d842..037bd3858 100644
--- a/src/policy/target/generated-sources/grpc/acl/Acl.java
+++ b/src/policy/target/generated-sources/grpc/acl/Acl.java
@@ -397,8 +397,8 @@ public final class Acl {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:acl.AclMatch)
-    AclMatchOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface AclMatchOrBuilder extends // @@protoc_insertion_point(interface_extends:acl.AclMatch)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>uint32 dscp = 1;</code>
@@ -476,9 +476,8 @@ public final class Acl {
     /**
      * Protobuf type {@code acl.AclMatch}
      */
-    public static final class // @@protoc_insertion_point(message_implements:acl.AclMatch)
-    AclMatch extends // @@protoc_insertion_point(message_implements:acl.AclMatch)
-    com.google.protobuf.GeneratedMessageV3 implements AclMatchOrBuilder {
+    public static final class AclMatch extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:acl.AclMatch)
+    AclMatchOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -920,9 +919,8 @@ public final class Acl {
         /**
          * Protobuf type {@code acl.AclMatch}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:acl.AclMatch)
-        Builder extends // @@protoc_insertion_point(builder_implements:acl.AclMatch)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements acl.Acl.AclMatchOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:acl.AclMatch)
+        acl.Acl.AclMatchOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return acl.Acl.internal_static_acl_AclMatch_descriptor;
@@ -1657,8 +1655,8 @@ public final class Acl {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:acl.AclAction)
-    AclActionOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface AclActionOrBuilder extends // @@protoc_insertion_point(interface_extends:acl.AclAction)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.acl.AclForwardActionEnum forward_action = 1;</code>
@@ -1688,9 +1686,8 @@ public final class Acl {
     /**
      * Protobuf type {@code acl.AclAction}
      */
-    public static final class // @@protoc_insertion_point(message_implements:acl.AclAction)
-    AclAction extends // @@protoc_insertion_point(message_implements:acl.AclAction)
-    com.google.protobuf.GeneratedMessageV3 implements AclActionOrBuilder {
+    public static final class AclAction extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:acl.AclAction)
+    AclActionOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -1915,9 +1912,8 @@ public final class Acl {
         /**
          * Protobuf type {@code acl.AclAction}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:acl.AclAction)
-        Builder extends // @@protoc_insertion_point(builder_implements:acl.AclAction)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements acl.Acl.AclActionOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:acl.AclAction)
+        acl.Acl.AclActionOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return acl.Acl.internal_static_acl_AclAction_descriptor;
@@ -2237,8 +2233,8 @@ public final class Acl {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:acl.AclEntry)
-    AclEntryOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface AclEntryOrBuilder extends // @@protoc_insertion_point(interface_extends:acl.AclEntry)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>uint32 sequence_id = 1;</code>
@@ -2296,9 +2292,8 @@ public final class Acl {
     /**
      * Protobuf type {@code acl.AclEntry}
      */
-    public static final class // @@protoc_insertion_point(message_implements:acl.AclEntry)
-    AclEntry extends // @@protoc_insertion_point(message_implements:acl.AclEntry)
-    com.google.protobuf.GeneratedMessageV3 implements AclEntryOrBuilder {
+    public static final class AclEntry extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:acl.AclEntry)
+    AclEntryOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -2619,9 +2614,8 @@ public final class Acl {
         /**
          * Protobuf type {@code acl.AclEntry}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:acl.AclEntry)
-        Builder extends // @@protoc_insertion_point(builder_implements:acl.AclEntry)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements acl.Acl.AclEntryOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:acl.AclEntry)
+        acl.Acl.AclEntryOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return acl.Acl.internal_static_acl_AclEntry_descriptor;
@@ -3206,8 +3200,8 @@ public final class Acl {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:acl.AclRuleSet)
-    AclRuleSetOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface AclRuleSetOrBuilder extends // @@protoc_insertion_point(interface_extends:acl.AclRuleSet)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>string name = 1;</code>
@@ -3286,9 +3280,8 @@ public final class Acl {
     /**
      * Protobuf type {@code acl.AclRuleSet}
      */
-    public static final class // @@protoc_insertion_point(message_implements:acl.AclRuleSet)
-    AclRuleSet extends // @@protoc_insertion_point(message_implements:acl.AclRuleSet)
-    com.google.protobuf.GeneratedMessageV3 implements AclRuleSetOrBuilder {
+    public static final class AclRuleSet extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:acl.AclRuleSet)
+    AclRuleSetOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -3684,9 +3677,8 @@ public final class Acl {
         /**
          * Protobuf type {@code acl.AclRuleSet}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:acl.AclRuleSet)
-        Builder extends // @@protoc_insertion_point(builder_implements:acl.AclRuleSet)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements acl.Acl.AclRuleSetOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:acl.AclRuleSet)
+        acl.Acl.AclRuleSetOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return acl.Acl.internal_static_acl_AclRuleSet_descriptor;
diff --git a/src/policy/target/generated-sources/grpc/context/ContextOuterClass.java b/src/policy/target/generated-sources/grpc/context/ContextOuterClass.java
index b83c4bcf8..558aa9778 100644
--- a/src/policy/target/generated-sources/grpc/context/ContextOuterClass.java
+++ b/src/policy/target/generated-sources/grpc/context/ContextOuterClass.java
@@ -1378,6 +1378,119 @@ public final class ContextOuterClass {
         }
     }
 
+    /**
+     * Protobuf enum {@code context.AclDirectionEnum}
+     */
+    public enum AclDirectionEnum implements com.google.protobuf.ProtocolMessageEnum {
+
+        /**
+         * <code>ACLDIRECTION_BOTH = 0;</code>
+         */
+        ACLDIRECTION_BOTH(0),
+        /**
+         * <code>ACLDIRECTION_INGRESS = 1;</code>
+         */
+        ACLDIRECTION_INGRESS(1),
+        /**
+         * <code>ACLDIRECTION_EGRESS = 2;</code>
+         */
+        ACLDIRECTION_EGRESS(2),
+        UNRECOGNIZED(-1);
+
+        /**
+         * <code>ACLDIRECTION_BOTH = 0;</code>
+         */
+        public static final int ACLDIRECTION_BOTH_VALUE = 0;
+
+        /**
+         * <code>ACLDIRECTION_INGRESS = 1;</code>
+         */
+        public static final int ACLDIRECTION_INGRESS_VALUE = 1;
+
+        /**
+         * <code>ACLDIRECTION_EGRESS = 2;</code>
+         */
+        public static final int ACLDIRECTION_EGRESS_VALUE = 2;
+
+        public final int getNumber() {
+            if (this == UNRECOGNIZED) {
+                throw new java.lang.IllegalArgumentException("Can't get the number of an unknown enum value.");
+            }
+            return value;
+        }
+
+        /**
+         * @param value The numeric wire value of the corresponding enum entry.
+         * @return The enum associated with the given numeric wire value.
+         * @deprecated Use {@link #forNumber(int)} instead.
+         */
+        @java.lang.Deprecated
+        public static AclDirectionEnum valueOf(int value) {
+            return forNumber(value);
+        }
+
+        /**
+         * @param value The numeric wire value of the corresponding enum entry.
+         * @return The enum associated with the given numeric wire value.
+         */
+        public static AclDirectionEnum forNumber(int value) {
+            switch(value) {
+                case 0:
+                    return ACLDIRECTION_BOTH;
+                case 1:
+                    return ACLDIRECTION_INGRESS;
+                case 2:
+                    return ACLDIRECTION_EGRESS;
+                default:
+                    return null;
+            }
+        }
+
+        public static com.google.protobuf.Internal.EnumLiteMap<AclDirectionEnum> internalGetValueMap() {
+            return internalValueMap;
+        }
+
+        private static final com.google.protobuf.Internal.EnumLiteMap<AclDirectionEnum> internalValueMap = new com.google.protobuf.Internal.EnumLiteMap<AclDirectionEnum>() {
+
+            public AclDirectionEnum findValueByNumber(int number) {
+                return AclDirectionEnum.forNumber(number);
+            }
+        };
+
+        public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() {
+            if (this == UNRECOGNIZED) {
+                throw new java.lang.IllegalStateException("Can't get the descriptor of an unrecognized enum value.");
+            }
+            return getDescriptor().getValues().get(ordinal());
+        }
+
+        public final com.google.protobuf.Descriptors.EnumDescriptor getDescriptorForType() {
+            return getDescriptor();
+        }
+
+        public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() {
+            return context.ContextOuterClass.getDescriptor().getEnumTypes().get(8);
+        }
+
+        private static final AclDirectionEnum[] VALUES = values();
+
+        public static AclDirectionEnum valueOf(com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+            if (desc.getType() != getDescriptor()) {
+                throw new java.lang.IllegalArgumentException("EnumValueDescriptor is not for this type.");
+            }
+            if (desc.getIndex() == -1) {
+                return UNRECOGNIZED;
+            }
+            return VALUES[desc.getIndex()];
+        }
+
+        private final int value;
+
+        private AclDirectionEnum(int value) {
+            this.value = value;
+        }
+    }
+
     /**
      * <pre>
      * ----- Constraint ----------------------------------------------------------------------------------------------------
@@ -1473,7 +1586,7 @@ public final class ContextOuterClass {
         }
 
         public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() {
-            return context.ContextOuterClass.getDescriptor().getEnumTypes().get(8);
+            return context.ContextOuterClass.getDescriptor().getEnumTypes().get(9);
         }
 
         private static final ConstraintActionEnum[] VALUES = values();
@@ -1652,7 +1765,7 @@ public final class ContextOuterClass {
         }
 
         public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() {
-            return context.ContextOuterClass.getDescriptor().getEnumTypes().get(9);
+            return context.ContextOuterClass.getDescriptor().getEnumTypes().get(10);
         }
 
         private static final IsolationLevelEnum[] VALUES = values();
@@ -1674,8 +1787,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.Empty)
-    EmptyOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface EmptyOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Empty)
+    com.google.protobuf.MessageOrBuilder {
     }
 
     /**
@@ -1685,9 +1798,8 @@ public final class ContextOuterClass {
      *
      * Protobuf type {@code context.Empty}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.Empty)
-    Empty extends // @@protoc_insertion_point(message_implements:context.Empty)
-    com.google.protobuf.GeneratedMessageV3 implements EmptyOrBuilder {
+    public static final class Empty extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Empty)
+    EmptyOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -1848,9 +1960,8 @@ public final class ContextOuterClass {
          *
          * Protobuf type {@code context.Empty}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.Empty)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.Empty)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.EmptyOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Empty)
+        context.ContextOuterClass.EmptyOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Empty_descriptor;
@@ -2014,8 +2125,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.Uuid)
-    UuidOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface UuidOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Uuid)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>string uuid = 1;</code>
@@ -2033,9 +2144,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Uuid}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.Uuid)
-    Uuid extends // @@protoc_insertion_point(message_implements:context.Uuid)
-    com.google.protobuf.GeneratedMessageV3 implements UuidOrBuilder {
+    public static final class Uuid extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Uuid)
+    UuidOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -2241,9 +2351,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Uuid}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.Uuid)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.Uuid)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.UuidOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Uuid)
+        context.ContextOuterClass.UuidOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Uuid_descriptor;
@@ -2508,8 +2617,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.Timestamp)
-    TimestampOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface TimestampOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Timestamp)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>double timestamp = 1;</code>
@@ -2521,9 +2630,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Timestamp}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.Timestamp)
-    Timestamp extends // @@protoc_insertion_point(message_implements:context.Timestamp)
-    com.google.protobuf.GeneratedMessageV3 implements TimestampOrBuilder {
+    public static final class Timestamp extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Timestamp)
+    TimestampOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -2703,9 +2811,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Timestamp}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.Timestamp)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.Timestamp)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.TimestampOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Timestamp)
+        context.ContextOuterClass.TimestampOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Timestamp_descriptor;
@@ -2927,8 +3034,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.Event)
-    EventOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface EventOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Event)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Timestamp timestamp = 1;</code>
@@ -2963,9 +3070,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Event}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.Event)
-    Event extends // @@protoc_insertion_point(message_implements:context.Event)
-    com.google.protobuf.GeneratedMessageV3 implements EventOrBuilder {
+    public static final class Event extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Event)
+    EventOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -3202,9 +3308,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Event}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.Event)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.Event)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.EventOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Event)
+        context.ContextOuterClass.EventOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Event_descriptor;
@@ -3587,8 +3692,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.AnyEvent)
-    AnyEventOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface AnyEventOrBuilder extends // @@protoc_insertion_point(interface_extends:context.AnyEvent)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.ContextEvent context = 1;</code>
@@ -3715,9 +3820,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.AnyEvent}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.AnyEvent)
-    AnyEvent extends // @@protoc_insertion_point(message_implements:context.AnyEvent)
-    com.google.protobuf.GeneratedMessageV3 implements AnyEventOrBuilder {
+    public static final class AnyEvent extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.AnyEvent)
+    AnyEventOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -4284,9 +4388,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.AnyEvent}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.AnyEvent)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.AnyEvent)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.AnyEventOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.AnyEvent)
+        context.ContextOuterClass.AnyEventOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_AnyEvent_descriptor;
@@ -5602,8 +5705,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.ContextId)
-    ContextIdOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface ContextIdOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ContextId)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Uuid context_uuid = 1;</code>
@@ -5630,9 +5733,8 @@ public final class ContextOuterClass {
      *
      * Protobuf type {@code context.ContextId}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.ContextId)
-    ContextId extends // @@protoc_insertion_point(message_implements:context.ContextId)
-    com.google.protobuf.GeneratedMessageV3 implements ContextIdOrBuilder {
+    public static final class ContextId extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ContextId)
+    ContextIdOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -5839,9 +5941,8 @@ public final class ContextOuterClass {
          *
          * Protobuf type {@code context.ContextId}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.ContextId)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.ContextId)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ContextIdOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ContextId)
+        context.ContextOuterClass.ContextIdOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ContextId_descriptor;
@@ -6151,8 +6252,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.Context)
-    ContextOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface ContextOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Context)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.ContextId context_id = 1;</code>
@@ -6279,9 +6380,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Context}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.Context)
-    Context extends // @@protoc_insertion_point(message_implements:context.Context)
-    com.google.protobuf.GeneratedMessageV3 implements ContextOrBuilder {
+    public static final class Context extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Context)
+    ContextOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -6753,9 +6853,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Context}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.Context)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.Context)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ContextOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Context)
+        context.ContextOuterClass.ContextOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Context_descriptor;
@@ -8163,8 +8262,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.ContextIdList)
-    ContextIdListOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface ContextIdListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ContextIdList)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.ContextId context_ids = 1;</code>
@@ -8195,9 +8294,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ContextIdList}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.ContextIdList)
-    ContextIdList extends // @@protoc_insertion_point(message_implements:context.ContextIdList)
-    com.google.protobuf.GeneratedMessageV3 implements ContextIdListOrBuilder {
+    public static final class ContextIdList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ContextIdList)
+    ContextIdListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -8412,9 +8510,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ContextIdList}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.ContextIdList)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.ContextIdList)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ContextIdListOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ContextIdList)
+        context.ContextOuterClass.ContextIdListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ContextIdList_descriptor;
@@ -8881,8 +8978,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.ContextList)
-    ContextListOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface ContextListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ContextList)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.Context contexts = 1;</code>
@@ -8913,9 +9010,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ContextList}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.ContextList)
-    ContextList extends // @@protoc_insertion_point(message_implements:context.ContextList)
-    com.google.protobuf.GeneratedMessageV3 implements ContextListOrBuilder {
+    public static final class ContextList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ContextList)
+    ContextListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -9130,9 +9226,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ContextList}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.ContextList)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.ContextList)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ContextListOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ContextList)
+        context.ContextOuterClass.ContextListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ContextList_descriptor;
@@ -9599,8 +9694,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.ContextEvent)
-    ContextEventOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface ContextEventOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ContextEvent)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Event event = 1;</code>
@@ -9640,9 +9735,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ContextEvent}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.ContextEvent)
-    ContextEvent extends // @@protoc_insertion_point(message_implements:context.ContextEvent)
-    com.google.protobuf.GeneratedMessageV3 implements ContextEventOrBuilder {
+    public static final class ContextEvent extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ContextEvent)
+    ContextEventOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -9891,9 +9985,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ContextEvent}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.ContextEvent)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.ContextEvent)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ContextEventOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ContextEvent)
+        context.ContextOuterClass.ContextEventOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ContextEvent_descriptor;
@@ -10339,8 +10432,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.TopologyId)
-    TopologyIdOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface TopologyIdOrBuilder extends // @@protoc_insertion_point(interface_extends:context.TopologyId)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.ContextId context_id = 1;</code>
@@ -10384,9 +10477,8 @@ public final class ContextOuterClass {
      *
      * Protobuf type {@code context.TopologyId}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.TopologyId)
-    TopologyId extends // @@protoc_insertion_point(message_implements:context.TopologyId)
-    com.google.protobuf.GeneratedMessageV3 implements TopologyIdOrBuilder {
+    public static final class TopologyId extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.TopologyId)
+    TopologyIdOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -10639,9 +10731,8 @@ public final class ContextOuterClass {
          *
          * Protobuf type {@code context.TopologyId}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.TopologyId)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.TopologyId)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.TopologyIdOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.TopologyId)
+        context.ContextOuterClass.TopologyIdOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_TopologyId_descriptor;
@@ -11087,8 +11178,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.Topology)
-    TopologyOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface TopologyOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Topology)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.TopologyId topology_id = 1;</code>
@@ -11198,9 +11289,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Topology}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.Topology)
-    Topology extends // @@protoc_insertion_point(message_implements:context.Topology)
-    com.google.protobuf.GeneratedMessageV3 implements TopologyOrBuilder {
+    public static final class Topology extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Topology)
+    TopologyOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -11626,9 +11716,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Topology}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.Topology)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.Topology)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.TopologyOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Topology)
+        context.ContextOuterClass.TopologyOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Topology_descriptor;
@@ -12900,8 +12989,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.TopologyDetails)
-    TopologyDetailsOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface TopologyDetailsOrBuilder extends // @@protoc_insertion_point(interface_extends:context.TopologyDetails)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.TopologyId topology_id = 1;</code>
@@ -13011,9 +13100,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.TopologyDetails}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.TopologyDetails)
-    TopologyDetails extends // @@protoc_insertion_point(message_implements:context.TopologyDetails)
-    com.google.protobuf.GeneratedMessageV3 implements TopologyDetailsOrBuilder {
+    public static final class TopologyDetails extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.TopologyDetails)
+    TopologyDetailsOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -13439,9 +13527,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.TopologyDetails}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.TopologyDetails)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.TopologyDetails)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.TopologyDetailsOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.TopologyDetails)
+        context.ContextOuterClass.TopologyDetailsOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_TopologyDetails_descriptor;
@@ -14713,8 +14800,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.TopologyIdList)
-    TopologyIdListOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface TopologyIdListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.TopologyIdList)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.TopologyId topology_ids = 1;</code>
@@ -14745,9 +14832,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.TopologyIdList}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.TopologyIdList)
-    TopologyIdList extends // @@protoc_insertion_point(message_implements:context.TopologyIdList)
-    com.google.protobuf.GeneratedMessageV3 implements TopologyIdListOrBuilder {
+    public static final class TopologyIdList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.TopologyIdList)
+    TopologyIdListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -14962,9 +15048,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.TopologyIdList}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.TopologyIdList)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.TopologyIdList)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.TopologyIdListOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.TopologyIdList)
+        context.ContextOuterClass.TopologyIdListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_TopologyIdList_descriptor;
@@ -15431,8 +15516,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.TopologyList)
-    TopologyListOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface TopologyListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.TopologyList)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.Topology topologies = 1;</code>
@@ -15463,9 +15548,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.TopologyList}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.TopologyList)
-    TopologyList extends // @@protoc_insertion_point(message_implements:context.TopologyList)
-    com.google.protobuf.GeneratedMessageV3 implements TopologyListOrBuilder {
+    public static final class TopologyList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.TopologyList)
+    TopologyListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -15680,9 +15764,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.TopologyList}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.TopologyList)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.TopologyList)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.TopologyListOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.TopologyList)
+        context.ContextOuterClass.TopologyListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_TopologyList_descriptor;
@@ -16149,8 +16232,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.TopologyEvent)
-    TopologyEventOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface TopologyEventOrBuilder extends // @@protoc_insertion_point(interface_extends:context.TopologyEvent)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Event event = 1;</code>
@@ -16190,9 +16273,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.TopologyEvent}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.TopologyEvent)
-    TopologyEvent extends // @@protoc_insertion_point(message_implements:context.TopologyEvent)
-    com.google.protobuf.GeneratedMessageV3 implements TopologyEventOrBuilder {
+    public static final class TopologyEvent extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.TopologyEvent)
+    TopologyEventOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -16441,9 +16523,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.TopologyEvent}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.TopologyEvent)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.TopologyEvent)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.TopologyEventOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.TopologyEvent)
+        context.ContextOuterClass.TopologyEventOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_TopologyEvent_descriptor;
@@ -16889,8 +16970,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.DeviceId)
-    DeviceIdOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface DeviceIdOrBuilder extends // @@protoc_insertion_point(interface_extends:context.DeviceId)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Uuid device_uuid = 1;</code>
@@ -16917,9 +16998,8 @@ public final class ContextOuterClass {
      *
      * Protobuf type {@code context.DeviceId}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.DeviceId)
-    DeviceId extends // @@protoc_insertion_point(message_implements:context.DeviceId)
-    com.google.protobuf.GeneratedMessageV3 implements DeviceIdOrBuilder {
+    public static final class DeviceId extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.DeviceId)
+    DeviceIdOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -17126,9 +17206,8 @@ public final class ContextOuterClass {
          *
          * Protobuf type {@code context.DeviceId}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.DeviceId)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.DeviceId)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.DeviceIdOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.DeviceId)
+        context.ContextOuterClass.DeviceIdOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_DeviceId_descriptor;
@@ -17438,8 +17517,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.Device)
-    DeviceOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface DeviceOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Device)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.DeviceId device_id = 1;</code>
@@ -17646,9 +17725,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Device}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.Device)
-    Device extends // @@protoc_insertion_point(message_implements:context.Device)
-    com.google.protobuf.GeneratedMessageV3 implements DeviceOrBuilder {
+    public static final class Device extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Device)
+    DeviceOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -18312,9 +18390,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Device}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.Device)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.Device)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.DeviceOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Device)
+        context.ContextOuterClass.DeviceOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Device_descriptor;
@@ -20025,8 +20102,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.Component)
-    ComponentOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface ComponentOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Component)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Uuid component_uuid = 1;</code>
@@ -20142,9 +20219,8 @@ public final class ContextOuterClass {
      *
      * Protobuf type {@code context.Component}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.Component)
-    Component extends // @@protoc_insertion_point(message_implements:context.Component)
-    com.google.protobuf.GeneratedMessageV3 implements ComponentOrBuilder {
+    public static final class Component extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Component)
+    ComponentOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -20614,9 +20690,8 @@ public final class ContextOuterClass {
          *
          * Protobuf type {@code context.Component}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.Component)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.Component)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ComponentOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Component)
+        context.ContextOuterClass.ComponentOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Component_descriptor;
@@ -21394,8 +21469,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.DeviceConfig)
-    DeviceConfigOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface DeviceConfigOrBuilder extends // @@protoc_insertion_point(interface_extends:context.DeviceConfig)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.ConfigRule config_rules = 1;</code>
@@ -21426,9 +21501,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.DeviceConfig}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.DeviceConfig)
-    DeviceConfig extends // @@protoc_insertion_point(message_implements:context.DeviceConfig)
-    com.google.protobuf.GeneratedMessageV3 implements DeviceConfigOrBuilder {
+    public static final class DeviceConfig extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.DeviceConfig)
+    DeviceConfigOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -21643,9 +21717,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.DeviceConfig}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.DeviceConfig)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.DeviceConfig)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.DeviceConfigOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.DeviceConfig)
+        context.ContextOuterClass.DeviceConfigOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_DeviceConfig_descriptor;
@@ -22112,8 +22185,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.DeviceIdList)
-    DeviceIdListOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface DeviceIdListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.DeviceIdList)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.DeviceId device_ids = 1;</code>
@@ -22144,9 +22217,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.DeviceIdList}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.DeviceIdList)
-    DeviceIdList extends // @@protoc_insertion_point(message_implements:context.DeviceIdList)
-    com.google.protobuf.GeneratedMessageV3 implements DeviceIdListOrBuilder {
+    public static final class DeviceIdList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.DeviceIdList)
+    DeviceIdListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -22361,9 +22433,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.DeviceIdList}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.DeviceIdList)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.DeviceIdList)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.DeviceIdListOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.DeviceIdList)
+        context.ContextOuterClass.DeviceIdListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_DeviceIdList_descriptor;
@@ -22830,8 +22901,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.DeviceList)
-    DeviceListOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface DeviceListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.DeviceList)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.Device devices = 1;</code>
@@ -22862,9 +22933,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.DeviceList}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.DeviceList)
-    DeviceList extends // @@protoc_insertion_point(message_implements:context.DeviceList)
-    com.google.protobuf.GeneratedMessageV3 implements DeviceListOrBuilder {
+    public static final class DeviceList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.DeviceList)
+    DeviceListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -23079,9 +23149,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.DeviceList}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.DeviceList)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.DeviceList)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.DeviceListOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.DeviceList)
+        context.ContextOuterClass.DeviceListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_DeviceList_descriptor;
@@ -23548,8 +23617,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.DeviceFilter)
-    DeviceFilterOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface DeviceFilterOrBuilder extends // @@protoc_insertion_point(interface_extends:context.DeviceFilter)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.DeviceIdList device_ids = 1;</code>
@@ -23590,9 +23659,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.DeviceFilter}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.DeviceFilter)
-    DeviceFilter extends // @@protoc_insertion_point(message_implements:context.DeviceFilter)
-    com.google.protobuf.GeneratedMessageV3 implements DeviceFilterOrBuilder {
+    public static final class DeviceFilter extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.DeviceFilter)
+    DeviceFilterOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -23864,9 +23932,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.DeviceFilter}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.DeviceFilter)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.DeviceFilter)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.DeviceFilterOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.DeviceFilter)
+        context.ContextOuterClass.DeviceFilterOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_DeviceFilter_descriptor;
@@ -24320,8 +24387,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.DeviceEvent)
-    DeviceEventOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface DeviceEventOrBuilder extends // @@protoc_insertion_point(interface_extends:context.DeviceEvent)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Event event = 1;</code>
@@ -24378,9 +24445,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.DeviceEvent}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.DeviceEvent)
-    DeviceEvent extends // @@protoc_insertion_point(message_implements:context.DeviceEvent)
-    com.google.protobuf.GeneratedMessageV3 implements DeviceEventOrBuilder {
+    public static final class DeviceEvent extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.DeviceEvent)
+    DeviceEventOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -24675,9 +24741,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.DeviceEvent}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.DeviceEvent)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.DeviceEvent)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.DeviceEventOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.DeviceEvent)
+        context.ContextOuterClass.DeviceEventOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_DeviceEvent_descriptor;
@@ -25259,8 +25324,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.LinkId)
-    LinkIdOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface LinkIdOrBuilder extends // @@protoc_insertion_point(interface_extends:context.LinkId)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Uuid link_uuid = 1;</code>
@@ -25287,9 +25352,8 @@ public final class ContextOuterClass {
      *
      * Protobuf type {@code context.LinkId}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.LinkId)
-    LinkId extends // @@protoc_insertion_point(message_implements:context.LinkId)
-    com.google.protobuf.GeneratedMessageV3 implements LinkIdOrBuilder {
+    public static final class LinkId extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.LinkId)
+    LinkIdOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -25496,9 +25560,8 @@ public final class ContextOuterClass {
          *
          * Protobuf type {@code context.LinkId}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.LinkId)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.LinkId)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.LinkIdOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.LinkId)
+        context.ContextOuterClass.LinkIdOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_LinkId_descriptor;
@@ -25808,8 +25871,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.LinkAttributes)
-    LinkAttributesOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface LinkAttributesOrBuilder extends // @@protoc_insertion_point(interface_extends:context.LinkAttributes)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>bool is_bidirectional = 1;</code>
@@ -25833,9 +25896,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.LinkAttributes}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.LinkAttributes)
-    LinkAttributes extends // @@protoc_insertion_point(message_implements:context.LinkAttributes)
-    com.google.protobuf.GeneratedMessageV3 implements LinkAttributesOrBuilder {
+    public static final class LinkAttributes extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.LinkAttributes)
+    LinkAttributesOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -26061,9 +26123,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.LinkAttributes}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.LinkAttributes)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.LinkAttributes)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.LinkAttributesOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.LinkAttributes)
+        context.ContextOuterClass.LinkAttributesOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_LinkAttributes_descriptor;
@@ -26381,8 +26442,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.Link)
-    LinkOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface LinkOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Link)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.LinkId link_id = 1;</code>
@@ -26471,9 +26532,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Link}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.Link)
-    Link extends // @@protoc_insertion_point(message_implements:context.Link)
-    com.google.protobuf.GeneratedMessageV3 implements LinkOrBuilder {
+    public static final class Link extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Link)
+    LinkOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -26863,9 +26923,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Link}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.Link)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.Link)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.LinkOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Link)
+        context.ContextOuterClass.LinkOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Link_descriptor;
@@ -27768,8 +27827,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.LinkIdList)
-    LinkIdListOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface LinkIdListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.LinkIdList)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.LinkId link_ids = 1;</code>
@@ -27800,9 +27859,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.LinkIdList}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.LinkIdList)
-    LinkIdList extends // @@protoc_insertion_point(message_implements:context.LinkIdList)
-    com.google.protobuf.GeneratedMessageV3 implements LinkIdListOrBuilder {
+    public static final class LinkIdList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.LinkIdList)
+    LinkIdListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -28017,9 +28075,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.LinkIdList}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.LinkIdList)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.LinkIdList)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.LinkIdListOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.LinkIdList)
+        context.ContextOuterClass.LinkIdListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_LinkIdList_descriptor;
@@ -28486,8 +28543,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.LinkList)
-    LinkListOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface LinkListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.LinkList)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.Link links = 1;</code>
@@ -28518,9 +28575,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.LinkList}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.LinkList)
-    LinkList extends // @@protoc_insertion_point(message_implements:context.LinkList)
-    com.google.protobuf.GeneratedMessageV3 implements LinkListOrBuilder {
+    public static final class LinkList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.LinkList)
+    LinkListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -28735,9 +28791,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.LinkList}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.LinkList)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.LinkList)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.LinkListOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.LinkList)
+        context.ContextOuterClass.LinkListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_LinkList_descriptor;
@@ -29204,8 +29259,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.LinkEvent)
-    LinkEventOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface LinkEventOrBuilder extends // @@protoc_insertion_point(interface_extends:context.LinkEvent)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Event event = 1;</code>
@@ -29245,9 +29300,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.LinkEvent}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.LinkEvent)
-    LinkEvent extends // @@protoc_insertion_point(message_implements:context.LinkEvent)
-    com.google.protobuf.GeneratedMessageV3 implements LinkEventOrBuilder {
+    public static final class LinkEvent extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.LinkEvent)
+    LinkEventOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -29496,9 +29550,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.LinkEvent}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.LinkEvent)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.LinkEvent)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.LinkEventOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.LinkEvent)
+        context.ContextOuterClass.LinkEventOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_LinkEvent_descriptor;
@@ -29944,8 +29997,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.ServiceId)
-    ServiceIdOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface ServiceIdOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ServiceId)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.ContextId context_id = 1;</code>
@@ -29989,9 +30042,8 @@ public final class ContextOuterClass {
      *
      * Protobuf type {@code context.ServiceId}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.ServiceId)
-    ServiceId extends // @@protoc_insertion_point(message_implements:context.ServiceId)
-    com.google.protobuf.GeneratedMessageV3 implements ServiceIdOrBuilder {
+    public static final class ServiceId extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ServiceId)
+    ServiceIdOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -30244,9 +30296,8 @@ public final class ContextOuterClass {
          *
          * Protobuf type {@code context.ServiceId}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.ServiceId)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.ServiceId)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ServiceIdOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ServiceId)
+        context.ContextOuterClass.ServiceIdOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ServiceId_descriptor;
@@ -30692,8 +30743,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.Service)
-    ServiceOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface ServiceOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Service)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.ServiceId service_id = 1;</code>
@@ -30841,9 +30892,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Service}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.Service)
-    Service extends // @@protoc_insertion_point(message_implements:context.Service)
-    com.google.protobuf.GeneratedMessageV3 implements ServiceOrBuilder {
+    public static final class Service extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Service)
+    ServiceOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -31383,9 +31433,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Service}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.Service)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.Service)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ServiceOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Service)
+        context.ContextOuterClass.ServiceOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Service_descriptor;
@@ -32849,8 +32898,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.ServiceStatus)
-    ServiceStatusOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface ServiceStatusOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ServiceStatus)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.ServiceStatusEnum service_status = 1;</code>
@@ -32868,9 +32917,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ServiceStatus}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.ServiceStatus)
-    ServiceStatus extends // @@protoc_insertion_point(message_implements:context.ServiceStatus)
-    com.google.protobuf.GeneratedMessageV3 implements ServiceStatusOrBuilder {
+    public static final class ServiceStatus extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ServiceStatus)
+    ServiceStatusOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -33061,9 +33109,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ServiceStatus}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.ServiceStatus)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.ServiceStatus)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ServiceStatusOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ServiceStatus)
+        context.ContextOuterClass.ServiceStatusOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ServiceStatus_descriptor;
@@ -33310,8 +33357,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.ServiceConfig)
-    ServiceConfigOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface ServiceConfigOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ServiceConfig)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.ConfigRule config_rules = 1;</code>
@@ -33342,9 +33389,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ServiceConfig}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.ServiceConfig)
-    ServiceConfig extends // @@protoc_insertion_point(message_implements:context.ServiceConfig)
-    com.google.protobuf.GeneratedMessageV3 implements ServiceConfigOrBuilder {
+    public static final class ServiceConfig extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ServiceConfig)
+    ServiceConfigOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -33559,9 +33605,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ServiceConfig}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.ServiceConfig)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.ServiceConfig)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ServiceConfigOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ServiceConfig)
+        context.ContextOuterClass.ServiceConfigOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ServiceConfig_descriptor;
@@ -34028,8 +34073,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.ServiceIdList)
-    ServiceIdListOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface ServiceIdListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ServiceIdList)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.ServiceId service_ids = 1;</code>
@@ -34060,9 +34105,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ServiceIdList}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.ServiceIdList)
-    ServiceIdList extends // @@protoc_insertion_point(message_implements:context.ServiceIdList)
-    com.google.protobuf.GeneratedMessageV3 implements ServiceIdListOrBuilder {
+    public static final class ServiceIdList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ServiceIdList)
+    ServiceIdListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -34277,9 +34321,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ServiceIdList}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.ServiceIdList)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.ServiceIdList)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ServiceIdListOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ServiceIdList)
+        context.ContextOuterClass.ServiceIdListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ServiceIdList_descriptor;
@@ -34746,8 +34789,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.ServiceList)
-    ServiceListOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface ServiceListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ServiceList)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.Service services = 1;</code>
@@ -34778,9 +34821,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ServiceList}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.ServiceList)
-    ServiceList extends // @@protoc_insertion_point(message_implements:context.ServiceList)
-    com.google.protobuf.GeneratedMessageV3 implements ServiceListOrBuilder {
+    public static final class ServiceList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ServiceList)
+    ServiceListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -34995,9 +35037,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ServiceList}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.ServiceList)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.ServiceList)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ServiceListOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ServiceList)
+        context.ContextOuterClass.ServiceListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ServiceList_descriptor;
@@ -35464,8 +35505,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.ServiceFilter)
-    ServiceFilterOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface ServiceFilterOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ServiceFilter)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.ServiceIdList service_ids = 1;</code>
@@ -35506,9 +35547,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ServiceFilter}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.ServiceFilter)
-    ServiceFilter extends // @@protoc_insertion_point(message_implements:context.ServiceFilter)
-    com.google.protobuf.GeneratedMessageV3 implements ServiceFilterOrBuilder {
+    public static final class ServiceFilter extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ServiceFilter)
+    ServiceFilterOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -35780,9 +35820,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ServiceFilter}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.ServiceFilter)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.ServiceFilter)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ServiceFilterOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ServiceFilter)
+        context.ContextOuterClass.ServiceFilterOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ServiceFilter_descriptor;
@@ -36236,8 +36275,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.ServiceEvent)
-    ServiceEventOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface ServiceEventOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ServiceEvent)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Event event = 1;</code>
@@ -36277,9 +36316,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ServiceEvent}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.ServiceEvent)
-    ServiceEvent extends // @@protoc_insertion_point(message_implements:context.ServiceEvent)
-    com.google.protobuf.GeneratedMessageV3 implements ServiceEventOrBuilder {
+    public static final class ServiceEvent extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ServiceEvent)
+    ServiceEventOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -36528,9 +36566,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ServiceEvent}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.ServiceEvent)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.ServiceEvent)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ServiceEventOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ServiceEvent)
+        context.ContextOuterClass.ServiceEventOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ServiceEvent_descriptor;
@@ -36976,8 +37013,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.SliceId)
-    SliceIdOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface SliceIdOrBuilder extends // @@protoc_insertion_point(interface_extends:context.SliceId)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.ContextId context_id = 1;</code>
@@ -37021,9 +37058,8 @@ public final class ContextOuterClass {
      *
      * Protobuf type {@code context.SliceId}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.SliceId)
-    SliceId extends // @@protoc_insertion_point(message_implements:context.SliceId)
-    com.google.protobuf.GeneratedMessageV3 implements SliceIdOrBuilder {
+    public static final class SliceId extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.SliceId)
+    SliceIdOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -37276,9 +37312,8 @@ public final class ContextOuterClass {
          *
          * Protobuf type {@code context.SliceId}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.SliceId)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.SliceId)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.SliceIdOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.SliceId)
+        context.ContextOuterClass.SliceIdOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_SliceId_descriptor;
@@ -37724,8 +37759,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.Slice)
-    SliceOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface SliceOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Slice)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.SliceId slice_id = 1;</code>
@@ -37928,9 +37963,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Slice}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.Slice)
-    Slice extends // @@protoc_insertion_point(message_implements:context.Slice)
-    com.google.protobuf.GeneratedMessageV3 implements SliceOrBuilder {
+    public static final class Slice extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Slice)
+    SliceOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -38598,9 +38632,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Slice}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.Slice)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.Slice)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.SliceOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Slice)
+        context.ContextOuterClass.SliceOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Slice_descriptor;
@@ -40705,8 +40738,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.SliceOwner)
-    SliceOwnerOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface SliceOwnerOrBuilder extends // @@protoc_insertion_point(interface_extends:context.SliceOwner)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Uuid owner_uuid = 1;</code>
@@ -40741,9 +40774,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.SliceOwner}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.SliceOwner)
-    SliceOwner extends // @@protoc_insertion_point(message_implements:context.SliceOwner)
-    com.google.protobuf.GeneratedMessageV3 implements SliceOwnerOrBuilder {
+    public static final class SliceOwner extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.SliceOwner)
+    SliceOwnerOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -40995,9 +41027,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.SliceOwner}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.SliceOwner)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.SliceOwner)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.SliceOwnerOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.SliceOwner)
+        context.ContextOuterClass.SliceOwnerOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_SliceOwner_descriptor;
@@ -41398,8 +41429,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.SliceStatus)
-    SliceStatusOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface SliceStatusOrBuilder extends // @@protoc_insertion_point(interface_extends:context.SliceStatus)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.SliceStatusEnum slice_status = 1;</code>
@@ -41417,9 +41448,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.SliceStatus}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.SliceStatus)
-    SliceStatus extends // @@protoc_insertion_point(message_implements:context.SliceStatus)
-    com.google.protobuf.GeneratedMessageV3 implements SliceStatusOrBuilder {
+    public static final class SliceStatus extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.SliceStatus)
+    SliceStatusOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -41610,9 +41640,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.SliceStatus}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.SliceStatus)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.SliceStatus)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.SliceStatusOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.SliceStatus)
+        context.ContextOuterClass.SliceStatusOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_SliceStatus_descriptor;
@@ -41859,8 +41888,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.SliceConfig)
-    SliceConfigOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface SliceConfigOrBuilder extends // @@protoc_insertion_point(interface_extends:context.SliceConfig)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.ConfigRule config_rules = 1;</code>
@@ -41891,9 +41920,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.SliceConfig}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.SliceConfig)
-    SliceConfig extends // @@protoc_insertion_point(message_implements:context.SliceConfig)
-    com.google.protobuf.GeneratedMessageV3 implements SliceConfigOrBuilder {
+    public static final class SliceConfig extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.SliceConfig)
+    SliceConfigOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -42108,9 +42136,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.SliceConfig}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.SliceConfig)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.SliceConfig)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.SliceConfigOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.SliceConfig)
+        context.ContextOuterClass.SliceConfigOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_SliceConfig_descriptor;
@@ -42577,8 +42604,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.SliceIdList)
-    SliceIdListOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface SliceIdListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.SliceIdList)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.SliceId slice_ids = 1;</code>
@@ -42609,9 +42636,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.SliceIdList}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.SliceIdList)
-    SliceIdList extends // @@protoc_insertion_point(message_implements:context.SliceIdList)
-    com.google.protobuf.GeneratedMessageV3 implements SliceIdListOrBuilder {
+    public static final class SliceIdList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.SliceIdList)
+    SliceIdListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -42826,9 +42852,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.SliceIdList}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.SliceIdList)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.SliceIdList)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.SliceIdListOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.SliceIdList)
+        context.ContextOuterClass.SliceIdListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_SliceIdList_descriptor;
@@ -43295,8 +43320,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.SliceList)
-    SliceListOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface SliceListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.SliceList)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.Slice slices = 1;</code>
@@ -43327,9 +43352,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.SliceList}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.SliceList)
-    SliceList extends // @@protoc_insertion_point(message_implements:context.SliceList)
-    com.google.protobuf.GeneratedMessageV3 implements SliceListOrBuilder {
+    public static final class SliceList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.SliceList)
+    SliceListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -43544,9 +43568,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.SliceList}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.SliceList)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.SliceList)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.SliceListOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.SliceList)
+        context.ContextOuterClass.SliceListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_SliceList_descriptor;
@@ -44013,8 +44036,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.SliceFilter)
-    SliceFilterOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface SliceFilterOrBuilder extends // @@protoc_insertion_point(interface_extends:context.SliceFilter)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.SliceIdList slice_ids = 1;</code>
@@ -44067,9 +44090,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.SliceFilter}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.SliceFilter)
-    SliceFilter extends // @@protoc_insertion_point(message_implements:context.SliceFilter)
-    com.google.protobuf.GeneratedMessageV3 implements SliceFilterOrBuilder {
+    public static final class SliceFilter extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.SliceFilter)
+    SliceFilterOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -44387,9 +44409,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.SliceFilter}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.SliceFilter)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.SliceFilter)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.SliceFilterOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.SliceFilter)
+        context.ContextOuterClass.SliceFilterOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_SliceFilter_descriptor;
@@ -44939,8 +44960,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.SliceEvent)
-    SliceEventOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface SliceEventOrBuilder extends // @@protoc_insertion_point(interface_extends:context.SliceEvent)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Event event = 1;</code>
@@ -44980,9 +45001,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.SliceEvent}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.SliceEvent)
-    SliceEvent extends // @@protoc_insertion_point(message_implements:context.SliceEvent)
-    com.google.protobuf.GeneratedMessageV3 implements SliceEventOrBuilder {
+    public static final class SliceEvent extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.SliceEvent)
+    SliceEventOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -45231,9 +45251,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.SliceEvent}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.SliceEvent)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.SliceEvent)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.SliceEventOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.SliceEvent)
+        context.ContextOuterClass.SliceEventOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_SliceEvent_descriptor;
@@ -45679,8 +45698,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.ConnectionId)
-    ConnectionIdOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface ConnectionIdOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ConnectionId)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Uuid connection_uuid = 1;</code>
@@ -45707,9 +45726,8 @@ public final class ContextOuterClass {
      *
      * Protobuf type {@code context.ConnectionId}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.ConnectionId)
-    ConnectionId extends // @@protoc_insertion_point(message_implements:context.ConnectionId)
-    com.google.protobuf.GeneratedMessageV3 implements ConnectionIdOrBuilder {
+    public static final class ConnectionId extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ConnectionId)
+    ConnectionIdOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -45916,9 +45934,8 @@ public final class ContextOuterClass {
          *
          * Protobuf type {@code context.ConnectionId}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.ConnectionId)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.ConnectionId)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ConnectionIdOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ConnectionId)
+        context.ContextOuterClass.ConnectionIdOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ConnectionId_descriptor;
@@ -46228,8 +46245,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.ConnectionSettings_L0)
-    ConnectionSettings_L0OrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface ConnectionSettings_L0OrBuilder extends // @@protoc_insertion_point(interface_extends:context.ConnectionSettings_L0)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>string lsp_symbolic_name = 1;</code>
@@ -46247,9 +46264,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ConnectionSettings_L0}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.ConnectionSettings_L0)
-    ConnectionSettings_L0 extends // @@protoc_insertion_point(message_implements:context.ConnectionSettings_L0)
-    com.google.protobuf.GeneratedMessageV3 implements ConnectionSettings_L0OrBuilder {
+    public static final class ConnectionSettings_L0 extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ConnectionSettings_L0)
+    ConnectionSettings_L0OrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -46455,9 +46471,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ConnectionSettings_L0}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.ConnectionSettings_L0)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.ConnectionSettings_L0)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ConnectionSettings_L0OrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ConnectionSettings_L0)
+        context.ContextOuterClass.ConnectionSettings_L0OrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ConnectionSettings_L0_descriptor;
@@ -46722,8 +46737,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.ConnectionSettings_L2)
-    ConnectionSettings_L2OrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface ConnectionSettings_L2OrBuilder extends // @@protoc_insertion_point(interface_extends:context.ConnectionSettings_L2)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>string src_mac_address = 1;</code>
@@ -46777,9 +46792,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ConnectionSettings_L2}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.ConnectionSettings_L2)
-    ConnectionSettings_L2 extends // @@protoc_insertion_point(message_implements:context.ConnectionSettings_L2)
-    com.google.protobuf.GeneratedMessageV3 implements ConnectionSettings_L2OrBuilder {
+    public static final class ConnectionSettings_L2 extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ConnectionSettings_L2)
+    ConnectionSettings_L2OrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -47126,9 +47140,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ConnectionSettings_L2}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.ConnectionSettings_L2)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.ConnectionSettings_L2)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ConnectionSettings_L2OrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ConnectionSettings_L2)
+        context.ContextOuterClass.ConnectionSettings_L2OrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ConnectionSettings_L2_descriptor;
@@ -47676,8 +47689,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.ConnectionSettings_L3)
-    ConnectionSettings_L3OrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface ConnectionSettings_L3OrBuilder extends // @@protoc_insertion_point(interface_extends:context.ConnectionSettings_L3)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>string src_ip_address = 1;</code>
@@ -47725,9 +47738,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ConnectionSettings_L3}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.ConnectionSettings_L3)
-    ConnectionSettings_L3 extends // @@protoc_insertion_point(message_implements:context.ConnectionSettings_L3)
-    com.google.protobuf.GeneratedMessageV3 implements ConnectionSettings_L3OrBuilder {
+    public static final class ConnectionSettings_L3 extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ConnectionSettings_L3)
+    ConnectionSettings_L3OrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -48051,9 +48063,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ConnectionSettings_L3}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.ConnectionSettings_L3)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.ConnectionSettings_L3)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ConnectionSettings_L3OrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ConnectionSettings_L3)
+        context.ContextOuterClass.ConnectionSettings_L3OrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ConnectionSettings_L3_descriptor;
@@ -48553,8 +48564,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.ConnectionSettings_L4)
-    ConnectionSettings_L4OrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface ConnectionSettings_L4OrBuilder extends // @@protoc_insertion_point(interface_extends:context.ConnectionSettings_L4)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>uint32 src_port = 1;</code>
@@ -48584,9 +48595,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ConnectionSettings_L4}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.ConnectionSettings_L4)
-    ConnectionSettings_L4 extends // @@protoc_insertion_point(message_implements:context.ConnectionSettings_L4)
-    com.google.protobuf.GeneratedMessageV3 implements ConnectionSettings_L4OrBuilder {
+    public static final class ConnectionSettings_L4 extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ConnectionSettings_L4)
+    ConnectionSettings_L4OrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -48835,9 +48845,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ConnectionSettings_L4}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.ConnectionSettings_L4)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.ConnectionSettings_L4)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ConnectionSettings_L4OrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ConnectionSettings_L4)
+        context.ContextOuterClass.ConnectionSettings_L4OrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ConnectionSettings_L4_descriptor;
@@ -49203,8 +49212,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.ConnectionSettings)
-    ConnectionSettingsOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface ConnectionSettingsOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ConnectionSettings)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.ConnectionSettings_L0 l0 = 1;</code>
@@ -49278,9 +49287,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ConnectionSettings}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.ConnectionSettings)
-    ConnectionSettings extends // @@protoc_insertion_point(message_implements:context.ConnectionSettings)
-    com.google.protobuf.GeneratedMessageV3 implements ConnectionSettingsOrBuilder {
+    public static final class ConnectionSettings extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ConnectionSettings)
+    ConnectionSettingsOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -49621,9 +49629,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ConnectionSettings}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.ConnectionSettings)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.ConnectionSettings)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ConnectionSettingsOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ConnectionSettings)
+        context.ContextOuterClass.ConnectionSettingsOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ConnectionSettings_descriptor;
@@ -50341,8 +50348,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.Connection)
-    ConnectionOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface ConnectionOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Connection)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.ConnectionId connection_id = 1;</code>
@@ -50449,9 +50456,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Connection}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.Connection)
-    Connection extends // @@protoc_insertion_point(message_implements:context.Connection)
-    com.google.protobuf.GeneratedMessageV3 implements ConnectionOrBuilder {
+    public static final class Connection extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Connection)
+    ConnectionOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -50862,9 +50868,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Connection}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.Connection)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.Connection)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ConnectionOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Connection)
+        context.ContextOuterClass.ConnectionOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Connection_descriptor;
@@ -52028,8 +52033,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.ConnectionIdList)
-    ConnectionIdListOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface ConnectionIdListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ConnectionIdList)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.ConnectionId connection_ids = 1;</code>
@@ -52060,9 +52065,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ConnectionIdList}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.ConnectionIdList)
-    ConnectionIdList extends // @@protoc_insertion_point(message_implements:context.ConnectionIdList)
-    com.google.protobuf.GeneratedMessageV3 implements ConnectionIdListOrBuilder {
+    public static final class ConnectionIdList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ConnectionIdList)
+    ConnectionIdListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -52277,9 +52281,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ConnectionIdList}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.ConnectionIdList)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.ConnectionIdList)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ConnectionIdListOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ConnectionIdList)
+        context.ContextOuterClass.ConnectionIdListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ConnectionIdList_descriptor;
@@ -52746,8 +52749,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.ConnectionList)
-    ConnectionListOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface ConnectionListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ConnectionList)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.Connection connections = 1;</code>
@@ -52778,9 +52781,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ConnectionList}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.ConnectionList)
-    ConnectionList extends // @@protoc_insertion_point(message_implements:context.ConnectionList)
-    com.google.protobuf.GeneratedMessageV3 implements ConnectionListOrBuilder {
+    public static final class ConnectionList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ConnectionList)
+    ConnectionListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -52995,9 +52997,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ConnectionList}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.ConnectionList)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.ConnectionList)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ConnectionListOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ConnectionList)
+        context.ContextOuterClass.ConnectionListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ConnectionList_descriptor;
@@ -53464,8 +53465,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.ConnectionEvent)
-    ConnectionEventOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface ConnectionEventOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ConnectionEvent)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Event event = 1;</code>
@@ -53505,9 +53506,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ConnectionEvent}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.ConnectionEvent)
-    ConnectionEvent extends // @@protoc_insertion_point(message_implements:context.ConnectionEvent)
-    com.google.protobuf.GeneratedMessageV3 implements ConnectionEventOrBuilder {
+    public static final class ConnectionEvent extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ConnectionEvent)
+    ConnectionEventOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -53756,9 +53756,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ConnectionEvent}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.ConnectionEvent)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.ConnectionEvent)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ConnectionEventOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ConnectionEvent)
+        context.ContextOuterClass.ConnectionEventOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ConnectionEvent_descriptor;
@@ -54204,8 +54203,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.EndPointId)
-    EndPointIdOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface EndPointIdOrBuilder extends // @@protoc_insertion_point(interface_extends:context.EndPointId)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.TopologyId topology_id = 1;</code>
@@ -54266,9 +54265,8 @@ public final class ContextOuterClass {
      *
      * Protobuf type {@code context.EndPointId}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.EndPointId)
-    EndPointId extends // @@protoc_insertion_point(message_implements:context.EndPointId)
-    com.google.protobuf.GeneratedMessageV3 implements EndPointIdOrBuilder {
+    public static final class EndPointId extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.EndPointId)
+    EndPointIdOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -54567,9 +54565,8 @@ public final class ContextOuterClass {
          *
          * Protobuf type {@code context.EndPointId}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.EndPointId)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.EndPointId)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.EndPointIdOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.EndPointId)
+        context.ContextOuterClass.EndPointIdOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_EndPointId_descriptor;
@@ -55151,8 +55148,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.EndPoint)
-    EndPointOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface EndPointOrBuilder extends // @@protoc_insertion_point(interface_extends:context.EndPoint)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.EndPointId endpoint_id = 1;</code>
@@ -55281,9 +55278,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.EndPoint}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.EndPoint)
-    EndPoint extends // @@protoc_insertion_point(message_implements:context.EndPoint)
-    com.google.protobuf.GeneratedMessageV3 implements EndPointOrBuilder {
+    public static final class EndPoint extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.EndPoint)
+    EndPointOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -55819,9 +55815,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.EndPoint}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.EndPoint)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.EndPoint)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.EndPointOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.EndPoint)
+        context.ContextOuterClass.EndPointOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_EndPoint_descriptor;
@@ -56804,8 +56799,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.EndPointName)
-    EndPointNameOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface EndPointNameOrBuilder extends // @@protoc_insertion_point(interface_extends:context.EndPointName)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.EndPointId endpoint_id = 1;</code>
@@ -56864,9 +56859,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.EndPointName}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.EndPointName)
-    EndPointName extends // @@protoc_insertion_point(message_implements:context.EndPointName)
-    com.google.protobuf.GeneratedMessageV3 implements EndPointNameOrBuilder {
+    public static final class EndPointName extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.EndPointName)
+    EndPointNameOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -57216,9 +57210,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.EndPointName}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.EndPointName)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.EndPointName)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.EndPointNameOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.EndPointName)
+        context.ContextOuterClass.EndPointNameOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_EndPointName_descriptor;
@@ -57801,8 +57794,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.EndPointIdList)
-    EndPointIdListOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface EndPointIdListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.EndPointIdList)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.EndPointId endpoint_ids = 1;</code>
@@ -57833,9 +57826,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.EndPointIdList}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.EndPointIdList)
-    EndPointIdList extends // @@protoc_insertion_point(message_implements:context.EndPointIdList)
-    com.google.protobuf.GeneratedMessageV3 implements EndPointIdListOrBuilder {
+    public static final class EndPointIdList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.EndPointIdList)
+    EndPointIdListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -58050,9 +58042,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.EndPointIdList}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.EndPointIdList)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.EndPointIdList)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.EndPointIdListOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.EndPointIdList)
+        context.ContextOuterClass.EndPointIdListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_EndPointIdList_descriptor;
@@ -58519,8 +58510,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.EndPointNameList)
-    EndPointNameListOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface EndPointNameListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.EndPointNameList)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.EndPointName endpoint_names = 1;</code>
@@ -58551,9 +58542,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.EndPointNameList}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.EndPointNameList)
-    EndPointNameList extends // @@protoc_insertion_point(message_implements:context.EndPointNameList)
-    com.google.protobuf.GeneratedMessageV3 implements EndPointNameListOrBuilder {
+    public static final class EndPointNameList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.EndPointNameList)
+    EndPointNameListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -58768,9 +58758,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.EndPointNameList}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.EndPointNameList)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.EndPointNameList)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.EndPointNameListOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.EndPointNameList)
+        context.ContextOuterClass.EndPointNameListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_EndPointNameList_descriptor;
@@ -59237,8 +59226,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.ConfigRule_Custom)
-    ConfigRule_CustomOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface ConfigRule_CustomOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ConfigRule_Custom)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>string resource_key = 1;</code>
@@ -59268,9 +59257,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ConfigRule_Custom}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.ConfigRule_Custom)
-    ConfigRule_Custom extends // @@protoc_insertion_point(message_implements:context.ConfigRule_Custom)
-    com.google.protobuf.GeneratedMessageV3 implements ConfigRule_CustomOrBuilder {
+    public static final class ConfigRule_Custom extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ConfigRule_Custom)
+    ConfigRule_CustomOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -59525,9 +59513,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ConfigRule_Custom}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.ConfigRule_Custom)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.ConfigRule_Custom)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ConfigRule_CustomOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ConfigRule_Custom)
+        context.ContextOuterClass.ConfigRule_CustomOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ConfigRule_Custom_descriptor;
@@ -59883,8 +59870,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.ConfigRule_ACL)
-    ConfigRule_ACLOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface ConfigRule_ACLOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ConfigRule_ACL)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.EndPointId endpoint_id = 1;</code>
@@ -59904,19 +59891,31 @@ public final class ContextOuterClass {
         context.ContextOuterClass.EndPointIdOrBuilder getEndpointIdOrBuilder();
 
         /**
-         * <code>.acl.AclRuleSet rule_set = 2;</code>
+         * <code>.context.AclDirectionEnum direction = 2;</code>
+         * @return The enum numeric value on the wire for direction.
+         */
+        int getDirectionValue();
+
+        /**
+         * <code>.context.AclDirectionEnum direction = 2;</code>
+         * @return The direction.
+         */
+        context.ContextOuterClass.AclDirectionEnum getDirection();
+
+        /**
+         * <code>.acl.AclRuleSet rule_set = 3;</code>
          * @return Whether the ruleSet field is set.
          */
         boolean hasRuleSet();
 
         /**
-         * <code>.acl.AclRuleSet rule_set = 2;</code>
+         * <code>.acl.AclRuleSet rule_set = 3;</code>
          * @return The ruleSet.
          */
         acl.Acl.AclRuleSet getRuleSet();
 
         /**
-         * <code>.acl.AclRuleSet rule_set = 2;</code>
+         * <code>.acl.AclRuleSet rule_set = 3;</code>
          */
         acl.Acl.AclRuleSetOrBuilder getRuleSetOrBuilder();
     }
@@ -59924,9 +59923,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ConfigRule_ACL}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.ConfigRule_ACL)
-    ConfigRule_ACL extends // @@protoc_insertion_point(message_implements:context.ConfigRule_ACL)
-    com.google.protobuf.GeneratedMessageV3 implements ConfigRule_ACLOrBuilder {
+    public static final class ConfigRule_ACL extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ConfigRule_ACL)
+    ConfigRule_ACLOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -59936,6 +59934,7 @@ public final class ContextOuterClass {
         }
 
         private ConfigRule_ACL() {
+            direction_ = 0;
         }
 
         @java.lang.Override
@@ -59983,12 +59982,35 @@ public final class ContextOuterClass {
             return endpointId_ == null ? context.ContextOuterClass.EndPointId.getDefaultInstance() : endpointId_;
         }
 
-        public static final int RULE_SET_FIELD_NUMBER = 2;
+        public static final int DIRECTION_FIELD_NUMBER = 2;
+
+        private int direction_ = 0;
+
+        /**
+         * <code>.context.AclDirectionEnum direction = 2;</code>
+         * @return The enum numeric value on the wire for direction.
+         */
+        @java.lang.Override
+        public int getDirectionValue() {
+            return direction_;
+        }
+
+        /**
+         * <code>.context.AclDirectionEnum direction = 2;</code>
+         * @return The direction.
+         */
+        @java.lang.Override
+        public context.ContextOuterClass.AclDirectionEnum getDirection() {
+            context.ContextOuterClass.AclDirectionEnum result = context.ContextOuterClass.AclDirectionEnum.forNumber(direction_);
+            return result == null ? context.ContextOuterClass.AclDirectionEnum.UNRECOGNIZED : result;
+        }
+
+        public static final int RULE_SET_FIELD_NUMBER = 3;
 
         private acl.Acl.AclRuleSet ruleSet_;
 
         /**
-         * <code>.acl.AclRuleSet rule_set = 2;</code>
+         * <code>.acl.AclRuleSet rule_set = 3;</code>
          * @return Whether the ruleSet field is set.
          */
         @java.lang.Override
@@ -59997,7 +60019,7 @@ public final class ContextOuterClass {
         }
 
         /**
-         * <code>.acl.AclRuleSet rule_set = 2;</code>
+         * <code>.acl.AclRuleSet rule_set = 3;</code>
          * @return The ruleSet.
          */
         @java.lang.Override
@@ -60006,7 +60028,7 @@ public final class ContextOuterClass {
         }
 
         /**
-         * <code>.acl.AclRuleSet rule_set = 2;</code>
+         * <code>.acl.AclRuleSet rule_set = 3;</code>
          */
         @java.lang.Override
         public acl.Acl.AclRuleSetOrBuilder getRuleSetOrBuilder() {
@@ -60031,8 +60053,11 @@ public final class ContextOuterClass {
             if (endpointId_ != null) {
                 output.writeMessage(1, getEndpointId());
             }
+            if (direction_ != context.ContextOuterClass.AclDirectionEnum.ACLDIRECTION_BOTH.getNumber()) {
+                output.writeEnum(2, direction_);
+            }
             if (ruleSet_ != null) {
-                output.writeMessage(2, getRuleSet());
+                output.writeMessage(3, getRuleSet());
             }
             getUnknownFields().writeTo(output);
         }
@@ -60046,8 +60071,11 @@ public final class ContextOuterClass {
             if (endpointId_ != null) {
                 size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getEndpointId());
             }
+            if (direction_ != context.ContextOuterClass.AclDirectionEnum.ACLDIRECTION_BOTH.getNumber()) {
+                size += com.google.protobuf.CodedOutputStream.computeEnumSize(2, direction_);
+            }
             if (ruleSet_ != null) {
-                size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getRuleSet());
+                size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getRuleSet());
             }
             size += getUnknownFields().getSerializedSize();
             memoizedSize = size;
@@ -60069,6 +60097,8 @@ public final class ContextOuterClass {
                 if (!getEndpointId().equals(other.getEndpointId()))
                     return false;
             }
+            if (direction_ != other.direction_)
+                return false;
             if (hasRuleSet() != other.hasRuleSet())
                 return false;
             if (hasRuleSet()) {
@@ -60091,6 +60121,8 @@ public final class ContextOuterClass {
                 hash = (37 * hash) + ENDPOINT_ID_FIELD_NUMBER;
                 hash = (53 * hash) + getEndpointId().hashCode();
             }
+            hash = (37 * hash) + DIRECTION_FIELD_NUMBER;
+            hash = (53 * hash) + direction_;
             if (hasRuleSet()) {
                 hash = (37 * hash) + RULE_SET_FIELD_NUMBER;
                 hash = (53 * hash) + getRuleSet().hashCode();
@@ -60175,9 +60207,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ConfigRule_ACL}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.ConfigRule_ACL)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.ConfigRule_ACL)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ConfigRule_ACLOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ConfigRule_ACL)
+        context.ContextOuterClass.ConfigRule_ACLOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ConfigRule_ACL_descriptor;
@@ -60205,6 +60236,7 @@ public final class ContextOuterClass {
                     endpointIdBuilder_.dispose();
                     endpointIdBuilder_ = null;
                 }
+                direction_ = 0;
                 ruleSet_ = null;
                 if (ruleSetBuilder_ != null) {
                     ruleSetBuilder_.dispose();
@@ -60248,6 +60280,9 @@ public final class ContextOuterClass {
                     result.endpointId_ = endpointIdBuilder_ == null ? endpointId_ : endpointIdBuilder_.build();
                 }
                 if (((from_bitField0_ & 0x00000002) != 0)) {
+                    result.direction_ = direction_;
+                }
+                if (((from_bitField0_ & 0x00000004) != 0)) {
                     result.ruleSet_ = ruleSetBuilder_ == null ? ruleSet_ : ruleSetBuilder_.build();
                 }
             }
@@ -60268,6 +60303,9 @@ public final class ContextOuterClass {
                 if (other.hasEndpointId()) {
                     mergeEndpointId(other.getEndpointId());
                 }
+                if (other.direction_ != 0) {
+                    setDirectionValue(other.getDirectionValue());
+                }
                 if (other.hasRuleSet()) {
                     mergeRuleSet(other.getRuleSet());
                 }
@@ -60301,13 +60339,20 @@ public final class ContextOuterClass {
                                     break;
                                 }
                             // case 10
-                            case 18:
+                            case 16:
                                 {
-                                    input.readMessage(getRuleSetFieldBuilder().getBuilder(), extensionRegistry);
+                                    direction_ = input.readEnum();
                                     bitField0_ |= 0x00000002;
                                     break;
                                 }
-                            // case 18
+                            // case 16
+                            case 26:
+                                {
+                                    input.readMessage(getRuleSetFieldBuilder().getBuilder(), extensionRegistry);
+                                    bitField0_ |= 0x00000004;
+                                    break;
+                                }
+                            // case 26
                             default:
                                 {
                                     if (!super.parseUnknownField(input, extensionRegistry, tag)) {
@@ -60449,20 +60494,79 @@ public final class ContextOuterClass {
                 return endpointIdBuilder_;
             }
 
+            private int direction_ = 0;
+
+            /**
+             * <code>.context.AclDirectionEnum direction = 2;</code>
+             * @return The enum numeric value on the wire for direction.
+             */
+            @java.lang.Override
+            public int getDirectionValue() {
+                return direction_;
+            }
+
+            /**
+             * <code>.context.AclDirectionEnum direction = 2;</code>
+             * @param value The enum numeric value on the wire for direction to set.
+             * @return This builder for chaining.
+             */
+            public Builder setDirectionValue(int value) {
+                direction_ = value;
+                bitField0_ |= 0x00000002;
+                onChanged();
+                return this;
+            }
+
+            /**
+             * <code>.context.AclDirectionEnum direction = 2;</code>
+             * @return The direction.
+             */
+            @java.lang.Override
+            public context.ContextOuterClass.AclDirectionEnum getDirection() {
+                context.ContextOuterClass.AclDirectionEnum result = context.ContextOuterClass.AclDirectionEnum.forNumber(direction_);
+                return result == null ? context.ContextOuterClass.AclDirectionEnum.UNRECOGNIZED : result;
+            }
+
+            /**
+             * <code>.context.AclDirectionEnum direction = 2;</code>
+             * @param value The direction to set.
+             * @return This builder for chaining.
+             */
+            public Builder setDirection(context.ContextOuterClass.AclDirectionEnum value) {
+                if (value == null) {
+                    throw new NullPointerException();
+                }
+                bitField0_ |= 0x00000002;
+                direction_ = value.getNumber();
+                onChanged();
+                return this;
+            }
+
+            /**
+             * <code>.context.AclDirectionEnum direction = 2;</code>
+             * @return This builder for chaining.
+             */
+            public Builder clearDirection() {
+                bitField0_ = (bitField0_ & ~0x00000002);
+                direction_ = 0;
+                onChanged();
+                return this;
+            }
+
             private acl.Acl.AclRuleSet ruleSet_;
 
             private com.google.protobuf.SingleFieldBuilderV3<acl.Acl.AclRuleSet, acl.Acl.AclRuleSet.Builder, acl.Acl.AclRuleSetOrBuilder> ruleSetBuilder_;
 
             /**
-             * <code>.acl.AclRuleSet rule_set = 2;</code>
+             * <code>.acl.AclRuleSet rule_set = 3;</code>
              * @return Whether the ruleSet field is set.
              */
             public boolean hasRuleSet() {
-                return ((bitField0_ & 0x00000002) != 0);
+                return ((bitField0_ & 0x00000004) != 0);
             }
 
             /**
-             * <code>.acl.AclRuleSet rule_set = 2;</code>
+             * <code>.acl.AclRuleSet rule_set = 3;</code>
              * @return The ruleSet.
              */
             public acl.Acl.AclRuleSet getRuleSet() {
@@ -60474,7 +60578,7 @@ public final class ContextOuterClass {
             }
 
             /**
-             * <code>.acl.AclRuleSet rule_set = 2;</code>
+             * <code>.acl.AclRuleSet rule_set = 3;</code>
              */
             public Builder setRuleSet(acl.Acl.AclRuleSet value) {
                 if (ruleSetBuilder_ == null) {
@@ -60485,13 +60589,13 @@ public final class ContextOuterClass {
                 } else {
                     ruleSetBuilder_.setMessage(value);
                 }
-                bitField0_ |= 0x00000002;
+                bitField0_ |= 0x00000004;
                 onChanged();
                 return this;
             }
 
             /**
-             * <code>.acl.AclRuleSet rule_set = 2;</code>
+             * <code>.acl.AclRuleSet rule_set = 3;</code>
              */
             public Builder setRuleSet(acl.Acl.AclRuleSet.Builder builderForValue) {
                 if (ruleSetBuilder_ == null) {
@@ -60499,17 +60603,17 @@ public final class ContextOuterClass {
                 } else {
                     ruleSetBuilder_.setMessage(builderForValue.build());
                 }
-                bitField0_ |= 0x00000002;
+                bitField0_ |= 0x00000004;
                 onChanged();
                 return this;
             }
 
             /**
-             * <code>.acl.AclRuleSet rule_set = 2;</code>
+             * <code>.acl.AclRuleSet rule_set = 3;</code>
              */
             public Builder mergeRuleSet(acl.Acl.AclRuleSet value) {
                 if (ruleSetBuilder_ == null) {
-                    if (((bitField0_ & 0x00000002) != 0) && ruleSet_ != null && ruleSet_ != acl.Acl.AclRuleSet.getDefaultInstance()) {
+                    if (((bitField0_ & 0x00000004) != 0) && ruleSet_ != null && ruleSet_ != acl.Acl.AclRuleSet.getDefaultInstance()) {
                         getRuleSetBuilder().mergeFrom(value);
                     } else {
                         ruleSet_ = value;
@@ -60517,16 +60621,16 @@ public final class ContextOuterClass {
                 } else {
                     ruleSetBuilder_.mergeFrom(value);
                 }
-                bitField0_ |= 0x00000002;
+                bitField0_ |= 0x00000004;
                 onChanged();
                 return this;
             }
 
             /**
-             * <code>.acl.AclRuleSet rule_set = 2;</code>
+             * <code>.acl.AclRuleSet rule_set = 3;</code>
              */
             public Builder clearRuleSet() {
-                bitField0_ = (bitField0_ & ~0x00000002);
+                bitField0_ = (bitField0_ & ~0x00000004);
                 ruleSet_ = null;
                 if (ruleSetBuilder_ != null) {
                     ruleSetBuilder_.dispose();
@@ -60537,16 +60641,16 @@ public final class ContextOuterClass {
             }
 
             /**
-             * <code>.acl.AclRuleSet rule_set = 2;</code>
+             * <code>.acl.AclRuleSet rule_set = 3;</code>
              */
             public acl.Acl.AclRuleSet.Builder getRuleSetBuilder() {
-                bitField0_ |= 0x00000002;
+                bitField0_ |= 0x00000004;
                 onChanged();
                 return getRuleSetFieldBuilder().getBuilder();
             }
 
             /**
-             * <code>.acl.AclRuleSet rule_set = 2;</code>
+             * <code>.acl.AclRuleSet rule_set = 3;</code>
              */
             public acl.Acl.AclRuleSetOrBuilder getRuleSetOrBuilder() {
                 if (ruleSetBuilder_ != null) {
@@ -60557,7 +60661,7 @@ public final class ContextOuterClass {
             }
 
             /**
-             * <code>.acl.AclRuleSet rule_set = 2;</code>
+             * <code>.acl.AclRuleSet rule_set = 3;</code>
              */
             private com.google.protobuf.SingleFieldBuilderV3<acl.Acl.AclRuleSet, acl.Acl.AclRuleSet.Builder, acl.Acl.AclRuleSetOrBuilder> getRuleSetFieldBuilder() {
                 if (ruleSetBuilder_ == null) {
@@ -62317,9 +62421,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ConfigRule_IP_LINK}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.ConfigRule_IP_LINK)
-    ConfigRule_IP_LINK extends // @@protoc_insertion_point(message_implements:context.ConfigRule_IP_LINK)
-    com.google.protobuf.GeneratedMessageV3 implements ConfigRule_IP_LINKOrBuilder {
+    public static final class ConfigRule_IP_LINK extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ConfigRule_IP_LINK)
+    ConfigRule_IP_LINKOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -62568,9 +62671,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ConfigRule_IP_LINK}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.ConfigRule_IP_LINK)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.ConfigRule_IP_LINK)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ConfigRule_IP_LINKOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ConfigRule_IP_LINK)
+        context.ContextOuterClass.ConfigRule_IP_LINKOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ConfigRule_IP_LINK_descriptor;
@@ -63016,8 +63118,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.ConfigRule)
-    ConfigRuleOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface ConfigRuleOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ConfigRule)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.ConfigActionEnum action = 1;</code>
@@ -63122,9 +63224,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ConfigRule}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.ConfigRule)
-    ConfigRule extends // @@protoc_insertion_point(message_implements:context.ConfigRule)
-    com.google.protobuf.GeneratedMessageV3 implements ConfigRuleOrBuilder {
+    public static final class ConfigRule extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ConfigRule)
+    ConfigRuleOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -63623,9 +63724,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ConfigRule}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.ConfigRule)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.ConfigRule)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ConfigRuleOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ConfigRule)
+        context.ContextOuterClass.ConfigRuleOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ConfigRule_descriptor;
@@ -64696,8 +64796,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.Constraint_Custom)
-    Constraint_CustomOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface Constraint_CustomOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Constraint_Custom)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>string constraint_type = 1;</code>
@@ -64727,9 +64827,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Constraint_Custom}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.Constraint_Custom)
-    Constraint_Custom extends // @@protoc_insertion_point(message_implements:context.Constraint_Custom)
-    com.google.protobuf.GeneratedMessageV3 implements Constraint_CustomOrBuilder {
+    public static final class Constraint_Custom extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Constraint_Custom)
+    Constraint_CustomOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -64984,9 +65083,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Constraint_Custom}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.Constraint_Custom)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.Constraint_Custom)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.Constraint_CustomOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Constraint_Custom)
+        context.ContextOuterClass.Constraint_CustomOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Constraint_Custom_descriptor;
@@ -65342,8 +65440,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.Constraint_Schedule)
-    Constraint_ScheduleOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface Constraint_ScheduleOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Constraint_Schedule)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>double start_timestamp = 1;</code>
@@ -65361,9 +65459,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Constraint_Schedule}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.Constraint_Schedule)
-    Constraint_Schedule extends // @@protoc_insertion_point(message_implements:context.Constraint_Schedule)
-    com.google.protobuf.GeneratedMessageV3 implements Constraint_ScheduleOrBuilder {
+    public static final class Constraint_Schedule extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Constraint_Schedule)
+    Constraint_ScheduleOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -65566,9 +65663,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Constraint_Schedule}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.Constraint_Schedule)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.Constraint_Schedule)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.Constraint_ScheduleOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Constraint_Schedule)
+        context.ContextOuterClass.Constraint_ScheduleOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Constraint_Schedule_descriptor;
@@ -65838,8 +65934,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.GPS_Position)
-    GPS_PositionOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface GPS_PositionOrBuilder extends // @@protoc_insertion_point(interface_extends:context.GPS_Position)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>float latitude = 1;</code>
@@ -65857,9 +65953,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.GPS_Position}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.GPS_Position)
-    GPS_Position extends // @@protoc_insertion_point(message_implements:context.GPS_Position)
-    com.google.protobuf.GeneratedMessageV3 implements GPS_PositionOrBuilder {
+    public static final class GPS_Position extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.GPS_Position)
+    GPS_PositionOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -66062,9 +66157,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.GPS_Position}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.GPS_Position)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.GPS_Position)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.GPS_PositionOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.GPS_Position)
+        context.ContextOuterClass.GPS_PositionOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_GPS_Position_descriptor;
@@ -66334,8 +66428,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.Location)
-    LocationOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface LocationOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Location)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>string region = 1;</code>
@@ -66414,9 +66508,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Location}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.Location)
-    Location extends // @@protoc_insertion_point(message_implements:context.Location)
-    com.google.protobuf.GeneratedMessageV3 implements LocationOrBuilder {
+    public static final class Location extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Location)
+    LocationOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -66877,9 +66970,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Location}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.Location)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.Location)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.LocationOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Location)
+        context.ContextOuterClass.LocationOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Location_descriptor;
@@ -67574,8 +67666,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.Constraint_EndPointLocation)
-    Constraint_EndPointLocationOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface Constraint_EndPointLocationOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Constraint_EndPointLocation)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.EndPointId endpoint_id = 1;</code>
@@ -67615,9 +67707,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Constraint_EndPointLocation}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.Constraint_EndPointLocation)
-    Constraint_EndPointLocation extends // @@protoc_insertion_point(message_implements:context.Constraint_EndPointLocation)
-    com.google.protobuf.GeneratedMessageV3 implements Constraint_EndPointLocationOrBuilder {
+    public static final class Constraint_EndPointLocation extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Constraint_EndPointLocation)
+    Constraint_EndPointLocationOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -67866,9 +67957,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Constraint_EndPointLocation}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.Constraint_EndPointLocation)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.Constraint_EndPointLocation)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.Constraint_EndPointLocationOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Constraint_EndPointLocation)
+        context.ContextOuterClass.Constraint_EndPointLocationOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Constraint_EndPointLocation_descriptor;
@@ -68314,8 +68404,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.Constraint_EndPointPriority)
-    Constraint_EndPointPriorityOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface Constraint_EndPointPriorityOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Constraint_EndPointPriority)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.EndPointId endpoint_id = 1;</code>
@@ -68344,9 +68434,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Constraint_EndPointPriority}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.Constraint_EndPointPriority)
-    Constraint_EndPointPriority extends // @@protoc_insertion_point(message_implements:context.Constraint_EndPointPriority)
-    com.google.protobuf.GeneratedMessageV3 implements Constraint_EndPointPriorityOrBuilder {
+    public static final class Constraint_EndPointPriority extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Constraint_EndPointPriority)
+    Constraint_EndPointPriorityOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -68572,9 +68661,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Constraint_EndPointPriority}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.Constraint_EndPointPriority)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.Constraint_EndPointPriority)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.Constraint_EndPointPriorityOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Constraint_EndPointPriority)
+        context.ContextOuterClass.Constraint_EndPointPriorityOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Constraint_EndPointPriority_descriptor;
@@ -68932,8 +69020,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.Constraint_SLA_Latency)
-    Constraint_SLA_LatencyOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface Constraint_SLA_LatencyOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Constraint_SLA_Latency)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>float e2e_latency_ms = 1;</code>
@@ -68945,9 +69033,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Constraint_SLA_Latency}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.Constraint_SLA_Latency)
-    Constraint_SLA_Latency extends // @@protoc_insertion_point(message_implements:context.Constraint_SLA_Latency)
-    com.google.protobuf.GeneratedMessageV3 implements Constraint_SLA_LatencyOrBuilder {
+    public static final class Constraint_SLA_Latency extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Constraint_SLA_Latency)
+    Constraint_SLA_LatencyOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -69127,9 +69214,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Constraint_SLA_Latency}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.Constraint_SLA_Latency)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.Constraint_SLA_Latency)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.Constraint_SLA_LatencyOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Constraint_SLA_Latency)
+        context.ContextOuterClass.Constraint_SLA_LatencyOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Constraint_SLA_Latency_descriptor;
@@ -69351,8 +69437,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.Constraint_SLA_Capacity)
-    Constraint_SLA_CapacityOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface Constraint_SLA_CapacityOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Constraint_SLA_Capacity)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>float capacity_gbps = 1;</code>
@@ -69364,9 +69450,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Constraint_SLA_Capacity}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.Constraint_SLA_Capacity)
-    Constraint_SLA_Capacity extends // @@protoc_insertion_point(message_implements:context.Constraint_SLA_Capacity)
-    com.google.protobuf.GeneratedMessageV3 implements Constraint_SLA_CapacityOrBuilder {
+    public static final class Constraint_SLA_Capacity extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Constraint_SLA_Capacity)
+    Constraint_SLA_CapacityOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -69546,9 +69631,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Constraint_SLA_Capacity}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.Constraint_SLA_Capacity)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.Constraint_SLA_Capacity)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.Constraint_SLA_CapacityOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Constraint_SLA_Capacity)
+        context.ContextOuterClass.Constraint_SLA_CapacityOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Constraint_SLA_Capacity_descriptor;
@@ -69770,8 +69854,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.Constraint_SLA_Availability)
-    Constraint_SLA_AvailabilityOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface Constraint_SLA_AvailabilityOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Constraint_SLA_Availability)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>uint32 num_disjoint_paths = 1;</code>
@@ -69799,9 +69883,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Constraint_SLA_Availability}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.Constraint_SLA_Availability)
-    Constraint_SLA_Availability extends // @@protoc_insertion_point(message_implements:context.Constraint_SLA_Availability)
-    com.google.protobuf.GeneratedMessageV3 implements Constraint_SLA_AvailabilityOrBuilder {
+    public static final class Constraint_SLA_Availability extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Constraint_SLA_Availability)
+    Constraint_SLA_AvailabilityOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -70031,9 +70114,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Constraint_SLA_Availability}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.Constraint_SLA_Availability)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.Constraint_SLA_Availability)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.Constraint_SLA_AvailabilityOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Constraint_SLA_Availability)
+        context.ContextOuterClass.Constraint_SLA_AvailabilityOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Constraint_SLA_Availability_descriptor;
@@ -70363,8 +70445,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.Constraint_SLA_Isolation_level)
-    Constraint_SLA_Isolation_levelOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface Constraint_SLA_Isolation_levelOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Constraint_SLA_Isolation_level)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.IsolationLevelEnum isolation_level = 1;</code>
@@ -70402,9 +70484,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Constraint_SLA_Isolation_level}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.Constraint_SLA_Isolation_level)
-    Constraint_SLA_Isolation_level extends // @@protoc_insertion_point(message_implements:context.Constraint_SLA_Isolation_level)
-    com.google.protobuf.GeneratedMessageV3 implements Constraint_SLA_Isolation_levelOrBuilder {
+    public static final class Constraint_SLA_Isolation_level extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Constraint_SLA_Isolation_level)
+    Constraint_SLA_Isolation_levelOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -70650,9 +70731,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Constraint_SLA_Isolation_level}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.Constraint_SLA_Isolation_level)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.Constraint_SLA_Isolation_level)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.Constraint_SLA_Isolation_levelOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Constraint_SLA_Isolation_level)
+        context.ContextOuterClass.Constraint_SLA_Isolation_levelOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Constraint_SLA_Isolation_level_descriptor;
@@ -71014,8 +71094,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.Constraint_Exclusions)
-    Constraint_ExclusionsOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface Constraint_ExclusionsOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Constraint_Exclusions)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>bool is_permanent = 1;</code>
@@ -71102,9 +71182,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Constraint_Exclusions}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.Constraint_Exclusions)
-    Constraint_Exclusions extends // @@protoc_insertion_point(message_implements:context.Constraint_Exclusions)
-    com.google.protobuf.GeneratedMessageV3 implements Constraint_ExclusionsOrBuilder {
+    public static final class Constraint_Exclusions extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Constraint_Exclusions)
+    Constraint_ExclusionsOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -71458,9 +71537,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Constraint_Exclusions}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.Constraint_Exclusions)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.Constraint_Exclusions)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.Constraint_ExclusionsOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Constraint_Exclusions)
+        context.ContextOuterClass.Constraint_ExclusionsOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Constraint_Exclusions_descriptor;
@@ -72553,8 +72631,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.QoSProfileId)
-    QoSProfileIdOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface QoSProfileIdOrBuilder extends // @@protoc_insertion_point(interface_extends:context.QoSProfileId)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Uuid qos_profile_id = 1;</code>
@@ -72577,9 +72655,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.QoSProfileId}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.QoSProfileId)
-    QoSProfileId extends // @@protoc_insertion_point(message_implements:context.QoSProfileId)
-    com.google.protobuf.GeneratedMessageV3 implements QoSProfileIdOrBuilder {
+    public static final class QoSProfileId extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.QoSProfileId)
+    QoSProfileIdOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -72782,9 +72859,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.QoSProfileId}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.QoSProfileId)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.QoSProfileId)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.QoSProfileIdOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.QoSProfileId)
+        context.ContextOuterClass.QoSProfileIdOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_QoSProfileId_descriptor;
@@ -73094,8 +73170,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.Constraint_QoSProfile)
-    Constraint_QoSProfileOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface Constraint_QoSProfileOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Constraint_QoSProfile)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.QoSProfileId qos_profile_id = 1;</code>
@@ -73130,9 +73206,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Constraint_QoSProfile}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.Constraint_QoSProfile)
-    Constraint_QoSProfile extends // @@protoc_insertion_point(message_implements:context.Constraint_QoSProfile)
-    com.google.protobuf.GeneratedMessageV3 implements Constraint_QoSProfileOrBuilder {
+    public static final class Constraint_QoSProfile extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Constraint_QoSProfile)
+    Constraint_QoSProfileOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -73384,9 +73459,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Constraint_QoSProfile}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.Constraint_QoSProfile)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.Constraint_QoSProfile)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.Constraint_QoSProfileOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Constraint_QoSProfile)
+        context.ContextOuterClass.Constraint_QoSProfileOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Constraint_QoSProfile_descriptor;
@@ -73787,8 +73861,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.Constraint)
-    ConstraintOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface ConstraintOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Constraint)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.ConstraintActionEnum action = 1;</code>
@@ -73978,9 +74052,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Constraint}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.Constraint)
-    Constraint extends // @@protoc_insertion_point(message_implements:context.Constraint)
-    com.google.protobuf.GeneratedMessageV3 implements ConstraintOrBuilder {
+    public static final class Constraint extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Constraint)
+    ConstraintOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -74734,9 +74807,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Constraint}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.Constraint)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.Constraint)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ConstraintOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Constraint)
+        context.ContextOuterClass.ConstraintOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Constraint_descriptor;
@@ -76602,8 +76674,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.TeraFlowController)
-    TeraFlowControllerOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface TeraFlowControllerOrBuilder extends // @@protoc_insertion_point(interface_extends:context.TeraFlowController)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.ContextId context_id = 1;</code>
@@ -76648,9 +76720,8 @@ public final class ContextOuterClass {
      *
      * Protobuf type {@code context.TeraFlowController}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.TeraFlowController)
-    TeraFlowController extends // @@protoc_insertion_point(message_implements:context.TeraFlowController)
-    com.google.protobuf.GeneratedMessageV3 implements TeraFlowControllerOrBuilder {
+    public static final class TeraFlowController extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.TeraFlowController)
+    TeraFlowControllerOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -76929,9 +77000,8 @@ public final class ContextOuterClass {
          *
          * Protobuf type {@code context.TeraFlowController}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.TeraFlowController)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.TeraFlowController)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.TeraFlowControllerOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.TeraFlowController)
+        context.ContextOuterClass.TeraFlowControllerOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_TeraFlowController_descriptor;
@@ -77380,8 +77450,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.AuthenticationResult)
-    AuthenticationResultOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface AuthenticationResultOrBuilder extends // @@protoc_insertion_point(interface_extends:context.AuthenticationResult)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.ContextId context_id = 1;</code>
@@ -77410,9 +77480,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.AuthenticationResult}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.AuthenticationResult)
-    AuthenticationResult extends // @@protoc_insertion_point(message_implements:context.AuthenticationResult)
-    com.google.protobuf.GeneratedMessageV3 implements AuthenticationResultOrBuilder {
+    public static final class AuthenticationResult extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.AuthenticationResult)
+    AuthenticationResultOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -77638,9 +77707,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.AuthenticationResult}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.AuthenticationResult)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.AuthenticationResult)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.AuthenticationResultOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.AuthenticationResult)
+        context.ContextOuterClass.AuthenticationResultOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_AuthenticationResult_descriptor;
@@ -77998,8 +78066,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.OpticalConfigId)
-    OpticalConfigIdOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface OpticalConfigIdOrBuilder extends // @@protoc_insertion_point(interface_extends:context.OpticalConfigId)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>string opticalconfig_uuid = 1;</code>
@@ -78021,9 +78089,8 @@ public final class ContextOuterClass {
      *
      * Protobuf type {@code context.OpticalConfigId}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.OpticalConfigId)
-    OpticalConfigId extends // @@protoc_insertion_point(message_implements:context.OpticalConfigId)
-    com.google.protobuf.GeneratedMessageV3 implements OpticalConfigIdOrBuilder {
+    public static final class OpticalConfigId extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.OpticalConfigId)
+    OpticalConfigIdOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -78233,9 +78300,8 @@ public final class ContextOuterClass {
          *
          * Protobuf type {@code context.OpticalConfigId}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.OpticalConfigId)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.OpticalConfigId)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.OpticalConfigIdOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.OpticalConfigId)
+        context.ContextOuterClass.OpticalConfigIdOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_OpticalConfigId_descriptor;
@@ -78500,8 +78566,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.OpticalConfig)
-    OpticalConfigOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface OpticalConfigOrBuilder extends // @@protoc_insertion_point(interface_extends:context.OpticalConfig)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.OpticalConfigId opticalconfig_id = 1;</code>
@@ -78553,9 +78619,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.OpticalConfig}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.OpticalConfig)
-    OpticalConfig extends // @@protoc_insertion_point(message_implements:context.OpticalConfig)
-    com.google.protobuf.GeneratedMessageV3 implements OpticalConfigOrBuilder {
+    public static final class OpticalConfig extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.OpticalConfig)
+    OpticalConfigOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -78853,9 +78918,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.OpticalConfig}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.OpticalConfig)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.OpticalConfig)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.OpticalConfigOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.OpticalConfig)
+        context.ContextOuterClass.OpticalConfigOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_OpticalConfig_descriptor;
@@ -79392,8 +79456,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.OpticalConfigList)
-    OpticalConfigListOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface OpticalConfigListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.OpticalConfigList)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.OpticalConfig opticalconfigs = 1;</code>
@@ -79424,9 +79488,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.OpticalConfigList}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.OpticalConfigList)
-    OpticalConfigList extends // @@protoc_insertion_point(message_implements:context.OpticalConfigList)
-    com.google.protobuf.GeneratedMessageV3 implements OpticalConfigListOrBuilder {
+    public static final class OpticalConfigList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.OpticalConfigList)
+    OpticalConfigListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -79641,9 +79704,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.OpticalConfigList}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.OpticalConfigList)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.OpticalConfigList)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.OpticalConfigListOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.OpticalConfigList)
+        context.ContextOuterClass.OpticalConfigListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_OpticalConfigList_descriptor;
@@ -80110,8 +80172,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.OpticalConfigEvent)
-    OpticalConfigEventOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface OpticalConfigEventOrBuilder extends // @@protoc_insertion_point(interface_extends:context.OpticalConfigEvent)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Event event = 1;</code>
@@ -80151,9 +80213,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.OpticalConfigEvent}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.OpticalConfigEvent)
-    OpticalConfigEvent extends // @@protoc_insertion_point(message_implements:context.OpticalConfigEvent)
-    com.google.protobuf.GeneratedMessageV3 implements OpticalConfigEventOrBuilder {
+    public static final class OpticalConfigEvent extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.OpticalConfigEvent)
+    OpticalConfigEventOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -80402,9 +80463,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.OpticalConfigEvent}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.OpticalConfigEvent)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.OpticalConfigEvent)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.OpticalConfigEventOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.OpticalConfigEvent)
+        context.ContextOuterClass.OpticalConfigEventOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_OpticalConfigEvent_descriptor;
@@ -80850,8 +80910,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.OpticalEndPointId)
-    OpticalEndPointIdOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface OpticalEndPointIdOrBuilder extends // @@protoc_insertion_point(interface_extends:context.OpticalEndPointId)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.DeviceId device_id = 2;</code>
@@ -80891,9 +80951,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.OpticalEndPointId}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.OpticalEndPointId)
-    OpticalEndPointId extends // @@protoc_insertion_point(message_implements:context.OpticalEndPointId)
-    com.google.protobuf.GeneratedMessageV3 implements OpticalEndPointIdOrBuilder {
+    public static final class OpticalEndPointId extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.OpticalEndPointId)
+    OpticalEndPointIdOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -81142,9 +81201,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.OpticalEndPointId}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.OpticalEndPointId)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.OpticalEndPointId)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.OpticalEndPointIdOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.OpticalEndPointId)
+        context.ContextOuterClass.OpticalEndPointIdOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_OpticalEndPointId_descriptor;
@@ -81590,8 +81648,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.OpticalLinkList)
-    OpticalLinkListOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface OpticalLinkListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.OpticalLinkList)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.OpticalLink optical_links = 1;</code>
@@ -81622,9 +81680,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.OpticalLinkList}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.OpticalLinkList)
-    OpticalLinkList extends // @@protoc_insertion_point(message_implements:context.OpticalLinkList)
-    com.google.protobuf.GeneratedMessageV3 implements OpticalLinkListOrBuilder {
+    public static final class OpticalLinkList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.OpticalLinkList)
+    OpticalLinkListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -81839,9 +81896,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.OpticalLinkList}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.OpticalLinkList)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.OpticalLinkList)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.OpticalLinkListOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.OpticalLinkList)
+        context.ContextOuterClass.OpticalLinkListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_OpticalLinkList_descriptor;
@@ -82308,8 +82364,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.OpticalLinkDetails)
-    OpticalLinkDetailsOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface OpticalLinkDetailsOrBuilder extends // @@protoc_insertion_point(interface_extends:context.OpticalLinkDetails)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>float length = 1;</code>
@@ -82468,9 +82524,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.OpticalLinkDetails}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.OpticalLinkDetails)
-    OpticalLinkDetails extends // @@protoc_insertion_point(message_implements:context.OpticalLinkDetails)
-    com.google.protobuf.GeneratedMessageV3 implements OpticalLinkDetailsOrBuilder {
+    public static final class OpticalLinkDetails extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.OpticalLinkDetails)
+    OpticalLinkDetailsOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -83145,9 +83200,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.OpticalLinkDetails}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.OpticalLinkDetails)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.OpticalLinkDetails)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.OpticalLinkDetailsOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.OpticalLinkDetails)
+        context.ContextOuterClass.OpticalLinkDetailsOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_OpticalLinkDetails_descriptor;
@@ -84235,8 +84289,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.OpticalLink)
-    OpticalLinkOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface OpticalLinkOrBuilder extends // @@protoc_insertion_point(interface_extends:context.OpticalLink)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>string name = 1;</code>
@@ -84313,9 +84367,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.OpticalLink}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.OpticalLink)
-    OpticalLink extends // @@protoc_insertion_point(message_implements:context.OpticalLink)
-    com.google.protobuf.GeneratedMessageV3 implements OpticalLinkOrBuilder {
+    public static final class OpticalLink extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.OpticalLink)
+    OpticalLinkOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -84671,9 +84724,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.OpticalLink}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.OpticalLink)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.OpticalLink)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.OpticalLinkOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.OpticalLink)
+        context.ContextOuterClass.OpticalLinkOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_OpticalLink_descriptor;
@@ -85503,8 +85555,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.ChannelId)
-    ChannelIdOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface ChannelIdOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ChannelId)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Uuid channel_uuid = 1;</code>
@@ -85527,9 +85579,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ChannelId}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.ChannelId)
-    ChannelId extends // @@protoc_insertion_point(message_implements:context.ChannelId)
-    com.google.protobuf.GeneratedMessageV3 implements ChannelIdOrBuilder {
+    public static final class ChannelId extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ChannelId)
+    ChannelIdOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -85732,9 +85783,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ChannelId}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.ChannelId)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.ChannelId)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ChannelIdOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ChannelId)
+        context.ContextOuterClass.ChannelIdOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ChannelId_descriptor;
@@ -86044,8 +86094,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.OpticalBandId)
-    OpticalBandIdOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface OpticalBandIdOrBuilder extends // @@protoc_insertion_point(interface_extends:context.OpticalBandId)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Uuid opticalband_uuid = 1;</code>
@@ -86068,9 +86118,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.OpticalBandId}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.OpticalBandId)
-    OpticalBandId extends // @@protoc_insertion_point(message_implements:context.OpticalBandId)
-    com.google.protobuf.GeneratedMessageV3 implements OpticalBandIdOrBuilder {
+    public static final class OpticalBandId extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.OpticalBandId)
+    OpticalBandIdOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -86273,9 +86322,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.OpticalBandId}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.OpticalBandId)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.OpticalBandId)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.OpticalBandIdOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.OpticalBandId)
+        context.ContextOuterClass.OpticalBandIdOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_OpticalBandId_descriptor;
@@ -86585,8 +86633,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.OpticalBand)
-    OpticalBandOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface OpticalBandOrBuilder extends // @@protoc_insertion_point(interface_extends:context.OpticalBand)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.OpticalBandId opticalband_id = 1;</code>
@@ -86714,9 +86762,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.OpticalBand}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.OpticalBand)
-    OpticalBand extends // @@protoc_insertion_point(message_implements:context.OpticalBand)
-    com.google.protobuf.GeneratedMessageV3 implements OpticalBandOrBuilder {
+    public static final class OpticalBand extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.OpticalBand)
+    OpticalBandOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -87277,9 +87324,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.OpticalBand}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.OpticalBand)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.OpticalBand)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.OpticalBandOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.OpticalBand)
+        context.ContextOuterClass.OpticalBandOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_OpticalBand_descriptor;
@@ -88455,8 +88501,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.OpticalBandList)
-    OpticalBandListOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface OpticalBandListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.OpticalBandList)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.OpticalBand opticalbands = 1;</code>
@@ -88487,9 +88533,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.OpticalBandList}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.OpticalBandList)
-    OpticalBandList extends // @@protoc_insertion_point(message_implements:context.OpticalBandList)
-    com.google.protobuf.GeneratedMessageV3 implements OpticalBandListOrBuilder {
+    public static final class OpticalBandList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.OpticalBandList)
+    OpticalBandListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -88704,9 +88749,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.OpticalBandList}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.OpticalBandList)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.OpticalBandList)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.OpticalBandListOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.OpticalBandList)
+        context.ContextOuterClass.OpticalBandListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_OpticalBandList_descriptor;
@@ -89173,8 +89217,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.ServiceConfigRule)
-    ServiceConfigRuleOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface ServiceConfigRuleOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ServiceConfigRule)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.ServiceId service_id = 1;</code>
@@ -89214,9 +89258,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ServiceConfigRule}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.ServiceConfigRule)
-    ServiceConfigRule extends // @@protoc_insertion_point(message_implements:context.ServiceConfigRule)
-    com.google.protobuf.GeneratedMessageV3 implements ServiceConfigRuleOrBuilder {
+    public static final class ServiceConfigRule extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ServiceConfigRule)
+    ServiceConfigRuleOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -89465,9 +89508,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ServiceConfigRule}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.ServiceConfigRule)
-        Builder extends // @@protoc_insertion_point(builder_implements:context.ServiceConfigRule)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ServiceConfigRuleOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ServiceConfigRule)
+        context.ContextOuterClass.ServiceConfigRuleOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ServiceConfigRule_descriptor;
@@ -90328,7 +90370,7 @@ public final class ContextOuterClass {
     private static com.google.protobuf.Descriptors.FileDescriptor descriptor;
 
     static {
-        java.lang.String[] descriptorData = { "\n\rcontext.proto\022\007context\032\031google/protobu" + "f/any.proto\032\tacl.proto\032\014ipowdm.proto\032\rip" + "_link.proto\032\026kpi_sample_types.proto\032\016tap" + "i_lsp.proto\"\007\n\005Empty\"\024\n\004Uuid\022\014\n\004uuid\030\001 \001" + "(\t\"\036\n\tTimestamp\022\021\n\ttimestamp\030\001 \001(\001\"Z\n\005Ev" + "ent\022%\n\ttimestamp\030\001 \001(\0132\022.context.Timesta" + "mp\022*\n\nevent_type\030\002 \001(\0162\026.context.EventTy" + "peEnum\"\265\002\n\010AnyEvent\022(\n\007context\030\001 \001(\0132\025.c" + "ontext.ContextEventH\000\022*\n\010topology\030\002 \001(\0132" + "\026.context.TopologyEventH\000\022&\n\006device\030\003 \001(" + "\0132\024.context.DeviceEventH\000\022\"\n\004link\030\004 \001(\0132" + "\022.context.LinkEventH\000\022(\n\007service\030\005 \001(\0132\025" + ".context.ServiceEventH\000\022$\n\005slice\030\006 \001(\0132\023" + ".context.SliceEventH\000\022.\n\nconnection\030\007 \001(" + "\0132\030.context.ConnectionEventH\000B\007\n\005event\"0" + "\n\tContextId\022#\n\014context_uuid\030\001 \001(\0132\r.cont" + "ext.Uuid\"\351\001\n\007Context\022&\n\ncontext_id\030\001 \001(\013" + "2\022.context.ContextId\022\014\n\004name\030\002 \001(\t\022)\n\014to" + "pology_ids\030\003 \003(\0132\023.context.TopologyId\022\'\n" + "\013service_ids\030\004 \003(\0132\022.context.ServiceId\022#" + "\n\tslice_ids\030\005 \003(\0132\020.context.SliceId\022/\n\nc" + "ontroller\030\006 \001(\0132\033.context.TeraFlowContro" + "ller\"8\n\rContextIdList\022\'\n\013context_ids\030\001 \003" + "(\0132\022.context.ContextId\"1\n\013ContextList\022\"\n" + "\010contexts\030\001 \003(\0132\020.context.Context\"U\n\014Con" + "textEvent\022\035\n\005event\030\001 \001(\0132\016.context.Event" + "\022&\n\ncontext_id\030\002 \001(\0132\022.context.ContextId" + "\"Z\n\nTopologyId\022&\n\ncontext_id\030\001 \001(\0132\022.con" + "text.ContextId\022$\n\rtopology_uuid\030\002 \001(\0132\r." + "context.Uuid\"\267\001\n\010Topology\022(\n\013topology_id" + "\030\001 \001(\0132\023.context.TopologyId\022\014\n\004name\030\002 \001(" + "\t\022%\n\ndevice_ids\030\003 \003(\0132\021.context.DeviceId" + "\022!\n\010link_ids\030\004 \003(\0132\017.context.LinkId\022)\n\020o" + "ptical_link_ids\030\005 \003(\0132\017.context.LinkId\"\266" + "\001\n\017TopologyDetails\022(\n\013topology_id\030\001 \001(\0132" + "\023.context.TopologyId\022\014\n\004name\030\002 \001(\t\022 \n\007de" + "vices\030\003 \003(\0132\017.context.Device\022\034\n\005links\030\004 " + "\003(\0132\r.context.Link\022+\n\roptical_links\030\005 \003(" + "\0132\024.context.OpticalLink\";\n\016TopologyIdLis" + "t\022)\n\014topology_ids\030\001 \003(\0132\023.context.Topolo" + "gyId\"5\n\014TopologyList\022%\n\ntopologies\030\001 \003(\013" + "2\021.context.Topology\"X\n\rTopologyEvent\022\035\n\005" + "event\030\001 \001(\0132\016.context.Event\022(\n\013topology_" + "id\030\002 \001(\0132\023.context.TopologyId\".\n\010DeviceI" + "d\022\"\n\013device_uuid\030\001 \001(\0132\r.context.Uuid\"\372\002" + "\n\006Device\022$\n\tdevice_id\030\001 \001(\0132\021.context.De" + "viceId\022\014\n\004name\030\002 \001(\t\022\023\n\013device_type\030\003 \001(" + "\t\022,\n\rdevice_config\030\004 \001(\0132\025.context.Devic" + "eConfig\022G\n\031device_operational_status\030\005 \001" + "(\0162$.context.DeviceOperationalStatusEnum" + "\0221\n\016device_drivers\030\006 \003(\0162\031.context.Devic" + "eDriverEnum\022+\n\020device_endpoints\030\007 \003(\0132\021." + "context.EndPoint\022&\n\ncomponents\030\010 \003(\0132\022.c" + "ontext.Component\022(\n\rcontroller_id\030\t \001(\0132" + "\021.context.DeviceId\"\311\001\n\tComponent\022%\n\016comp" + "onent_uuid\030\001 \001(\0132\r.context.Uuid\022\014\n\004name\030" + "\002 \001(\t\022\014\n\004type\030\003 \001(\t\0226\n\nattributes\030\004 \003(\0132" + "\".context.Component.AttributesEntry\022\016\n\006p" + "arent\030\005 \001(\t\0321\n\017AttributesEntry\022\013\n\003key\030\001 " + "\001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"9\n\014DeviceConfig\022)" + "\n\014config_rules\030\001 \003(\0132\023.context.ConfigRul" + "e\"5\n\014DeviceIdList\022%\n\ndevice_ids\030\001 \003(\0132\021." + "context.DeviceId\".\n\nDeviceList\022 \n\007device" + "s\030\001 \003(\0132\017.context.Device\"\216\001\n\014DeviceFilte" + "r\022)\n\ndevice_ids\030\001 \001(\0132\025.context.DeviceId" + "List\022\031\n\021include_endpoints\030\002 \001(\010\022\034\n\024inclu" + "de_config_rules\030\003 \001(\010\022\032\n\022include_compone" + "nts\030\004 \001(\010\"\200\001\n\013DeviceEvent\022\035\n\005event\030\001 \001(\013" + "2\016.context.Event\022$\n\tdevice_id\030\002 \001(\0132\021.co" + "ntext.DeviceId\022,\n\rdevice_config\030\003 \001(\0132\025." + "context.DeviceConfig\"*\n\006LinkId\022 \n\tlink_u" + "uid\030\001 \001(\0132\r.context.Uuid\"c\n\016LinkAttribut" + "es\022\030\n\020is_bidirectional\030\001 \001(\010\022\033\n\023total_ca" + "pacity_gbps\030\002 \001(\002\022\032\n\022used_capacity_gbps\030" + "\003 \001(\002\"\275\001\n\004Link\022 \n\007link_id\030\001 \001(\0132\017.contex" + "t.LinkId\022\014\n\004name\030\002 \001(\t\022(\n\tlink_type\030\003 \001(" + "\0162\025.context.LinkTypeEnum\022.\n\021link_endpoin" + "t_ids\030\004 \003(\0132\023.context.EndPointId\022+\n\nattr" + "ibutes\030\005 \001(\0132\027.context.LinkAttributes\"/\n" + "\nLinkIdList\022!\n\010link_ids\030\001 \003(\0132\017.context." + "LinkId\"(\n\010LinkList\022\034\n\005links\030\001 \003(\0132\r.cont" + "ext.Link\"L\n\tLinkEvent\022\035\n\005event\030\001 \001(\0132\016.c" + "ontext.Event\022 \n\007link_id\030\002 \001(\0132\017.context." + "LinkId\"X\n\tServiceId\022&\n\ncontext_id\030\001 \001(\0132" + "\022.context.ContextId\022#\n\014service_uuid\030\002 \001(" + "\0132\r.context.Uuid\"\333\002\n\007Service\022&\n\nservice_" + "id\030\001 \001(\0132\022.context.ServiceId\022\014\n\004name\030\002 \001" + "(\t\022.\n\014service_type\030\003 \001(\0162\030.context.Servi" + "ceTypeEnum\0221\n\024service_endpoint_ids\030\004 \003(\013" + "2\023.context.EndPointId\0220\n\023service_constra" + "ints\030\005 \003(\0132\023.context.Constraint\022.\n\016servi" + "ce_status\030\006 \001(\0132\026.context.ServiceStatus\022" + ".\n\016service_config\030\007 \001(\0132\026.context.Servic" + "eConfig\022%\n\ttimestamp\030\010 \001(\0132\022.context.Tim" + "estamp\"C\n\rServiceStatus\0222\n\016service_statu" + "s\030\001 \001(\0162\032.context.ServiceStatusEnum\":\n\rS" + "erviceConfig\022)\n\014config_rules\030\001 \003(\0132\023.con" + "text.ConfigRule\"8\n\rServiceIdList\022\'\n\013serv" + "ice_ids\030\001 \003(\0132\022.context.ServiceId\"1\n\013Ser" + "viceList\022\"\n\010services\030\001 \003(\0132\020.context.Ser" + "vice\"\225\001\n\rServiceFilter\022+\n\013service_ids\030\001 " + "\001(\0132\026.context.ServiceIdList\022\034\n\024include_e" + "ndpoint_ids\030\002 \001(\010\022\033\n\023include_constraints" + "\030\003 \001(\010\022\034\n\024include_config_rules\030\004 \001(\010\"U\n\014" + "ServiceEvent\022\035\n\005event\030\001 \001(\0132\016.context.Ev" + "ent\022&\n\nservice_id\030\002 \001(\0132\022.context.Servic" + "eId\"T\n\007SliceId\022&\n\ncontext_id\030\001 \001(\0132\022.con" + "text.ContextId\022!\n\nslice_uuid\030\002 \001(\0132\r.con" + "text.Uuid\"\240\003\n\005Slice\022\"\n\010slice_id\030\001 \001(\0132\020." + "context.SliceId\022\014\n\004name\030\002 \001(\t\022/\n\022slice_e" + "ndpoint_ids\030\003 \003(\0132\023.context.EndPointId\022." + "\n\021slice_constraints\030\004 \003(\0132\023.context.Cons" + "traint\022-\n\021slice_service_ids\030\005 \003(\0132\022.cont" + "ext.ServiceId\022,\n\022slice_subslice_ids\030\006 \003(" + "\0132\020.context.SliceId\022*\n\014slice_status\030\007 \001(" + "\0132\024.context.SliceStatus\022*\n\014slice_config\030" + "\010 \001(\0132\024.context.SliceConfig\022(\n\013slice_own" + "er\030\t \001(\0132\023.context.SliceOwner\022%\n\ttimesta" + "mp\030\n \001(\0132\022.context.Timestamp\"E\n\nSliceOwn" + "er\022!\n\nowner_uuid\030\001 \001(\0132\r.context.Uuid\022\024\n" + "\014owner_string\030\002 \001(\t\"=\n\013SliceStatus\022.\n\014sl" + "ice_status\030\001 \001(\0162\030.context.SliceStatusEn" + "um\"8\n\013SliceConfig\022)\n\014config_rules\030\001 \003(\0132" + "\023.context.ConfigRule\"2\n\013SliceIdList\022#\n\ts" + "lice_ids\030\001 \003(\0132\020.context.SliceId\"+\n\tSlic" + "eList\022\036\n\006slices\030\001 \003(\0132\016.context.Slice\"\312\001" + "\n\013SliceFilter\022\'\n\tslice_ids\030\001 \001(\0132\024.conte" + "xt.SliceIdList\022\034\n\024include_endpoint_ids\030\002" + " \001(\010\022\033\n\023include_constraints\030\003 \001(\010\022\033\n\023inc" + "lude_service_ids\030\004 \001(\010\022\034\n\024include_subsli" + "ce_ids\030\005 \001(\010\022\034\n\024include_config_rules\030\006 \001" + "(\010\"O\n\nSliceEvent\022\035\n\005event\030\001 \001(\0132\016.contex" + "t.Event\022\"\n\010slice_id\030\002 \001(\0132\020.context.Slic" + "eId\"6\n\014ConnectionId\022&\n\017connection_uuid\030\001" + " \001(\0132\r.context.Uuid\"2\n\025ConnectionSetting" + "s_L0\022\031\n\021lsp_symbolic_name\030\001 \001(\t\"\236\001\n\025Conn" + "ectionSettings_L2\022\027\n\017src_mac_address\030\001 \001" + "(\t\022\027\n\017dst_mac_address\030\002 \001(\t\022\022\n\nether_typ" + "e\030\003 \001(\r\022\017\n\007vlan_id\030\004 \001(\r\022\022\n\nmpls_label\030\005" + " \001(\r\022\032\n\022mpls_traffic_class\030\006 \001(\r\"t\n\025Conn" + "ectionSettings_L3\022\026\n\016src_ip_address\030\001 \001(" + "\t\022\026\n\016dst_ip_address\030\002 \001(\t\022\014\n\004dscp\030\003 \001(\r\022" + "\020\n\010protocol\030\004 \001(\r\022\013\n\003ttl\030\005 \001(\r\"[\n\025Connec" + "tionSettings_L4\022\020\n\010src_port\030\001 \001(\r\022\020\n\010dst" + "_port\030\002 \001(\r\022\021\n\ttcp_flags\030\003 \001(\r\022\013\n\003ttl\030\004 " + "\001(\r\"\304\001\n\022ConnectionSettings\022*\n\002l0\030\001 \001(\0132\036" + ".context.ConnectionSettings_L0\022*\n\002l2\030\002 \001" + "(\0132\036.context.ConnectionSettings_L2\022*\n\002l3" + "\030\003 \001(\0132\036.context.ConnectionSettings_L3\022*" + "\n\002l4\030\004 \001(\0132\036.context.ConnectionSettings_" + "L4\"\363\001\n\nConnection\022,\n\rconnection_id\030\001 \001(\013" + "2\025.context.ConnectionId\022&\n\nservice_id\030\002 " + "\001(\0132\022.context.ServiceId\0223\n\026path_hops_end" + "point_ids\030\003 \003(\0132\023.context.EndPointId\022+\n\017" + "sub_service_ids\030\004 \003(\0132\022.context.ServiceI" + "d\022-\n\010settings\030\005 \001(\0132\033.context.Connection" + "Settings\"A\n\020ConnectionIdList\022-\n\016connecti" + "on_ids\030\001 \003(\0132\025.context.ConnectionId\":\n\016C" + "onnectionList\022(\n\013connections\030\001 \003(\0132\023.con" + "text.Connection\"^\n\017ConnectionEvent\022\035\n\005ev" + "ent\030\001 \001(\0132\016.context.Event\022,\n\rconnection_" + "id\030\002 \001(\0132\025.context.ConnectionId\"\202\001\n\nEndP" + "ointId\022(\n\013topology_id\030\001 \001(\0132\023.context.To" + "pologyId\022$\n\tdevice_id\030\002 \001(\0132\021.context.De" + "viceId\022$\n\rendpoint_uuid\030\003 \001(\0132\r.context." + "Uuid\"\310\002\n\010EndPoint\022(\n\013endpoint_id\030\001 \001(\0132\023" + ".context.EndPointId\022\014\n\004name\030\002 \001(\t\022\025\n\rend" + "point_type\030\003 \001(\t\0229\n\020kpi_sample_types\030\004 \003" + "(\0162\037.kpi_sample_types.KpiSampleType\022,\n\021e" + "ndpoint_location\030\005 \001(\0132\021.context.Locatio" + "n\0229\n\014capabilities\030\006 \003(\0132#.context.EndPoi" + "nt.CapabilitiesEntry\032I\n\021CapabilitiesEntr" + "y\022\013\n\003key\030\001 \001(\t\022#\n\005value\030\002 \001(\0132\024.google.p" + "rotobuf.Any:\0028\001\"{\n\014EndPointName\022(\n\013endpo" + "int_id\030\001 \001(\0132\023.context.EndPointId\022\023\n\013dev" + "ice_name\030\002 \001(\t\022\025\n\rendpoint_name\030\003 \001(\t\022\025\n" + "\rendpoint_type\030\004 \001(\t\";\n\016EndPointIdList\022)" + "\n\014endpoint_ids\030\001 \003(\0132\023.context.EndPointI" + "d\"A\n\020EndPointNameList\022-\n\016endpoint_names\030" + "\001 \003(\0132\025.context.EndPointName\"A\n\021ConfigRu" + "le_Custom\022\024\n\014resource_key\030\001 \001(\t\022\026\n\016resou" + "rce_value\030\002 \001(\t\"]\n\016ConfigRule_ACL\022(\n\013end" + "point_id\030\001 \001(\0132\023.context.EndPointId\022!\n\010r" + "ule_set\030\002 \001(\0132\017.acl.AclRuleSet\"f\n\021Config" + "Rule_IPOWDM\022(\n\013endpoint_id\030\001 \001(\0132\023.conte" + "xt.EndPointId\022\'\n\010rule_set\030\002 \001(\0132\025.ipowdm" + ".IpowdmRuleSet\"k\n\023ConfigRule_TAPI_LSP\022(\n" + "\013endpoint_id\030\001 \001(\0132\023.context.EndPointId\022" + "*\n\010rule_set\030\002 \003(\0132\030.tapi_lsp.TapiLspRule" + "Set\"h\n\022ConfigRule_IP_LINK\022(\n\013endpoint_id" + "\030\001 \001(\0132\023.context.EndPointId\022(\n\010rule_set\030" + "\002 \001(\0132\026.ip_link.IpLinkRuleSet\"\254\002\n\nConfig" + "Rule\022)\n\006action\030\001 \001(\0162\031.context.ConfigAct" + "ionEnum\022,\n\006custom\030\002 \001(\0132\032.context.Config" + "Rule_CustomH\000\022&\n\003acl\030\003 \001(\0132\027.context.Con" + "figRule_ACLH\000\022.\n\007ip_link\030\004 \001(\0132\033.context" + ".ConfigRule_IP_LINKH\000\0220\n\010tapi_lsp\030\005 \001(\0132" + "\034.context.ConfigRule_TAPI_LSPH\000\022,\n\006ipowd" + "m\030\006 \001(\0132\032.context.ConfigRule_IPOWDMH\000B\r\n" + "\013config_rule\"F\n\021Constraint_Custom\022\027\n\017con" + "straint_type\030\001 \001(\t\022\030\n\020constraint_value\030\002" + " \001(\t\"E\n\023Constraint_Schedule\022\027\n\017start_tim" + "estamp\030\001 \001(\001\022\025\n\rduration_days\030\002 \001(\002\"3\n\014G" + "PS_Position\022\020\n\010latitude\030\001 \001(\002\022\021\n\tlongitu" + "de\030\002 \001(\002\"\204\001\n\010Location\022\020\n\006region\030\001 \001(\tH\000\022" + "-\n\014gps_position\030\002 \001(\0132\025.context.GPS_Posi" + "tionH\000\022\023\n\tinterface\030\003 \001(\tH\000\022\026\n\014circuit_p" + "ack\030\004 \001(\tH\000B\n\n\010location\"l\n\033Constraint_En" + "dPointLocation\022(\n\013endpoint_id\030\001 \001(\0132\023.co" + "ntext.EndPointId\022#\n\010location\030\002 \001(\0132\021.con" + "text.Location\"Y\n\033Constraint_EndPointPrio" + "rity\022(\n\013endpoint_id\030\001 \001(\0132\023.context.EndP" + "ointId\022\020\n\010priority\030\002 \001(\r\"0\n\026Constraint_S" + "LA_Latency\022\026\n\016e2e_latency_ms\030\001 \001(\002\"0\n\027Co" + "nstraint_SLA_Capacity\022\025\n\rcapacity_gbps\030\001" + " \001(\002\"c\n\033Constraint_SLA_Availability\022\032\n\022n" + "um_disjoint_paths\030\001 \001(\r\022\022\n\nall_active\030\002 " + "\001(\010\022\024\n\014availability\030\003 \001(\002\"V\n\036Constraint_" + "SLA_Isolation_level\0224\n\017isolation_level\030\001" + " \003(\0162\033.context.IsolationLevelEnum\"\242\001\n\025Co" + "nstraint_Exclusions\022\024\n\014is_permanent\030\001 \001(" + "\010\022%\n\ndevice_ids\030\002 \003(\0132\021.context.DeviceId" + "\022)\n\014endpoint_ids\030\003 \003(\0132\023.context.EndPoin" + "tId\022!\n\010link_ids\030\004 \003(\0132\017.context.LinkId\"5" + "\n\014QoSProfileId\022%\n\016qos_profile_id\030\001 \001(\0132\r" + ".context.Uuid\"`\n\025Constraint_QoSProfile\022-" + "\n\016qos_profile_id\030\001 \001(\0132\025.context.QoSProf" + "ileId\022\030\n\020qos_profile_name\030\002 \001(\t\"\222\005\n\nCons" + "traint\022-\n\006action\030\001 \001(\0162\035.context.Constra" + "intActionEnum\022,\n\006custom\030\002 \001(\0132\032.context." + "Constraint_CustomH\000\0220\n\010schedule\030\003 \001(\0132\034." + "context.Constraint_ScheduleH\000\022A\n\021endpoin" + "t_location\030\004 \001(\0132$.context.Constraint_En" + "dPointLocationH\000\022A\n\021endpoint_priority\030\005 " + "\001(\0132$.context.Constraint_EndPointPriorit" + "yH\000\0228\n\014sla_capacity\030\006 \001(\0132 .context.Cons" + "traint_SLA_CapacityH\000\0226\n\013sla_latency\030\007 \001" + "(\0132\037.context.Constraint_SLA_LatencyH\000\022@\n" + "\020sla_availability\030\010 \001(\0132$.context.Constr" + "aint_SLA_AvailabilityH\000\022@\n\rsla_isolation" + "\030\t \001(\0132\'.context.Constraint_SLA_Isolatio" + "n_levelH\000\0224\n\nexclusions\030\n \001(\0132\036.context." + "Constraint_ExclusionsH\000\0225\n\013qos_profile\030\013" + " \001(\0132\036.context.Constraint_QoSProfileH\000B\014" + "\n\nconstraint\"^\n\022TeraFlowController\022&\n\nco" + "ntext_id\030\001 \001(\0132\022.context.ContextId\022\022\n\nip" + "_address\030\002 \001(\t\022\014\n\004port\030\003 \001(\r\"U\n\024Authenti" + "cationResult\022&\n\ncontext_id\030\001 \001(\0132\022.conte" + "xt.ContextId\022\025\n\rauthenticated\030\002 \001(\010\"-\n\017O" + "pticalConfigId\022\032\n\022opticalconfig_uuid\030\001 \001" + "(\t\"y\n\rOpticalConfig\0222\n\020opticalconfig_id\030" + "\001 \001(\0132\030.context.OpticalConfigId\022\016\n\006confi" + "g\030\002 \001(\t\022$\n\tdevice_id\030\003 \001(\0132\021.context.Dev" + "iceId\"C\n\021OpticalConfigList\022.\n\016opticalcon" + "figs\030\001 \003(\0132\026.context.OpticalConfig\"g\n\022Op" + "ticalConfigEvent\022\035\n\005event\030\001 \001(\0132\016.contex" + "t.Event\0222\n\020opticalconfig_id\030\002 \001(\0132\030.cont" + "ext.OpticalConfigId\"_\n\021OpticalEndPointId" + "\022$\n\tdevice_id\030\002 \001(\0132\021.context.DeviceId\022$" + "\n\rendpoint_uuid\030\003 \001(\0132\r.context.Uuid\">\n\017" + "OpticalLinkList\022+\n\roptical_links\030\001 \003(\0132\024" + ".context.OpticalLink\"\304\003\n\022OpticalLinkDeta" + "ils\022\016\n\006length\030\001 \001(\002\022\020\n\010src_port\030\002 \001(\t\022\020\n" + "\010dst_port\030\003 \001(\t\022\027\n\017local_peer_port\030\004 \001(\t" + "\022\030\n\020remote_peer_port\030\005 \001(\t\022\014\n\004used\030\006 \001(\010" + "\0228\n\007c_slots\030\007 \003(\0132\'.context.OpticalLinkD" + "etails.CSlotsEntry\0228\n\007l_slots\030\010 \003(\0132\'.co" + "ntext.OpticalLinkDetails.LSlotsEntry\0228\n\007" + "s_slots\030\t \003(\0132\'.context.OpticalLinkDetai" + "ls.SSlotsEntry\032-\n\013CSlotsEntry\022\013\n\003key\030\001 \001" + "(\t\022\r\n\005value\030\002 \001(\005:\0028\001\032-\n\013LSlotsEntry\022\013\n\003" + "key\030\001 \001(\t\022\r\n\005value\030\002 \001(\005:\0028\001\032-\n\013SSlotsEn" + "try\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\005:\0028\001\"\243\001\n\013" + "OpticalLink\022\014\n\004name\030\001 \001(\t\0224\n\017optical_det" + "ails\030\002 \001(\0132\033.context.OpticalLinkDetails\022" + " \n\007link_id\030\003 \001(\0132\017.context.LinkId\022.\n\021lin" + "k_endpoint_ids\030\004 \003(\0132\023.context.EndPointI" + "d\"0\n\tChannelId\022#\n\014channel_uuid\030\001 \001(\0132\r.c" + "ontext.Uuid\"8\n\rOpticalBandId\022\'\n\020opticalb" + "and_uuid\030\001 \001(\0132\r.context.Uuid\"\247\002\n\013Optica" + "lBand\022.\n\016opticalband_id\030\001 \001(\0132\026.context." + "OpticalBandId\022,\n\rconnection_id\030\002 \001(\0132\025.c" + "ontext.ConnectionId\022&\n\nchannel_id\030\003 \001(\0132" + "\022.context.ChannelId\022&\n\nservice_id\030\004 \001(\0132" + "\022.context.ServiceId\022#\n\007service\030\005 \001(\0132\020.c" + "ontext.ServiceH\000\022)\n\nconnection\030\006 \001(\0132\023.c" + "ontext.ConnectionH\000\022\021\n\007channel\030\007 \001(\tH\000B\007" + "\n\005field\"=\n\017OpticalBandList\022*\n\014opticalban" + "ds\030\001 \003(\0132\024.context.OpticalBand\"r\n\021Servic" + "eConfigRule\022&\n\nservice_id\030\001 \001(\0132\022.contex" + "t.ServiceId\0225\n\021configrule_custom\030\002 \001(\0132\032" + ".context.ConfigRule_Custom*j\n\rEventTypeE" + "num\022\027\n\023EVENTTYPE_UNDEFINED\020\000\022\024\n\020EVENTTYP" + "E_CREATE\020\001\022\024\n\020EVENTTYPE_UPDATE\020\002\022\024\n\020EVEN" + "TTYPE_REMOVE\020\003*\333\004\n\020DeviceDriverEnum\022\032\n\026D" + "EVICEDRIVER_UNDEFINED\020\000\022\033\n\027DEVICEDRIVER_" + "OPENCONFIG\020\001\022\036\n\032DEVICEDRIVER_TRANSPORT_A" + "PI\020\002\022\023\n\017DEVICEDRIVER_P4\020\003\022&\n\"DEVICEDRIVE" + "R_IETF_NETWORK_TOPOLOGY\020\004\022\033\n\027DEVICEDRIVE" + "R_ONF_TR_532\020\005\022\023\n\017DEVICEDRIVER_XR\020\006\022\033\n\027D" + "EVICEDRIVER_IETF_L2VPN\020\007\022 \n\034DEVICEDRIVER" + "_GNMI_OPENCONFIG\020\010\022\034\n\030DEVICEDRIVER_OPTIC" + "AL_TFS\020\t\022\032\n\026DEVICEDRIVER_IETF_ACTN\020\n\022\023\n\017" + "DEVICEDRIVER_OC\020\013\022\024\n\020DEVICEDRIVER_QKD\020\014\022" + "\033\n\027DEVICEDRIVER_IETF_L3VPN\020\r\022\033\n\027DEVICEDR" + "IVER_IETF_SLICE\020\016\022\024\n\020DEVICEDRIVER_NCE\020\017\022" + "\031\n\025DEVICEDRIVER_SMARTNIC\020\020\022\031\n\025DEVICEDRIV" + "ER_MORPHEUS\020\021\022\024\n\020DEVICEDRIVER_RYU\020\022\022#\n\037D" + "EVICEDRIVER_GNMI_NOKIA_SRLINUX\020\023\022\032\n\026DEVI" + "CEDRIVER_OPENROADM\020\024*\217\001\n\033DeviceOperation" + "alStatusEnum\022%\n!DEVICEOPERATIONALSTATUS_" + "UNDEFINED\020\000\022$\n DEVICEOPERATIONALSTATUS_D" + "ISABLED\020\001\022#\n\037DEVICEOPERATIONALSTATUS_ENA" + "BLED\020\002*\245\001\n\014LinkTypeEnum\022\024\n\020LINKTYPE_UNKN" + "OWN\020\000\022\023\n\017LINKTYPE_COPPER\020\001\022\022\n\016LINKTYPE_F" + "IBER\020\002\022\022\n\016LINKTYPE_RADIO\020\003\022\024\n\020LINKTYPE_V" + "IRTUAL\020\004\022\027\n\023LINKTYPE_MANAGEMENT\020\005\022\023\n\017LIN" + "KTYPE_REMOTE\020\006*\360\002\n\017ServiceTypeEnum\022\027\n\023SE" + "RVICETYPE_UNKNOWN\020\000\022\024\n\020SERVICETYPE_L3NM\020" + "\001\022\024\n\020SERVICETYPE_L2NM\020\002\022)\n%SERVICETYPE_T" + "API_CONNECTIVITY_SERVICE\020\003\022\022\n\016SERVICETYP" + "E_TE\020\004\022\023\n\017SERVICETYPE_E2E\020\005\022$\n SERVICETY" + "PE_OPTICAL_CONNECTIVITY\020\006\022\023\n\017SERVICETYPE" + "_QKD\020\007\022\024\n\020SERVICETYPE_L1NM\020\010\022\023\n\017SERVICET" + "YPE_INT\020\t\022\023\n\017SERVICETYPE_ACL\020\n\022\027\n\023SERVIC" + "ETYPE_IP_LINK\020\013\022\030\n\024SERVICETYPE_TAPI_LSP\020" + "\014\022\026\n\022SERVICETYPE_IPOWDM\020\r*\304\001\n\021ServiceSta" + "tusEnum\022\033\n\027SERVICESTATUS_UNDEFINED\020\000\022\031\n\025" + "SERVICESTATUS_PLANNED\020\001\022\030\n\024SERVICESTATUS" + "_ACTIVE\020\002\022\032\n\026SERVICESTATUS_UPDATING\020\003\022!\n" + "\035SERVICESTATUS_PENDING_REMOVAL\020\004\022\036\n\032SERV" + "ICESTATUS_SLA_VIOLATED\020\005*\251\001\n\017SliceStatus" + "Enum\022\031\n\025SLICESTATUS_UNDEFINED\020\000\022\027\n\023SLICE" + "STATUS_PLANNED\020\001\022\024\n\020SLICESTATUS_INIT\020\002\022\026" + "\n\022SLICESTATUS_ACTIVE\020\003\022\026\n\022SLICESTATUS_DE" + "INIT\020\004\022\034\n\030SLICESTATUS_SLA_VIOLATED\020\005*]\n\020" + "ConfigActionEnum\022\032\n\026CONFIGACTION_UNDEFIN" + "ED\020\000\022\024\n\020CONFIGACTION_SET\020\001\022\027\n\023CONFIGACTI" + "ON_DELETE\020\002*m\n\024ConstraintActionEnum\022\036\n\032C" + "ONSTRAINTACTION_UNDEFINED\020\000\022\030\n\024CONSTRAIN" + "TACTION_SET\020\001\022\033\n\027CONSTRAINTACTION_DELETE" + "\020\002*\203\002\n\022IsolationLevelEnum\022\020\n\014NO_ISOLATIO" + "N\020\000\022\026\n\022PHYSICAL_ISOLATION\020\001\022\025\n\021LOGICAL_I" + "SOLATION\020\002\022\025\n\021PROCESS_ISOLATION\020\003\022\035\n\031PHY" + "SICAL_MEMORY_ISOLATION\020\004\022\036\n\032PHYSICAL_NET" + "WORK_ISOLATION\020\005\022\036\n\032VIRTUAL_RESOURCE_ISO" + "LATION\020\006\022\037\n\033NETWORK_FUNCTIONS_ISOLATION\020" + "\007\022\025\n\021SERVICE_ISOLATION\020\0102\274\035\n\016ContextServ" + "ice\022:\n\016ListContextIds\022\016.context.Empty\032\026." + "context.ContextIdList\"\000\0226\n\014ListContexts\022" + "\016.context.Empty\032\024.context.ContextList\"\000\022" + "4\n\nGetContext\022\022.context.ContextId\032\020.cont" + "ext.Context\"\000\0224\n\nSetContext\022\020.context.Co" + "ntext\032\022.context.ContextId\"\000\0225\n\rRemoveCon" + "text\022\022.context.ContextId\032\016.context.Empty" + "\"\000\022=\n\020GetContextEvents\022\016.context.Empty\032\025" + ".context.ContextEvent\"\0000\001\022@\n\017ListTopolog" + "yIds\022\022.context.ContextId\032\027.context.Topol" + "ogyIdList\"\000\022=\n\016ListTopologies\022\022.context." + "ContextId\032\025.context.TopologyList\"\000\0227\n\013Ge" + "tTopology\022\023.context.TopologyId\032\021.context" + ".Topology\"\000\022E\n\022GetTopologyDetails\022\023.cont" + "ext.TopologyId\032\030.context.TopologyDetails" + "\"\000\0227\n\013SetTopology\022\021.context.Topology\032\023.c" + "ontext.TopologyId\"\000\0227\n\016RemoveTopology\022\023." + "context.TopologyId\032\016.context.Empty\"\000\022?\n\021" + "GetTopologyEvents\022\016.context.Empty\032\026.cont" + "ext.TopologyEvent\"\0000\001\0228\n\rListDeviceIds\022\016" + ".context.Empty\032\025.context.DeviceIdList\"\000\022" + "4\n\013ListDevices\022\016.context.Empty\032\023.context" + ".DeviceList\"\000\0221\n\tGetDevice\022\021.context.Dev" + "iceId\032\017.context.Device\"\000\0221\n\tSetDevice\022\017." + "context.Device\032\021.context.DeviceId\"\000\0223\n\014R" + "emoveDevice\022\021.context.DeviceId\032\016.context" + ".Empty\"\000\022;\n\017GetDeviceEvents\022\016.context.Em" + "pty\032\024.context.DeviceEvent\"\0000\001\022<\n\014SelectD" + "evice\022\025.context.DeviceFilter\032\023.context.D" + "eviceList\"\000\022I\n\021ListEndPointNames\022\027.conte" + "xt.EndPointIdList\032\031.context.EndPointName" + "List\"\000\0224\n\013ListLinkIds\022\016.context.Empty\032\023." + "context.LinkIdList\"\000\0220\n\tListLinks\022\016.cont" + "ext.Empty\032\021.context.LinkList\"\000\022+\n\007GetLin" + "k\022\017.context.LinkId\032\r.context.Link\"\000\022+\n\007S" + "etLink\022\r.context.Link\032\017.context.LinkId\"\000" + "\022/\n\nRemoveLink\022\017.context.LinkId\032\016.contex" + "t.Empty\"\000\0227\n\rGetLinkEvents\022\016.context.Emp" + "ty\032\022.context.LinkEvent\"\0000\001\022>\n\016ListServic" + "eIds\022\022.context.ContextId\032\026.context.Servi" + "ceIdList\"\000\022:\n\014ListServices\022\022.context.Con" + "textId\032\024.context.ServiceList\"\000\0224\n\nGetSer" + "vice\022\022.context.ServiceId\032\020.context.Servi" + "ce\"\000\0224\n\nSetService\022\020.context.Service\032\022.c" + "ontext.ServiceId\"\000\0226\n\014UnsetService\022\020.con" + "text.Service\032\022.context.ServiceId\"\000\0225\n\rRe" + "moveService\022\022.context.ServiceId\032\016.contex" + "t.Empty\"\000\022=\n\020GetServiceEvents\022\016.context." + "Empty\032\025.context.ServiceEvent\"\0000\001\022?\n\rSele" + "ctService\022\026.context.ServiceFilter\032\024.cont" + "ext.ServiceList\"\000\022:\n\014ListSliceIds\022\022.cont" + "ext.ContextId\032\024.context.SliceIdList\"\000\0226\n", "\nListSlices\022\022.context.ContextId\032\022.contex" + "t.SliceList\"\000\022.\n\010GetSlice\022\020.context.Slic" + "eId\032\016.context.Slice\"\000\022.\n\010SetSlice\022\016.cont" + "ext.Slice\032\020.context.SliceId\"\000\0220\n\nUnsetSl" + "ice\022\016.context.Slice\032\020.context.SliceId\"\000\022" + "1\n\013RemoveSlice\022\020.context.SliceId\032\016.conte" + "xt.Empty\"\000\0229\n\016GetSliceEvents\022\016.context.E" + "mpty\032\023.context.SliceEvent\"\0000\001\0229\n\013SelectS" + "lice\022\024.context.SliceFilter\032\022.context.Sli" + "ceList\"\000\022D\n\021ListConnectionIds\022\022.context." + "ServiceId\032\031.context.ConnectionIdList\"\000\022@" + "\n\017ListConnections\022\022.context.ServiceId\032\027." + "context.ConnectionList\"\000\022=\n\rGetConnectio" + "n\022\025.context.ConnectionId\032\023.context.Conne" + "ction\"\000\022=\n\rSetConnection\022\023.context.Conne" + "ction\032\025.context.ConnectionId\"\000\022;\n\020Remove" + "Connection\022\025.context.ConnectionId\032\016.cont" + "ext.Empty\"\000\022C\n\023GetConnectionEvents\022\016.con" + "text.Empty\032\030.context.ConnectionEvent\"\0000\001" + "\0225\n\014GetAllEvents\022\016.context.Empty\032\021.conte" + "xt.AnyEvent\"\0000\001\022@\n\020GetOpticalConfig\022\016.co" + "ntext.Empty\032\032.context.OpticalConfigList\"" + "\000\022F\n\020SetOpticalConfig\022\026.context.OpticalC" + "onfig\032\030.context.OpticalConfigId\"\000\022I\n\023Upd" + "ateOpticalConfig\022\026.context.OpticalConfig" + "\032\030.context.OpticalConfigId\"\000\022I\n\023SelectOp" + "ticalConfig\022\030.context.OpticalConfigId\032\026." + "context.OpticalConfig\"\000\022A\n\023DeleteOptical" + "Config\022\030.context.OpticalConfigId\032\016.conte" + "xt.Empty\"\000\022@\n\024DeleteOpticalChannel\022\026.con" + "text.OpticalConfig\032\016.context.Empty\"\000\0228\n\016" + "SetOpticalLink\022\024.context.OpticalLink\032\016.c" + "ontext.Empty\"\000\0229\n\016GetOpticalLink\022\017.conte" + "xt.LinkId\032\024.context.OpticalLink\"\000\0226\n\021Del" + "eteOpticalLink\022\017.context.LinkId\032\016.contex" + "t.Empty\"\000\022@\n\022GetOpticalLinkList\022\016.contex" + "t.Empty\032\030.context.OpticalLinkList\"\000\022<\n\016G" + "etOpticalBand\022\016.context.Empty\032\030.context." + "OpticalBandList\"\000\022C\n\021SelectOpticalBand\022\026" + ".context.OpticalBandId\032\024.context.Optical" + "Band\"\000\022G\n\027DeleteServiceConfigRule\022\032.cont" + "ext.ServiceConfigRule\032\016.context.Empty\"\000b" + "\006proto3" };
+        java.lang.String[] descriptorData = { "\n\rcontext.proto\022\007context\032\031google/protobu" + "f/any.proto\032\tacl.proto\032\014ipowdm.proto\032\rip" + "_link.proto\032\026kpi_sample_types.proto\032\016tap" + "i_lsp.proto\"\007\n\005Empty\"\024\n\004Uuid\022\014\n\004uuid\030\001 \001" + "(\t\"\036\n\tTimestamp\022\021\n\ttimestamp\030\001 \001(\001\"Z\n\005Ev" + "ent\022%\n\ttimestamp\030\001 \001(\0132\022.context.Timesta" + "mp\022*\n\nevent_type\030\002 \001(\0162\026.context.EventTy" + "peEnum\"\265\002\n\010AnyEvent\022(\n\007context\030\001 \001(\0132\025.c" + "ontext.ContextEventH\000\022*\n\010topology\030\002 \001(\0132" + "\026.context.TopologyEventH\000\022&\n\006device\030\003 \001(" + "\0132\024.context.DeviceEventH\000\022\"\n\004link\030\004 \001(\0132" + "\022.context.LinkEventH\000\022(\n\007service\030\005 \001(\0132\025" + ".context.ServiceEventH\000\022$\n\005slice\030\006 \001(\0132\023" + ".context.SliceEventH\000\022.\n\nconnection\030\007 \001(" + "\0132\030.context.ConnectionEventH\000B\007\n\005event\"0" + "\n\tContextId\022#\n\014context_uuid\030\001 \001(\0132\r.cont" + "ext.Uuid\"\351\001\n\007Context\022&\n\ncontext_id\030\001 \001(\013" + "2\022.context.ContextId\022\014\n\004name\030\002 \001(\t\022)\n\014to" + "pology_ids\030\003 \003(\0132\023.context.TopologyId\022\'\n" + "\013service_ids\030\004 \003(\0132\022.context.ServiceId\022#" + "\n\tslice_ids\030\005 \003(\0132\020.context.SliceId\022/\n\nc" + "ontroller\030\006 \001(\0132\033.context.TeraFlowContro" + "ller\"8\n\rContextIdList\022\'\n\013context_ids\030\001 \003" + "(\0132\022.context.ContextId\"1\n\013ContextList\022\"\n" + "\010contexts\030\001 \003(\0132\020.context.Context\"U\n\014Con" + "textEvent\022\035\n\005event\030\001 \001(\0132\016.context.Event" + "\022&\n\ncontext_id\030\002 \001(\0132\022.context.ContextId" + "\"Z\n\nTopologyId\022&\n\ncontext_id\030\001 \001(\0132\022.con" + "text.ContextId\022$\n\rtopology_uuid\030\002 \001(\0132\r." + "context.Uuid\"\267\001\n\010Topology\022(\n\013topology_id" + "\030\001 \001(\0132\023.context.TopologyId\022\014\n\004name\030\002 \001(" + "\t\022%\n\ndevice_ids\030\003 \003(\0132\021.context.DeviceId" + "\022!\n\010link_ids\030\004 \003(\0132\017.context.LinkId\022)\n\020o" + "ptical_link_ids\030\005 \003(\0132\017.context.LinkId\"\266" + "\001\n\017TopologyDetails\022(\n\013topology_id\030\001 \001(\0132" + "\023.context.TopologyId\022\014\n\004name\030\002 \001(\t\022 \n\007de" + "vices\030\003 \003(\0132\017.context.Device\022\034\n\005links\030\004 " + "\003(\0132\r.context.Link\022+\n\roptical_links\030\005 \003(" + "\0132\024.context.OpticalLink\";\n\016TopologyIdLis" + "t\022)\n\014topology_ids\030\001 \003(\0132\023.context.Topolo" + "gyId\"5\n\014TopologyList\022%\n\ntopologies\030\001 \003(\013" + "2\021.context.Topology\"X\n\rTopologyEvent\022\035\n\005" + "event\030\001 \001(\0132\016.context.Event\022(\n\013topology_" + "id\030\002 \001(\0132\023.context.TopologyId\".\n\010DeviceI" + "d\022\"\n\013device_uuid\030\001 \001(\0132\r.context.Uuid\"\372\002" + "\n\006Device\022$\n\tdevice_id\030\001 \001(\0132\021.context.De" + "viceId\022\014\n\004name\030\002 \001(\t\022\023\n\013device_type\030\003 \001(" + "\t\022,\n\rdevice_config\030\004 \001(\0132\025.context.Devic" + "eConfig\022G\n\031device_operational_status\030\005 \001" + "(\0162$.context.DeviceOperationalStatusEnum" + "\0221\n\016device_drivers\030\006 \003(\0162\031.context.Devic" + "eDriverEnum\022+\n\020device_endpoints\030\007 \003(\0132\021." + "context.EndPoint\022&\n\ncomponents\030\010 \003(\0132\022.c" + "ontext.Component\022(\n\rcontroller_id\030\t \001(\0132" + "\021.context.DeviceId\"\311\001\n\tComponent\022%\n\016comp" + "onent_uuid\030\001 \001(\0132\r.context.Uuid\022\014\n\004name\030" + "\002 \001(\t\022\014\n\004type\030\003 \001(\t\0226\n\nattributes\030\004 \003(\0132" + "\".context.Component.AttributesEntry\022\016\n\006p" + "arent\030\005 \001(\t\0321\n\017AttributesEntry\022\013\n\003key\030\001 " + "\001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"9\n\014DeviceConfig\022)" + "\n\014config_rules\030\001 \003(\0132\023.context.ConfigRul" + "e\"5\n\014DeviceIdList\022%\n\ndevice_ids\030\001 \003(\0132\021." + "context.DeviceId\".\n\nDeviceList\022 \n\007device" + "s\030\001 \003(\0132\017.context.Device\"\216\001\n\014DeviceFilte" + "r\022)\n\ndevice_ids\030\001 \001(\0132\025.context.DeviceId" + "List\022\031\n\021include_endpoints\030\002 \001(\010\022\034\n\024inclu" + "de_config_rules\030\003 \001(\010\022\032\n\022include_compone" + "nts\030\004 \001(\010\"\200\001\n\013DeviceEvent\022\035\n\005event\030\001 \001(\013" + "2\016.context.Event\022$\n\tdevice_id\030\002 \001(\0132\021.co" + "ntext.DeviceId\022,\n\rdevice_config\030\003 \001(\0132\025." + "context.DeviceConfig\"*\n\006LinkId\022 \n\tlink_u" + "uid\030\001 \001(\0132\r.context.Uuid\"c\n\016LinkAttribut" + "es\022\030\n\020is_bidirectional\030\001 \001(\010\022\033\n\023total_ca" + "pacity_gbps\030\002 \001(\002\022\032\n\022used_capacity_gbps\030" + "\003 \001(\002\"\275\001\n\004Link\022 \n\007link_id\030\001 \001(\0132\017.contex" + "t.LinkId\022\014\n\004name\030\002 \001(\t\022(\n\tlink_type\030\003 \001(" + "\0162\025.context.LinkTypeEnum\022.\n\021link_endpoin" + "t_ids\030\004 \003(\0132\023.context.EndPointId\022+\n\nattr" + "ibutes\030\005 \001(\0132\027.context.LinkAttributes\"/\n" + "\nLinkIdList\022!\n\010link_ids\030\001 \003(\0132\017.context." + "LinkId\"(\n\010LinkList\022\034\n\005links\030\001 \003(\0132\r.cont" + "ext.Link\"L\n\tLinkEvent\022\035\n\005event\030\001 \001(\0132\016.c" + "ontext.Event\022 \n\007link_id\030\002 \001(\0132\017.context." + "LinkId\"X\n\tServiceId\022&\n\ncontext_id\030\001 \001(\0132" + "\022.context.ContextId\022#\n\014service_uuid\030\002 \001(" + "\0132\r.context.Uuid\"\333\002\n\007Service\022&\n\nservice_" + "id\030\001 \001(\0132\022.context.ServiceId\022\014\n\004name\030\002 \001" + "(\t\022.\n\014service_type\030\003 \001(\0162\030.context.Servi" + "ceTypeEnum\0221\n\024service_endpoint_ids\030\004 \003(\013" + "2\023.context.EndPointId\0220\n\023service_constra" + "ints\030\005 \003(\0132\023.context.Constraint\022.\n\016servi" + "ce_status\030\006 \001(\0132\026.context.ServiceStatus\022" + ".\n\016service_config\030\007 \001(\0132\026.context.Servic" + "eConfig\022%\n\ttimestamp\030\010 \001(\0132\022.context.Tim" + "estamp\"C\n\rServiceStatus\0222\n\016service_statu" + "s\030\001 \001(\0162\032.context.ServiceStatusEnum\":\n\rS" + "erviceConfig\022)\n\014config_rules\030\001 \003(\0132\023.con" + "text.ConfigRule\"8\n\rServiceIdList\022\'\n\013serv" + "ice_ids\030\001 \003(\0132\022.context.ServiceId\"1\n\013Ser" + "viceList\022\"\n\010services\030\001 \003(\0132\020.context.Ser" + "vice\"\225\001\n\rServiceFilter\022+\n\013service_ids\030\001 " + "\001(\0132\026.context.ServiceIdList\022\034\n\024include_e" + "ndpoint_ids\030\002 \001(\010\022\033\n\023include_constraints" + "\030\003 \001(\010\022\034\n\024include_config_rules\030\004 \001(\010\"U\n\014" + "ServiceEvent\022\035\n\005event\030\001 \001(\0132\016.context.Ev" + "ent\022&\n\nservice_id\030\002 \001(\0132\022.context.Servic" + "eId\"T\n\007SliceId\022&\n\ncontext_id\030\001 \001(\0132\022.con" + "text.ContextId\022!\n\nslice_uuid\030\002 \001(\0132\r.con" + "text.Uuid\"\240\003\n\005Slice\022\"\n\010slice_id\030\001 \001(\0132\020." + "context.SliceId\022\014\n\004name\030\002 \001(\t\022/\n\022slice_e" + "ndpoint_ids\030\003 \003(\0132\023.context.EndPointId\022." + "\n\021slice_constraints\030\004 \003(\0132\023.context.Cons" + "traint\022-\n\021slice_service_ids\030\005 \003(\0132\022.cont" + "ext.ServiceId\022,\n\022slice_subslice_ids\030\006 \003(" + "\0132\020.context.SliceId\022*\n\014slice_status\030\007 \001(" + "\0132\024.context.SliceStatus\022*\n\014slice_config\030" + "\010 \001(\0132\024.context.SliceConfig\022(\n\013slice_own" + "er\030\t \001(\0132\023.context.SliceOwner\022%\n\ttimesta" + "mp\030\n \001(\0132\022.context.Timestamp\"E\n\nSliceOwn" + "er\022!\n\nowner_uuid\030\001 \001(\0132\r.context.Uuid\022\024\n" + "\014owner_string\030\002 \001(\t\"=\n\013SliceStatus\022.\n\014sl" + "ice_status\030\001 \001(\0162\030.context.SliceStatusEn" + "um\"8\n\013SliceConfig\022)\n\014config_rules\030\001 \003(\0132" + "\023.context.ConfigRule\"2\n\013SliceIdList\022#\n\ts" + "lice_ids\030\001 \003(\0132\020.context.SliceId\"+\n\tSlic" + "eList\022\036\n\006slices\030\001 \003(\0132\016.context.Slice\"\312\001" + "\n\013SliceFilter\022\'\n\tslice_ids\030\001 \001(\0132\024.conte" + "xt.SliceIdList\022\034\n\024include_endpoint_ids\030\002" + " \001(\010\022\033\n\023include_constraints\030\003 \001(\010\022\033\n\023inc" + "lude_service_ids\030\004 \001(\010\022\034\n\024include_subsli" + "ce_ids\030\005 \001(\010\022\034\n\024include_config_rules\030\006 \001" + "(\010\"O\n\nSliceEvent\022\035\n\005event\030\001 \001(\0132\016.contex" + "t.Event\022\"\n\010slice_id\030\002 \001(\0132\020.context.Slic" + "eId\"6\n\014ConnectionId\022&\n\017connection_uuid\030\001" + " \001(\0132\r.context.Uuid\"2\n\025ConnectionSetting" + "s_L0\022\031\n\021lsp_symbolic_name\030\001 \001(\t\"\236\001\n\025Conn" + "ectionSettings_L2\022\027\n\017src_mac_address\030\001 \001" + "(\t\022\027\n\017dst_mac_address\030\002 \001(\t\022\022\n\nether_typ" + "e\030\003 \001(\r\022\017\n\007vlan_id\030\004 \001(\r\022\022\n\nmpls_label\030\005" + " \001(\r\022\032\n\022mpls_traffic_class\030\006 \001(\r\"t\n\025Conn" + "ectionSettings_L3\022\026\n\016src_ip_address\030\001 \001(" + "\t\022\026\n\016dst_ip_address\030\002 \001(\t\022\014\n\004dscp\030\003 \001(\r\022" + "\020\n\010protocol\030\004 \001(\r\022\013\n\003ttl\030\005 \001(\r\"[\n\025Connec" + "tionSettings_L4\022\020\n\010src_port\030\001 \001(\r\022\020\n\010dst" + "_port\030\002 \001(\r\022\021\n\ttcp_flags\030\003 \001(\r\022\013\n\003ttl\030\004 " + "\001(\r\"\304\001\n\022ConnectionSettings\022*\n\002l0\030\001 \001(\0132\036" + ".context.ConnectionSettings_L0\022*\n\002l2\030\002 \001" + "(\0132\036.context.ConnectionSettings_L2\022*\n\002l3" + "\030\003 \001(\0132\036.context.ConnectionSettings_L3\022*" + "\n\002l4\030\004 \001(\0132\036.context.ConnectionSettings_" + "L4\"\363\001\n\nConnection\022,\n\rconnection_id\030\001 \001(\013" + "2\025.context.ConnectionId\022&\n\nservice_id\030\002 " + "\001(\0132\022.context.ServiceId\0223\n\026path_hops_end" + "point_ids\030\003 \003(\0132\023.context.EndPointId\022+\n\017" + "sub_service_ids\030\004 \003(\0132\022.context.ServiceI" + "d\022-\n\010settings\030\005 \001(\0132\033.context.Connection" + "Settings\"A\n\020ConnectionIdList\022-\n\016connecti" + "on_ids\030\001 \003(\0132\025.context.ConnectionId\":\n\016C" + "onnectionList\022(\n\013connections\030\001 \003(\0132\023.con" + "text.Connection\"^\n\017ConnectionEvent\022\035\n\005ev" + "ent\030\001 \001(\0132\016.context.Event\022,\n\rconnection_" + "id\030\002 \001(\0132\025.context.ConnectionId\"\202\001\n\nEndP" + "ointId\022(\n\013topology_id\030\001 \001(\0132\023.context.To" + "pologyId\022$\n\tdevice_id\030\002 \001(\0132\021.context.De" + "viceId\022$\n\rendpoint_uuid\030\003 \001(\0132\r.context." + "Uuid\"\310\002\n\010EndPoint\022(\n\013endpoint_id\030\001 \001(\0132\023" + ".context.EndPointId\022\014\n\004name\030\002 \001(\t\022\025\n\rend" + "point_type\030\003 \001(\t\0229\n\020kpi_sample_types\030\004 \003" + "(\0162\037.kpi_sample_types.KpiSampleType\022,\n\021e" + "ndpoint_location\030\005 \001(\0132\021.context.Locatio" + "n\0229\n\014capabilities\030\006 \003(\0132#.context.EndPoi" + "nt.CapabilitiesEntry\032I\n\021CapabilitiesEntr" + "y\022\013\n\003key\030\001 \001(\t\022#\n\005value\030\002 \001(\0132\024.google.p" + "rotobuf.Any:\0028\001\"{\n\014EndPointName\022(\n\013endpo" + "int_id\030\001 \001(\0132\023.context.EndPointId\022\023\n\013dev" + "ice_name\030\002 \001(\t\022\025\n\rendpoint_name\030\003 \001(\t\022\025\n" + "\rendpoint_type\030\004 \001(\t\";\n\016EndPointIdList\022)" + "\n\014endpoint_ids\030\001 \003(\0132\023.context.EndPointI" + "d\"A\n\020EndPointNameList\022-\n\016endpoint_names\030" + "\001 \003(\0132\025.context.EndPointName\"A\n\021ConfigRu" + "le_Custom\022\024\n\014resource_key\030\001 \001(\t\022\026\n\016resou" + "rce_value\030\002 \001(\t\"\213\001\n\016ConfigRule_ACL\022(\n\013en" + "dpoint_id\030\001 \001(\0132\023.context.EndPointId\022,\n\t" + "direction\030\002 \001(\0162\031.context.AclDirectionEn" + "um\022!\n\010rule_set\030\003 \001(\0132\017.acl.AclRuleSet\"f\n" + "\021ConfigRule_IPOWDM\022(\n\013endpoint_id\030\001 \001(\0132" + "\023.context.EndPointId\022\'\n\010rule_set\030\002 \001(\0132\025" + ".ipowdm.IpowdmRuleSet\"k\n\023ConfigRule_TAPI" + "_LSP\022(\n\013endpoint_id\030\001 \001(\0132\023.context.EndP" + "ointId\022*\n\010rule_set\030\002 \003(\0132\030.tapi_lsp.Tapi" + "LspRuleSet\"h\n\022ConfigRule_IP_LINK\022(\n\013endp" + "oint_id\030\001 \001(\0132\023.context.EndPointId\022(\n\010ru" + "le_set\030\002 \001(\0132\026.ip_link.IpLinkRuleSet\"\254\002\n" + "\nConfigRule\022)\n\006action\030\001 \001(\0162\031.context.Co" + "nfigActionEnum\022,\n\006custom\030\002 \001(\0132\032.context" + ".ConfigRule_CustomH\000\022&\n\003acl\030\003 \001(\0132\027.cont" + "ext.ConfigRule_ACLH\000\022.\n\007ip_link\030\004 \001(\0132\033." + "context.ConfigRule_IP_LINKH\000\0220\n\010tapi_lsp" + "\030\005 \001(\0132\034.context.ConfigRule_TAPI_LSPH\000\022," + "\n\006ipowdm\030\006 \001(\0132\032.context.ConfigRule_IPOW" + "DMH\000B\r\n\013config_rule\"F\n\021Constraint_Custom" + "\022\027\n\017constraint_type\030\001 \001(\t\022\030\n\020constraint_" + "value\030\002 \001(\t\"E\n\023Constraint_Schedule\022\027\n\017st" + "art_timestamp\030\001 \001(\001\022\025\n\rduration_days\030\002 \001" + "(\002\"3\n\014GPS_Position\022\020\n\010latitude\030\001 \001(\002\022\021\n\t" + "longitude\030\002 \001(\002\"\204\001\n\010Location\022\020\n\006region\030\001" + " \001(\tH\000\022-\n\014gps_position\030\002 \001(\0132\025.context.G" + "PS_PositionH\000\022\023\n\tinterface\030\003 \001(\tH\000\022\026\n\014ci" + "rcuit_pack\030\004 \001(\tH\000B\n\n\010location\"l\n\033Constr" + "aint_EndPointLocation\022(\n\013endpoint_id\030\001 \001" + "(\0132\023.context.EndPointId\022#\n\010location\030\002 \001(" + "\0132\021.context.Location\"Y\n\033Constraint_EndPo" + "intPriority\022(\n\013endpoint_id\030\001 \001(\0132\023.conte" + "xt.EndPointId\022\020\n\010priority\030\002 \001(\r\"0\n\026Const" + "raint_SLA_Latency\022\026\n\016e2e_latency_ms\030\001 \001(" + "\002\"0\n\027Constraint_SLA_Capacity\022\025\n\rcapacity" + "_gbps\030\001 \001(\002\"c\n\033Constraint_SLA_Availabili" + "ty\022\032\n\022num_disjoint_paths\030\001 \001(\r\022\022\n\nall_ac" + "tive\030\002 \001(\010\022\024\n\014availability\030\003 \001(\002\"V\n\036Cons" + "traint_SLA_Isolation_level\0224\n\017isolation_" + "level\030\001 \003(\0162\033.context.IsolationLevelEnum" + "\"\242\001\n\025Constraint_Exclusions\022\024\n\014is_permane" + "nt\030\001 \001(\010\022%\n\ndevice_ids\030\002 \003(\0132\021.context.D" + "eviceId\022)\n\014endpoint_ids\030\003 \003(\0132\023.context." + "EndPointId\022!\n\010link_ids\030\004 \003(\0132\017.context.L" + "inkId\"5\n\014QoSProfileId\022%\n\016qos_profile_id\030" + "\001 \001(\0132\r.context.Uuid\"`\n\025Constraint_QoSPr" + "ofile\022-\n\016qos_profile_id\030\001 \001(\0132\025.context." + "QoSProfileId\022\030\n\020qos_profile_name\030\002 \001(\t\"\222" + "\005\n\nConstraint\022-\n\006action\030\001 \001(\0162\035.context." + "ConstraintActionEnum\022,\n\006custom\030\002 \001(\0132\032.c" + "ontext.Constraint_CustomH\000\0220\n\010schedule\030\003" + " \001(\0132\034.context.Constraint_ScheduleH\000\022A\n\021" + "endpoint_location\030\004 \001(\0132$.context.Constr" + "aint_EndPointLocationH\000\022A\n\021endpoint_prio" + "rity\030\005 \001(\0132$.context.Constraint_EndPoint" + "PriorityH\000\0228\n\014sla_capacity\030\006 \001(\0132 .conte" + "xt.Constraint_SLA_CapacityH\000\0226\n\013sla_late" + "ncy\030\007 \001(\0132\037.context.Constraint_SLA_Laten" + "cyH\000\022@\n\020sla_availability\030\010 \001(\0132$.context" + ".Constraint_SLA_AvailabilityH\000\022@\n\rsla_is" + "olation\030\t \001(\0132\'.context.Constraint_SLA_I" + "solation_levelH\000\0224\n\nexclusions\030\n \001(\0132\036.c" + "ontext.Constraint_ExclusionsH\000\0225\n\013qos_pr" + "ofile\030\013 \001(\0132\036.context.Constraint_QoSProf" + "ileH\000B\014\n\nconstraint\"^\n\022TeraFlowControlle" + "r\022&\n\ncontext_id\030\001 \001(\0132\022.context.ContextI" + "d\022\022\n\nip_address\030\002 \001(\t\022\014\n\004port\030\003 \001(\r\"U\n\024A" + "uthenticationResult\022&\n\ncontext_id\030\001 \001(\0132" + "\022.context.ContextId\022\025\n\rauthenticated\030\002 \001" + "(\010\"-\n\017OpticalConfigId\022\032\n\022opticalconfig_u" + "uid\030\001 \001(\t\"y\n\rOpticalConfig\0222\n\020opticalcon" + "fig_id\030\001 \001(\0132\030.context.OpticalConfigId\022\016" + "\n\006config\030\002 \001(\t\022$\n\tdevice_id\030\003 \001(\0132\021.cont" + "ext.DeviceId\"C\n\021OpticalConfigList\022.\n\016opt" + "icalconfigs\030\001 \003(\0132\026.context.OpticalConfi" + "g\"g\n\022OpticalConfigEvent\022\035\n\005event\030\001 \001(\0132\016" + ".context.Event\0222\n\020opticalconfig_id\030\002 \001(\013" + "2\030.context.OpticalConfigId\"_\n\021OpticalEnd" + "PointId\022$\n\tdevice_id\030\002 \001(\0132\021.context.Dev" + "iceId\022$\n\rendpoint_uuid\030\003 \001(\0132\r.context.U" + "uid\">\n\017OpticalLinkList\022+\n\roptical_links\030" + "\001 \003(\0132\024.context.OpticalLink\"\304\003\n\022OpticalL" + "inkDetails\022\016\n\006length\030\001 \001(\002\022\020\n\010src_port\030\002" + " \001(\t\022\020\n\010dst_port\030\003 \001(\t\022\027\n\017local_peer_por" + "t\030\004 \001(\t\022\030\n\020remote_peer_port\030\005 \001(\t\022\014\n\004use" + "d\030\006 \001(\010\0228\n\007c_slots\030\007 \003(\0132\'.context.Optic" + "alLinkDetails.CSlotsEntry\0228\n\007l_slots\030\010 \003" + "(\0132\'.context.OpticalLinkDetails.LSlotsEn" + "try\0228\n\007s_slots\030\t \003(\0132\'.context.OpticalLi" + "nkDetails.SSlotsEntry\032-\n\013CSlotsEntry\022\013\n\003" + "key\030\001 \001(\t\022\r\n\005value\030\002 \001(\005:\0028\001\032-\n\013LSlotsEn" + "try\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\005:\0028\001\032-\n\013S" + "SlotsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\005:\002" + "8\001\"\243\001\n\013OpticalLink\022\014\n\004name\030\001 \001(\t\0224\n\017opti" + "cal_details\030\002 \001(\0132\033.context.OpticalLinkD" + "etails\022 \n\007link_id\030\003 \001(\0132\017.context.LinkId" + "\022.\n\021link_endpoint_ids\030\004 \003(\0132\023.context.En" + "dPointId\"0\n\tChannelId\022#\n\014channel_uuid\030\001 " + "\001(\0132\r.context.Uuid\"8\n\rOpticalBandId\022\'\n\020o" + "pticalband_uuid\030\001 \001(\0132\r.context.Uuid\"\247\002\n" + "\013OpticalBand\022.\n\016opticalband_id\030\001 \001(\0132\026.c" + "ontext.OpticalBandId\022,\n\rconnection_id\030\002 " + "\001(\0132\025.context.ConnectionId\022&\n\nchannel_id" + "\030\003 \001(\0132\022.context.ChannelId\022&\n\nservice_id" + "\030\004 \001(\0132\022.context.ServiceId\022#\n\007service\030\005 " + "\001(\0132\020.context.ServiceH\000\022)\n\nconnection\030\006 " + "\001(\0132\023.context.ConnectionH\000\022\021\n\007channel\030\007 " + "\001(\tH\000B\007\n\005field\"=\n\017OpticalBandList\022*\n\014opt" + "icalbands\030\001 \003(\0132\024.context.OpticalBand\"r\n" + "\021ServiceConfigRule\022&\n\nservice_id\030\001 \001(\0132\022" + ".context.ServiceId\0225\n\021configrule_custom\030" + "\002 \001(\0132\032.context.ConfigRule_Custom*j\n\rEve" + "ntTypeEnum\022\027\n\023EVENTTYPE_UNDEFINED\020\000\022\024\n\020E" + "VENTTYPE_CREATE\020\001\022\024\n\020EVENTTYPE_UPDATE\020\002\022" + "\024\n\020EVENTTYPE_REMOVE\020\003*\333\004\n\020DeviceDriverEn" + "um\022\032\n\026DEVICEDRIVER_UNDEFINED\020\000\022\033\n\027DEVICE" + "DRIVER_OPENCONFIG\020\001\022\036\n\032DEVICEDRIVER_TRAN" + "SPORT_API\020\002\022\023\n\017DEVICEDRIVER_P4\020\003\022&\n\"DEVI" + "CEDRIVER_IETF_NETWORK_TOPOLOGY\020\004\022\033\n\027DEVI" + "CEDRIVER_ONF_TR_532\020\005\022\023\n\017DEVICEDRIVER_XR" + "\020\006\022\033\n\027DEVICEDRIVER_IETF_L2VPN\020\007\022 \n\034DEVIC" + "EDRIVER_GNMI_OPENCONFIG\020\010\022\034\n\030DEVICEDRIVE" + "R_OPTICAL_TFS\020\t\022\032\n\026DEVICEDRIVER_IETF_ACT" + "N\020\n\022\023\n\017DEVICEDRIVER_OC\020\013\022\024\n\020DEVICEDRIVER" + "_QKD\020\014\022\033\n\027DEVICEDRIVER_IETF_L3VPN\020\r\022\033\n\027D" + "EVICEDRIVER_IETF_SLICE\020\016\022\024\n\020DEVICEDRIVER" + "_NCE\020\017\022\031\n\025DEVICEDRIVER_SMARTNIC\020\020\022\031\n\025DEV" + "ICEDRIVER_MORPHEUS\020\021\022\024\n\020DEVICEDRIVER_RYU" + "\020\022\022#\n\037DEVICEDRIVER_GNMI_NOKIA_SRLINUX\020\023\022" + "\032\n\026DEVICEDRIVER_OPENROADM\020\024*\217\001\n\033DeviceOp" + "erationalStatusEnum\022%\n!DEVICEOPERATIONAL" + "STATUS_UNDEFINED\020\000\022$\n DEVICEOPERATIONALS" + "TATUS_DISABLED\020\001\022#\n\037DEVICEOPERATIONALSTA" + "TUS_ENABLED\020\002*\245\001\n\014LinkTypeEnum\022\024\n\020LINKTY" + "PE_UNKNOWN\020\000\022\023\n\017LINKTYPE_COPPER\020\001\022\022\n\016LIN" + "KTYPE_FIBER\020\002\022\022\n\016LINKTYPE_RADIO\020\003\022\024\n\020LIN" + "KTYPE_VIRTUAL\020\004\022\027\n\023LINKTYPE_MANAGEMENT\020\005" + "\022\023\n\017LINKTYPE_REMOTE\020\006*\360\002\n\017ServiceTypeEnu" + "m\022\027\n\023SERVICETYPE_UNKNOWN\020\000\022\024\n\020SERVICETYP" + "E_L3NM\020\001\022\024\n\020SERVICETYPE_L2NM\020\002\022)\n%SERVIC" + "ETYPE_TAPI_CONNECTIVITY_SERVICE\020\003\022\022\n\016SER" + "VICETYPE_TE\020\004\022\023\n\017SERVICETYPE_E2E\020\005\022$\n SE" + "RVICETYPE_OPTICAL_CONNECTIVITY\020\006\022\023\n\017SERV" + "ICETYPE_QKD\020\007\022\024\n\020SERVICETYPE_L1NM\020\010\022\023\n\017S" + "ERVICETYPE_INT\020\t\022\023\n\017SERVICETYPE_ACL\020\n\022\027\n" + "\023SERVICETYPE_IP_LINK\020\013\022\030\n\024SERVICETYPE_TA" + "PI_LSP\020\014\022\026\n\022SERVICETYPE_IPOWDM\020\r*\304\001\n\021Ser" + "viceStatusEnum\022\033\n\027SERVICESTATUS_UNDEFINE" + "D\020\000\022\031\n\025SERVICESTATUS_PLANNED\020\001\022\030\n\024SERVIC" + "ESTATUS_ACTIVE\020\002\022\032\n\026SERVICESTATUS_UPDATI" + "NG\020\003\022!\n\035SERVICESTATUS_PENDING_REMOVAL\020\004\022" + "\036\n\032SERVICESTATUS_SLA_VIOLATED\020\005*\251\001\n\017Slic" + "eStatusEnum\022\031\n\025SLICESTATUS_UNDEFINED\020\000\022\027" + "\n\023SLICESTATUS_PLANNED\020\001\022\024\n\020SLICESTATUS_I" + "NIT\020\002\022\026\n\022SLICESTATUS_ACTIVE\020\003\022\026\n\022SLICEST" + "ATUS_DEINIT\020\004\022\034\n\030SLICESTATUS_SLA_VIOLATE" + "D\020\005*]\n\020ConfigActionEnum\022\032\n\026CONFIGACTION_" + "UNDEFINED\020\000\022\024\n\020CONFIGACTION_SET\020\001\022\027\n\023CON" + "FIGACTION_DELETE\020\002*\\\n\020AclDirectionEnum\022\025" + "\n\021ACLDIRECTION_BOTH\020\000\022\030\n\024ACLDIRECTION_IN" + "GRESS\020\001\022\027\n\023ACLDIRECTION_EGRESS\020\002*m\n\024Cons" + "traintActionEnum\022\036\n\032CONSTRAINTACTION_UND" + "EFINED\020\000\022\030\n\024CONSTRAINTACTION_SET\020\001\022\033\n\027CO" + "NSTRAINTACTION_DELETE\020\002*\203\002\n\022IsolationLev" + "elEnum\022\020\n\014NO_ISOLATION\020\000\022\026\n\022PHYSICAL_ISO" + "LATION\020\001\022\025\n\021LOGICAL_ISOLATION\020\002\022\025\n\021PROCE" + "SS_ISOLATION\020\003\022\035\n\031PHYSICAL_MEMORY_ISOLAT" + "ION\020\004\022\036\n\032PHYSICAL_NETWORK_ISOLATION\020\005\022\036\n" + "\032VIRTUAL_RESOURCE_ISOLATION\020\006\022\037\n\033NETWORK" + "_FUNCTIONS_ISOLATION\020\007\022\025\n\021SERVICE_ISOLAT" + "ION\020\0102\274\035\n\016ContextService\022:\n\016ListContextI" + "ds\022\016.context.Empty\032\026.context.ContextIdLi" + "st\"\000\0226\n\014ListContexts\022\016.context.Empty\032\024.c" + "ontext.ContextList\"\000\0224\n\nGetContext\022\022.con" + "text.ContextId\032\020.context.Context\"\000\0224\n\nSe" + "tContext\022\020.context.Context\032\022.context.Con" + "textId\"\000\0225\n\rRemoveContext\022\022.context.Cont" + "extId\032\016.context.Empty\"\000\022=\n\020GetContextEve" + "nts\022\016.context.Empty\032\025.context.ContextEve" + "nt\"\0000\001\022@\n\017ListTopologyIds\022\022.context.Cont" + "extId\032\027.context.TopologyIdList\"\000\022=\n\016List" + "Topologies\022\022.context.ContextId\032\025.context" + ".TopologyList\"\000\0227\n\013GetTopology\022\023.context" + ".TopologyId\032\021.context.Topology\"\000\022E\n\022GetT" + "opologyDetails\022\023.context.TopologyId\032\030.co" + "ntext.TopologyDetails\"\000\0227\n\013SetTopology\022\021" + ".context.Topology\032\023.context.TopologyId\"\000" + "\0227\n\016RemoveTopology\022\023.context.TopologyId\032" + "\016.context.Empty\"\000\022?\n\021GetTopologyEvents\022\016" + ".context.Empty\032\026.context.TopologyEvent\"\000" + "0\001\0228\n\rListDeviceIds\022\016.context.Empty\032\025.co" + "ntext.DeviceIdList\"\000\0224\n\013ListDevices\022\016.co" + "ntext.Empty\032\023.context.DeviceList\"\000\0221\n\tGe" + "tDevice\022\021.context.DeviceId\032\017.context.Dev" + "ice\"\000\0221\n\tSetDevice\022\017.context.Device\032\021.co" + "ntext.DeviceId\"\000\0223\n\014RemoveDevice\022\021.conte" + "xt.DeviceId\032\016.context.Empty\"\000\022;\n\017GetDevi" + "ceEvents\022\016.context.Empty\032\024.context.Devic" + "eEvent\"\0000\001\022<\n\014SelectDevice\022\025.context.Dev" + "iceFilter\032\023.context.DeviceList\"\000\022I\n\021List" + "EndPointNames\022\027.context.EndPointIdList\032\031" + ".context.EndPointNameList\"\000\0224\n\013ListLinkI" + "ds\022\016.context.Empty\032\023.context.LinkIdList\"" + "\000\0220\n\tListLinks\022\016.context.Empty\032\021.context" + ".LinkList\"\000\022+\n\007GetLink\022\017.context.LinkId\032" + "\r.context.Link\"\000\022+\n\007SetLink\022\r.context.Li" + "nk\032\017.context.LinkId\"\000\022/\n\nRemoveLink\022\017.co" + "ntext.LinkId\032\016.context.Empty\"\000\0227\n\rGetLin" + "kEvents\022\016.context.Empty\032\022.context.LinkEv" + "ent\"\0000\001\022>\n\016ListServiceIds\022\022.context.Cont" + "extId\032\026.context.ServiceIdList\"\000\022:\n\014ListS" + "ervices\022\022.context.ContextId\032\024.context.Se" + "rviceList\"\000\0224\n\nGetService\022\022.context.Serv" + "iceId\032\020.context.Service\"\000\0224\n\nSetService\022" + "\020.context.Service\032\022.context.ServiceId\"\000\022" + "6\n\014UnsetService\022\020.context.Service\032\022.cont" + "ext.ServiceId\"\000\0225\n\rRemoveService\022\022.conte" + "xt.ServiceId\032\016.context.Empty\"\000\022=\n\020GetSer" + "viceEvents\022\016.context.Empty\032\025.context.Ser", "viceEvent\"\0000\001\022?\n\rSelectService\022\026.context" + ".ServiceFilter\032\024.context.ServiceList\"\000\022:" + "\n\014ListSliceIds\022\022.context.ContextId\032\024.con" + "text.SliceIdList\"\000\0226\n\nListSlices\022\022.conte" + "xt.ContextId\032\022.context.SliceList\"\000\022.\n\010Ge" + "tSlice\022\020.context.SliceId\032\016.context.Slice" + "\"\000\022.\n\010SetSlice\022\016.context.Slice\032\020.context" + ".SliceId\"\000\0220\n\nUnsetSlice\022\016.context.Slice" + "\032\020.context.SliceId\"\000\0221\n\013RemoveSlice\022\020.co" + "ntext.SliceId\032\016.context.Empty\"\000\0229\n\016GetSl" + "iceEvents\022\016.context.Empty\032\023.context.Slic" + "eEvent\"\0000\001\0229\n\013SelectSlice\022\024.context.Slic" + "eFilter\032\022.context.SliceList\"\000\022D\n\021ListCon" + "nectionIds\022\022.context.ServiceId\032\031.context" + ".ConnectionIdList\"\000\022@\n\017ListConnections\022\022" + ".context.ServiceId\032\027.context.ConnectionL" + "ist\"\000\022=\n\rGetConnection\022\025.context.Connect" + "ionId\032\023.context.Connection\"\000\022=\n\rSetConne" + "ction\022\023.context.Connection\032\025.context.Con" + "nectionId\"\000\022;\n\020RemoveConnection\022\025.contex" + "t.ConnectionId\032\016.context.Empty\"\000\022C\n\023GetC" + "onnectionEvents\022\016.context.Empty\032\030.contex" + "t.ConnectionEvent\"\0000\001\0225\n\014GetAllEvents\022\016." + "context.Empty\032\021.context.AnyEvent\"\0000\001\022@\n\020" + "GetOpticalConfig\022\016.context.Empty\032\032.conte" + "xt.OpticalConfigList\"\000\022F\n\020SetOpticalConf" + "ig\022\026.context.OpticalConfig\032\030.context.Opt" + "icalConfigId\"\000\022I\n\023UpdateOpticalConfig\022\026." + "context.OpticalConfig\032\030.context.OpticalC" + "onfigId\"\000\022I\n\023SelectOpticalConfig\022\030.conte" + "xt.OpticalConfigId\032\026.context.OpticalConf" + "ig\"\000\022A\n\023DeleteOpticalConfig\022\030.context.Op" + "ticalConfigId\032\016.context.Empty\"\000\022@\n\024Delet" + "eOpticalChannel\022\026.context.OpticalConfig\032" + "\016.context.Empty\"\000\0228\n\016SetOpticalLink\022\024.co" + "ntext.OpticalLink\032\016.context.Empty\"\000\0229\n\016G" + "etOpticalLink\022\017.context.LinkId\032\024.context" + ".OpticalLink\"\000\0226\n\021DeleteOpticalLink\022\017.co" + "ntext.LinkId\032\016.context.Empty\"\000\022@\n\022GetOpt" + "icalLinkList\022\016.context.Empty\032\030.context.O" + "pticalLinkList\"\000\022<\n\016GetOpticalBand\022\016.con" + "text.Empty\032\030.context.OpticalBandList\"\000\022C" + "\n\021SelectOpticalBand\022\026.context.OpticalBan" + "dId\032\024.context.OpticalBand\"\000\022G\n\027DeleteSer" + "viceConfigRule\022\032.context.ServiceConfigRu" + "le\032\016.context.Empty\"\000b\006proto3" };
         descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { com.google.protobuf.AnyProto.getDescriptor(), acl.Acl.getDescriptor(), ipowdm.Ipowdm.getDescriptor(), ip_link.IpLink.getDescriptor(), kpi_sample_types.KpiSampleTypes.getDescriptor(), tapi_lsp.TapiLsp.getDescriptor() });
         internal_static_context_Empty_descriptor = getDescriptor().getMessageTypes().get(0);
         internal_static_context_Empty_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(internal_static_context_Empty_descriptor, new java.lang.String[] {});
@@ -90461,7 +90503,7 @@ public final class ContextOuterClass {
         internal_static_context_ConfigRule_Custom_descriptor = getDescriptor().getMessageTypes().get(62);
         internal_static_context_ConfigRule_Custom_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(internal_static_context_ConfigRule_Custom_descriptor, new java.lang.String[] { "ResourceKey", "ResourceValue" });
         internal_static_context_ConfigRule_ACL_descriptor = getDescriptor().getMessageTypes().get(63);
-        internal_static_context_ConfigRule_ACL_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(internal_static_context_ConfigRule_ACL_descriptor, new java.lang.String[] { "EndpointId", "RuleSet" });
+        internal_static_context_ConfigRule_ACL_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(internal_static_context_ConfigRule_ACL_descriptor, new java.lang.String[] { "EndpointId", "Direction", "RuleSet" });
         internal_static_context_ConfigRule_IPOWDM_descriptor = getDescriptor().getMessageTypes().get(64);
         internal_static_context_ConfigRule_IPOWDM_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(internal_static_context_ConfigRule_IPOWDM_descriptor, new java.lang.String[] { "EndpointId", "RuleSet" });
         internal_static_context_ConfigRule_TAPI_LSP_descriptor = getDescriptor().getMessageTypes().get(65);
diff --git a/src/policy/target/generated-sources/grpc/device/Device.java b/src/policy/target/generated-sources/grpc/device/Device.java
index 51f0b742d..87c434732 100644
--- a/src/policy/target/generated-sources/grpc/device/Device.java
+++ b/src/policy/target/generated-sources/grpc/device/Device.java
@@ -14,8 +14,8 @@ public final class Device {
         registerAllExtensions((com.google.protobuf.ExtensionRegistryLite) registry);
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:device.MonitoringSettings)
-    MonitoringSettingsOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface MonitoringSettingsOrBuilder extends // @@protoc_insertion_point(interface_extends:device.MonitoringSettings)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <pre>
@@ -91,9 +91,8 @@ public final class Device {
     /**
      * Protobuf type {@code device.MonitoringSettings}
      */
-    public static final class // @@protoc_insertion_point(message_implements:device.MonitoringSettings)
-    MonitoringSettings extends // @@protoc_insertion_point(message_implements:device.MonitoringSettings)
-    com.google.protobuf.GeneratedMessageV3 implements MonitoringSettingsOrBuilder {
+    public static final class MonitoringSettings extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:device.MonitoringSettings)
+    MonitoringSettingsOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -412,9 +411,8 @@ public final class Device {
         /**
          * Protobuf type {@code device.MonitoringSettings}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:device.MonitoringSettings)
-        Builder extends // @@protoc_insertion_point(builder_implements:device.MonitoringSettings)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements device.Device.MonitoringSettingsOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:device.MonitoringSettings)
+        device.Device.MonitoringSettingsOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return device.Device.internal_static_device_MonitoringSettings_descriptor;
diff --git a/src/policy/target/generated-sources/grpc/ip_link/IpLink.java b/src/policy/target/generated-sources/grpc/ip_link/IpLink.java
index f8ed44bf2..865a27401 100644
--- a/src/policy/target/generated-sources/grpc/ip_link/IpLink.java
+++ b/src/policy/target/generated-sources/grpc/ip_link/IpLink.java
@@ -14,8 +14,8 @@ public final class IpLink {
         registerAllExtensions((com.google.protobuf.ExtensionRegistryLite) registry);
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:ip_link.IpLinkRuleSet)
-    IpLinkRuleSetOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface IpLinkRuleSetOrBuilder extends // @@protoc_insertion_point(interface_extends:ip_link.IpLinkRuleSet)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>string ip = 1;</code>
@@ -57,9 +57,8 @@ public final class IpLink {
     /**
      * Protobuf type {@code ip_link.IpLinkRuleSet}
      */
-    public static final class // @@protoc_insertion_point(message_implements:ip_link.IpLinkRuleSet)
-    IpLinkRuleSet extends // @@protoc_insertion_point(message_implements:ip_link.IpLinkRuleSet)
-    com.google.protobuf.GeneratedMessageV3 implements IpLinkRuleSetOrBuilder {
+    public static final class IpLinkRuleSet extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:ip_link.IpLinkRuleSet)
+    IpLinkRuleSetOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -363,9 +362,8 @@ public final class IpLink {
         /**
          * Protobuf type {@code ip_link.IpLinkRuleSet}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:ip_link.IpLinkRuleSet)
-        Builder extends // @@protoc_insertion_point(builder_implements:ip_link.IpLinkRuleSet)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements ip_link.IpLink.IpLinkRuleSetOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:ip_link.IpLinkRuleSet)
+        ip_link.IpLink.IpLinkRuleSetOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return ip_link.IpLink.internal_static_ip_link_IpLinkRuleSet_descriptor;
diff --git a/src/policy/target/generated-sources/grpc/monitoring/Monitoring.java b/src/policy/target/generated-sources/grpc/monitoring/Monitoring.java
index ed1f1a40e..8394fe275 100644
--- a/src/policy/target/generated-sources/grpc/monitoring/Monitoring.java
+++ b/src/policy/target/generated-sources/grpc/monitoring/Monitoring.java
@@ -14,8 +14,8 @@ public final class Monitoring {
         registerAllExtensions((com.google.protobuf.ExtensionRegistryLite) registry);
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:monitoring.KpiDescriptor)
-    KpiDescriptorOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface KpiDescriptorOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.KpiDescriptor)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.monitoring.KpiId kpi_id = 1;</code>
@@ -189,9 +189,8 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.KpiDescriptor}
      */
-    public static final class // @@protoc_insertion_point(message_implements:monitoring.KpiDescriptor)
-    KpiDescriptor extends // @@protoc_insertion_point(message_implements:monitoring.KpiDescriptor)
-    com.google.protobuf.GeneratedMessageV3 implements KpiDescriptorOrBuilder {
+    public static final class KpiDescriptor extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.KpiDescriptor)
+    KpiDescriptorOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -811,9 +810,8 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.KpiDescriptor}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:monitoring.KpiDescriptor)
-        Builder extends // @@protoc_insertion_point(builder_implements:monitoring.KpiDescriptor)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.KpiDescriptorOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.KpiDescriptor)
+        monitoring.Monitoring.KpiDescriptorOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_KpiDescriptor_descriptor;
@@ -2396,8 +2394,8 @@ public final class Monitoring {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:monitoring.MonitorKpiRequest)
-    MonitorKpiRequestOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface MonitorKpiRequestOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.MonitorKpiRequest)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.monitoring.KpiId kpi_id = 1;</code>
@@ -2436,9 +2434,8 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.MonitorKpiRequest}
      */
-    public static final class // @@protoc_insertion_point(message_implements:monitoring.MonitorKpiRequest)
-    MonitorKpiRequest extends // @@protoc_insertion_point(message_implements:monitoring.MonitorKpiRequest)
-    com.google.protobuf.GeneratedMessageV3 implements MonitorKpiRequestOrBuilder {
+    public static final class MonitorKpiRequest extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.MonitorKpiRequest)
+    MonitorKpiRequestOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -2691,9 +2688,8 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.MonitorKpiRequest}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:monitoring.MonitorKpiRequest)
-        Builder extends // @@protoc_insertion_point(builder_implements:monitoring.MonitorKpiRequest)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.MonitorKpiRequestOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.MonitorKpiRequest)
+        monitoring.Monitoring.MonitorKpiRequestOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_MonitorKpiRequest_descriptor;
@@ -3111,8 +3107,8 @@ public final class Monitoring {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:monitoring.KpiQuery)
-    KpiQueryOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface KpiQueryOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.KpiQuery)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .monitoring.KpiId kpi_ids = 1;</code>
@@ -3217,9 +3213,8 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.KpiQuery}
      */
-    public static final class // @@protoc_insertion_point(message_implements:monitoring.KpiQuery)
-    KpiQuery extends // @@protoc_insertion_point(message_implements:monitoring.KpiQuery)
-    com.google.protobuf.GeneratedMessageV3 implements KpiQueryOrBuilder {
+    public static final class KpiQuery extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.KpiQuery)
+    KpiQueryOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -3600,9 +3595,8 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.KpiQuery}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:monitoring.KpiQuery)
-        Builder extends // @@protoc_insertion_point(builder_implements:monitoring.KpiQuery)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.KpiQueryOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.KpiQuery)
+        monitoring.Monitoring.KpiQueryOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_KpiQuery_descriptor;
@@ -4521,8 +4515,8 @@ public final class Monitoring {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:monitoring.RawKpi)
-    RawKpiOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface RawKpiOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.RawKpi)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Timestamp timestamp = 1;</code>
@@ -4566,9 +4560,8 @@ public final class Monitoring {
      *
      * Protobuf type {@code monitoring.RawKpi}
      */
-    public static final class // @@protoc_insertion_point(message_implements:monitoring.RawKpi)
-    RawKpi extends // @@protoc_insertion_point(message_implements:monitoring.RawKpi)
-    com.google.protobuf.GeneratedMessageV3 implements RawKpiOrBuilder {
+    public static final class RawKpi extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.RawKpi)
+    RawKpiOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -4821,9 +4814,8 @@ public final class Monitoring {
          *
          * Protobuf type {@code monitoring.RawKpi}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:monitoring.RawKpi)
-        Builder extends // @@protoc_insertion_point(builder_implements:monitoring.RawKpi)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.RawKpiOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.RawKpi)
+        monitoring.Monitoring.RawKpiOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_RawKpi_descriptor;
@@ -5269,8 +5261,8 @@ public final class Monitoring {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:monitoring.RawKpiList)
-    RawKpiListOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface RawKpiListOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.RawKpiList)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.monitoring.KpiId kpi_id = 1;</code>
@@ -5322,9 +5314,8 @@ public final class Monitoring {
      *
      * Protobuf type {@code monitoring.RawKpiList}
      */
-    public static final class // @@protoc_insertion_point(message_implements:monitoring.RawKpiList)
-    RawKpiList extends // @@protoc_insertion_point(message_implements:monitoring.RawKpiList)
-    com.google.protobuf.GeneratedMessageV3 implements RawKpiListOrBuilder {
+    public static final class RawKpiList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.RawKpiList)
+    RawKpiListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -5589,9 +5580,8 @@ public final class Monitoring {
          *
          * Protobuf type {@code monitoring.RawKpiList}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:monitoring.RawKpiList)
-        Builder extends // @@protoc_insertion_point(builder_implements:monitoring.RawKpiList)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.RawKpiListOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.RawKpiList)
+        monitoring.Monitoring.RawKpiListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_RawKpiList_descriptor;
@@ -6194,8 +6184,8 @@ public final class Monitoring {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:monitoring.RawKpiTable)
-    RawKpiTableOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface RawKpiTableOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.RawKpiTable)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .monitoring.RawKpiList raw_kpi_lists = 1;</code>
@@ -6230,9 +6220,8 @@ public final class Monitoring {
      *
      * Protobuf type {@code monitoring.RawKpiTable}
      */
-    public static final class // @@protoc_insertion_point(message_implements:monitoring.RawKpiTable)
-    RawKpiTable extends // @@protoc_insertion_point(message_implements:monitoring.RawKpiTable)
-    com.google.protobuf.GeneratedMessageV3 implements RawKpiTableOrBuilder {
+    public static final class RawKpiTable extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.RawKpiTable)
+    RawKpiTableOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -6451,9 +6440,8 @@ public final class Monitoring {
          *
          * Protobuf type {@code monitoring.RawKpiTable}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:monitoring.RawKpiTable)
-        Builder extends // @@protoc_insertion_point(builder_implements:monitoring.RawKpiTable)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.RawKpiTableOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.RawKpiTable)
+        monitoring.Monitoring.RawKpiTableOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_RawKpiTable_descriptor;
@@ -6920,8 +6908,8 @@ public final class Monitoring {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:monitoring.KpiId)
-    KpiIdOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface KpiIdOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.KpiId)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Uuid kpi_id = 1;</code>
@@ -6944,9 +6932,8 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.KpiId}
      */
-    public static final class // @@protoc_insertion_point(message_implements:monitoring.KpiId)
-    KpiId extends // @@protoc_insertion_point(message_implements:monitoring.KpiId)
-    com.google.protobuf.GeneratedMessageV3 implements KpiIdOrBuilder {
+    public static final class KpiId extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.KpiId)
+    KpiIdOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -7149,9 +7136,8 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.KpiId}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:monitoring.KpiId)
-        Builder extends // @@protoc_insertion_point(builder_implements:monitoring.KpiId)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.KpiIdOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.KpiId)
+        monitoring.Monitoring.KpiIdOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_KpiId_descriptor;
@@ -7461,8 +7447,8 @@ public final class Monitoring {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:monitoring.Kpi)
-    KpiOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface KpiOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.Kpi)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.monitoring.KpiId kpi_id = 1;</code>
@@ -7519,9 +7505,8 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.Kpi}
      */
-    public static final class // @@protoc_insertion_point(message_implements:monitoring.Kpi)
-    Kpi extends // @@protoc_insertion_point(message_implements:monitoring.Kpi)
-    com.google.protobuf.GeneratedMessageV3 implements KpiOrBuilder {
+    public static final class Kpi extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.Kpi)
+    KpiOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -7816,9 +7801,8 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.Kpi}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:monitoring.Kpi)
-        Builder extends // @@protoc_insertion_point(builder_implements:monitoring.Kpi)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.KpiOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.Kpi)
+        monitoring.Monitoring.KpiOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_Kpi_descriptor;
@@ -8400,8 +8384,8 @@ public final class Monitoring {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:monitoring.KpiValueRange)
-    KpiValueRangeOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface KpiValueRangeOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.KpiValueRange)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.monitoring.KpiValue kpiMinValue = 1;</code>
@@ -8471,9 +8455,8 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.KpiValueRange}
      */
-    public static final class // @@protoc_insertion_point(message_implements:monitoring.KpiValueRange)
-    KpiValueRange extends // @@protoc_insertion_point(message_implements:monitoring.KpiValueRange)
-    com.google.protobuf.GeneratedMessageV3 implements KpiValueRangeOrBuilder {
+    public static final class KpiValueRange extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.KpiValueRange)
+    KpiValueRangeOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -8803,9 +8786,8 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.KpiValueRange}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:monitoring.KpiValueRange)
-        Builder extends // @@protoc_insertion_point(builder_implements:monitoring.KpiValueRange)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.KpiValueRangeOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.KpiValueRange)
+        monitoring.Monitoring.KpiValueRangeOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_KpiValueRange_descriptor;
@@ -9431,8 +9413,8 @@ public final class Monitoring {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:monitoring.KpiValue)
-    KpiValueOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface KpiValueOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.KpiValue)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>int32 int32Val = 1;</code>
@@ -9530,9 +9512,8 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.KpiValue}
      */
-    public static final class // @@protoc_insertion_point(message_implements:monitoring.KpiValue)
-    KpiValue extends // @@protoc_insertion_point(message_implements:monitoring.KpiValue)
-    com.google.protobuf.GeneratedMessageV3 implements KpiValueOrBuilder {
+    public static final class KpiValue extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.KpiValue)
+    KpiValueOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -10050,9 +10031,8 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.KpiValue}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:monitoring.KpiValue)
-        Builder extends // @@protoc_insertion_point(builder_implements:monitoring.KpiValue)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.KpiValueOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.KpiValue)
+        monitoring.Monitoring.KpiValueOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_KpiValue_descriptor;
@@ -10702,8 +10682,8 @@ public final class Monitoring {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:monitoring.KpiList)
-    KpiListOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface KpiListOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.KpiList)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .monitoring.Kpi kpi = 1;</code>
@@ -10734,9 +10714,8 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.KpiList}
      */
-    public static final class // @@protoc_insertion_point(message_implements:monitoring.KpiList)
-    KpiList extends // @@protoc_insertion_point(message_implements:monitoring.KpiList)
-    com.google.protobuf.GeneratedMessageV3 implements KpiListOrBuilder {
+    public static final class KpiList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.KpiList)
+    KpiListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -10951,9 +10930,8 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.KpiList}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:monitoring.KpiList)
-        Builder extends // @@protoc_insertion_point(builder_implements:monitoring.KpiList)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.KpiListOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.KpiList)
+        monitoring.Monitoring.KpiListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_KpiList_descriptor;
@@ -11420,8 +11398,8 @@ public final class Monitoring {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:monitoring.KpiDescriptorList)
-    KpiDescriptorListOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface KpiDescriptorListOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.KpiDescriptorList)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1;</code>
@@ -11452,9 +11430,8 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.KpiDescriptorList}
      */
-    public static final class // @@protoc_insertion_point(message_implements:monitoring.KpiDescriptorList)
-    KpiDescriptorList extends // @@protoc_insertion_point(message_implements:monitoring.KpiDescriptorList)
-    com.google.protobuf.GeneratedMessageV3 implements KpiDescriptorListOrBuilder {
+    public static final class KpiDescriptorList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.KpiDescriptorList)
+    KpiDescriptorListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -11669,9 +11646,8 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.KpiDescriptorList}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:monitoring.KpiDescriptorList)
-        Builder extends // @@protoc_insertion_point(builder_implements:monitoring.KpiDescriptorList)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.KpiDescriptorListOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.KpiDescriptorList)
+        monitoring.Monitoring.KpiDescriptorListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_KpiDescriptorList_descriptor;
@@ -12138,8 +12114,8 @@ public final class Monitoring {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:monitoring.SubsDescriptor)
-    SubsDescriptorOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface SubsDescriptorOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.SubsDescriptor)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.monitoring.SubscriptionID subs_id = 1;</code>
@@ -12249,9 +12225,8 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.SubsDescriptor}
      */
-    public static final class // @@protoc_insertion_point(message_implements:monitoring.SubsDescriptor)
-    SubsDescriptor extends // @@protoc_insertion_point(message_implements:monitoring.SubsDescriptor)
-    com.google.protobuf.GeneratedMessageV3 implements SubsDescriptorOrBuilder {
+    public static final class SubsDescriptor extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.SubsDescriptor)
+    SubsDescriptorOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -12662,9 +12637,8 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.SubsDescriptor}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:monitoring.SubsDescriptor)
-        Builder extends // @@protoc_insertion_point(builder_implements:monitoring.SubsDescriptor)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.SubsDescriptorOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.SubsDescriptor)
+        monitoring.Monitoring.SubsDescriptorOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_SubsDescriptor_descriptor;
@@ -13550,8 +13524,8 @@ public final class Monitoring {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:monitoring.SubscriptionID)
-    SubscriptionIDOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface SubscriptionIDOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.SubscriptionID)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Uuid subs_id = 1;</code>
@@ -13574,9 +13548,8 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.SubscriptionID}
      */
-    public static final class // @@protoc_insertion_point(message_implements:monitoring.SubscriptionID)
-    SubscriptionID extends // @@protoc_insertion_point(message_implements:monitoring.SubscriptionID)
-    com.google.protobuf.GeneratedMessageV3 implements SubscriptionIDOrBuilder {
+    public static final class SubscriptionID extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.SubscriptionID)
+    SubscriptionIDOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -13779,9 +13752,8 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.SubscriptionID}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:monitoring.SubscriptionID)
-        Builder extends // @@protoc_insertion_point(builder_implements:monitoring.SubscriptionID)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.SubscriptionIDOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.SubscriptionID)
+        monitoring.Monitoring.SubscriptionIDOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_SubscriptionID_descriptor;
@@ -14091,8 +14063,8 @@ public final class Monitoring {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:monitoring.SubsResponse)
-    SubsResponseOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface SubsResponseOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.SubsResponse)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.monitoring.SubscriptionID subs_id = 1;</code>
@@ -14132,9 +14104,8 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.SubsResponse}
      */
-    public static final class // @@protoc_insertion_point(message_implements:monitoring.SubsResponse)
-    SubsResponse extends // @@protoc_insertion_point(message_implements:monitoring.SubsResponse)
-    com.google.protobuf.GeneratedMessageV3 implements SubsResponseOrBuilder {
+    public static final class SubsResponse extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.SubsResponse)
+    SubsResponseOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -14383,9 +14354,8 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.SubsResponse}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:monitoring.SubsResponse)
-        Builder extends // @@protoc_insertion_point(builder_implements:monitoring.SubsResponse)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.SubsResponseOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.SubsResponse)
+        monitoring.Monitoring.SubsResponseOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_SubsResponse_descriptor;
@@ -14831,8 +14801,8 @@ public final class Monitoring {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:monitoring.SubsList)
-    SubsListOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface SubsListOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.SubsList)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .monitoring.SubsDescriptor subs_descriptor = 1;</code>
@@ -14863,9 +14833,8 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.SubsList}
      */
-    public static final class // @@protoc_insertion_point(message_implements:monitoring.SubsList)
-    SubsList extends // @@protoc_insertion_point(message_implements:monitoring.SubsList)
-    com.google.protobuf.GeneratedMessageV3 implements SubsListOrBuilder {
+    public static final class SubsList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.SubsList)
+    SubsListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -15080,9 +15049,8 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.SubsList}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:monitoring.SubsList)
-        Builder extends // @@protoc_insertion_point(builder_implements:monitoring.SubsList)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.SubsListOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.SubsList)
+        monitoring.Monitoring.SubsListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_SubsList_descriptor;
@@ -15549,8 +15517,8 @@ public final class Monitoring {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:monitoring.AlarmDescriptor)
-    AlarmDescriptorOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface AlarmDescriptorOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.AlarmDescriptor)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.monitoring.AlarmID alarm_id = 1;</code>
@@ -15648,9 +15616,8 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.AlarmDescriptor}
      */
-    public static final class // @@protoc_insertion_point(message_implements:monitoring.AlarmDescriptor)
-    AlarmDescriptor extends // @@protoc_insertion_point(message_implements:monitoring.AlarmDescriptor)
-    com.google.protobuf.GeneratedMessageV3 implements AlarmDescriptorOrBuilder {
+    public static final class AlarmDescriptor extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.AlarmDescriptor)
+    AlarmDescriptorOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -16089,9 +16056,8 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.AlarmDescriptor}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:monitoring.AlarmDescriptor)
-        Builder extends // @@protoc_insertion_point(builder_implements:monitoring.AlarmDescriptor)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.AlarmDescriptorOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.AlarmDescriptor)
+        monitoring.Monitoring.AlarmDescriptorOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_AlarmDescriptor_descriptor;
@@ -16991,8 +16957,8 @@ public final class Monitoring {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:monitoring.AlarmID)
-    AlarmIDOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface AlarmIDOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.AlarmID)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Uuid alarm_id = 1;</code>
@@ -17015,9 +16981,8 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.AlarmID}
      */
-    public static final class // @@protoc_insertion_point(message_implements:monitoring.AlarmID)
-    AlarmID extends // @@protoc_insertion_point(message_implements:monitoring.AlarmID)
-    com.google.protobuf.GeneratedMessageV3 implements AlarmIDOrBuilder {
+    public static final class AlarmID extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.AlarmID)
+    AlarmIDOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -17220,9 +17185,8 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.AlarmID}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:monitoring.AlarmID)
-        Builder extends // @@protoc_insertion_point(builder_implements:monitoring.AlarmID)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.AlarmIDOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.AlarmID)
+        monitoring.Monitoring.AlarmIDOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_AlarmID_descriptor;
@@ -17532,8 +17496,8 @@ public final class Monitoring {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:monitoring.AlarmSubscription)
-    AlarmSubscriptionOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface AlarmSubscriptionOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.AlarmSubscription)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.monitoring.AlarmID alarm_id = 1;</code>
@@ -17568,9 +17532,8 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.AlarmSubscription}
      */
-    public static final class // @@protoc_insertion_point(message_implements:monitoring.AlarmSubscription)
-    AlarmSubscription extends // @@protoc_insertion_point(message_implements:monitoring.AlarmSubscription)
-    com.google.protobuf.GeneratedMessageV3 implements AlarmSubscriptionOrBuilder {
+    public static final class AlarmSubscription extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.AlarmSubscription)
+    AlarmSubscriptionOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -17819,9 +17782,8 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.AlarmSubscription}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:monitoring.AlarmSubscription)
-        Builder extends // @@protoc_insertion_point(builder_implements:monitoring.AlarmSubscription)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.AlarmSubscriptionOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.AlarmSubscription)
+        monitoring.Monitoring.AlarmSubscriptionOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_AlarmSubscription_descriptor;
@@ -18227,8 +18189,8 @@ public final class Monitoring {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:monitoring.AlarmResponse)
-    AlarmResponseOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface AlarmResponseOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.AlarmResponse)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.monitoring.AlarmID alarm_id = 1;</code>
@@ -18280,9 +18242,8 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.AlarmResponse}
      */
-    public static final class // @@protoc_insertion_point(message_implements:monitoring.AlarmResponse)
-    AlarmResponse extends // @@protoc_insertion_point(message_implements:monitoring.AlarmResponse)
-    com.google.protobuf.GeneratedMessageV3 implements AlarmResponseOrBuilder {
+    public static final class AlarmResponse extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.AlarmResponse)
+    AlarmResponseOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -18580,9 +18541,8 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.AlarmResponse}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:monitoring.AlarmResponse)
-        Builder extends // @@protoc_insertion_point(builder_implements:monitoring.AlarmResponse)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.AlarmResponseOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.AlarmResponse)
+        monitoring.Monitoring.AlarmResponseOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_AlarmResponse_descriptor;
@@ -19119,8 +19079,8 @@ public final class Monitoring {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:monitoring.AlarmList)
-    AlarmListOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface AlarmListOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.AlarmList)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .monitoring.AlarmDescriptor alarm_descriptor = 1;</code>
@@ -19151,9 +19111,8 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.AlarmList}
      */
-    public static final class // @@protoc_insertion_point(message_implements:monitoring.AlarmList)
-    AlarmList extends // @@protoc_insertion_point(message_implements:monitoring.AlarmList)
-    com.google.protobuf.GeneratedMessageV3 implements AlarmListOrBuilder {
+    public static final class AlarmList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.AlarmList)
+    AlarmListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -19368,9 +19327,8 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.AlarmList}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:monitoring.AlarmList)
-        Builder extends // @@protoc_insertion_point(builder_implements:monitoring.AlarmList)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.AlarmListOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.AlarmList)
+        monitoring.Monitoring.AlarmListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_AlarmList_descriptor;
@@ -19837,8 +19795,8 @@ public final class Monitoring {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:monitoring.SSEMonitoringSubscriptionConfig)
-    SSEMonitoringSubscriptionConfigOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface SSEMonitoringSubscriptionConfigOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.SSEMonitoringSubscriptionConfig)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.DeviceId device_id = 1;</code>
@@ -19917,9 +19875,8 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.SSEMonitoringSubscriptionConfig}
      */
-    public static final class // @@protoc_insertion_point(message_implements:monitoring.SSEMonitoringSubscriptionConfig)
-    SSEMonitoringSubscriptionConfig extends // @@protoc_insertion_point(message_implements:monitoring.SSEMonitoringSubscriptionConfig)
-    com.google.protobuf.GeneratedMessageV3 implements SSEMonitoringSubscriptionConfigOrBuilder {
+    public static final class SSEMonitoringSubscriptionConfig extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.SSEMonitoringSubscriptionConfig)
+    SSEMonitoringSubscriptionConfigOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -20424,9 +20381,8 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.SSEMonitoringSubscriptionConfig}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:monitoring.SSEMonitoringSubscriptionConfig)
-        Builder extends // @@protoc_insertion_point(builder_implements:monitoring.SSEMonitoringSubscriptionConfig)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.SSEMonitoringSubscriptionConfigOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.SSEMonitoringSubscriptionConfig)
+        monitoring.Monitoring.SSEMonitoringSubscriptionConfigOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_SSEMonitoringSubscriptionConfig_descriptor;
@@ -21102,8 +21058,8 @@ public final class Monitoring {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:monitoring.SSEMonitoringSubscriptionResponse)
-    SSEMonitoringSubscriptionResponseOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface SSEMonitoringSubscriptionResponseOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.SSEMonitoringSubscriptionResponse)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>string identifier = 1;</code>
@@ -21133,9 +21089,8 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.SSEMonitoringSubscriptionResponse}
      */
-    public static final class // @@protoc_insertion_point(message_implements:monitoring.SSEMonitoringSubscriptionResponse)
-    SSEMonitoringSubscriptionResponse extends // @@protoc_insertion_point(message_implements:monitoring.SSEMonitoringSubscriptionResponse)
-    com.google.protobuf.GeneratedMessageV3 implements SSEMonitoringSubscriptionResponseOrBuilder {
+    public static final class SSEMonitoringSubscriptionResponse extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.SSEMonitoringSubscriptionResponse)
+    SSEMonitoringSubscriptionResponseOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -21390,9 +21345,8 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.SSEMonitoringSubscriptionResponse}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:monitoring.SSEMonitoringSubscriptionResponse)
-        Builder extends // @@protoc_insertion_point(builder_implements:monitoring.SSEMonitoringSubscriptionResponse)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.SSEMonitoringSubscriptionResponseOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.SSEMonitoringSubscriptionResponse)
+        monitoring.Monitoring.SSEMonitoringSubscriptionResponseOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_SSEMonitoringSubscriptionResponse_descriptor;
diff --git a/src/policy/target/generated-sources/grpc/policy/Policy.java b/src/policy/target/generated-sources/grpc/policy/Policy.java
index 9f07cd0de..04d033e66 100644
--- a/src/policy/target/generated-sources/grpc/policy/Policy.java
+++ b/src/policy/target/generated-sources/grpc/policy/Policy.java
@@ -303,8 +303,8 @@ public final class Policy {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:policy.PolicyRuleId)
-    PolicyRuleIdOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface PolicyRuleIdOrBuilder extends // @@protoc_insertion_point(interface_extends:policy.PolicyRuleId)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Uuid uuid = 1;</code>
@@ -327,9 +327,8 @@ public final class Policy {
     /**
      * Protobuf type {@code policy.PolicyRuleId}
      */
-    public static final class // @@protoc_insertion_point(message_implements:policy.PolicyRuleId)
-    PolicyRuleId extends // @@protoc_insertion_point(message_implements:policy.PolicyRuleId)
-    com.google.protobuf.GeneratedMessageV3 implements PolicyRuleIdOrBuilder {
+    public static final class PolicyRuleId extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:policy.PolicyRuleId)
+    PolicyRuleIdOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -532,9 +531,8 @@ public final class Policy {
         /**
          * Protobuf type {@code policy.PolicyRuleId}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:policy.PolicyRuleId)
-        Builder extends // @@protoc_insertion_point(builder_implements:policy.PolicyRuleId)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements policy.Policy.PolicyRuleIdOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:policy.PolicyRuleId)
+        policy.Policy.PolicyRuleIdOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return policy.Policy.internal_static_policy_PolicyRuleId_descriptor;
@@ -844,8 +842,8 @@ public final class Policy {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:policy.PolicyRuleState)
-    PolicyRuleStateOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface PolicyRuleStateOrBuilder extends // @@protoc_insertion_point(interface_extends:policy.PolicyRuleState)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.policy.PolicyRuleStateEnum policyRuleState = 1;</code>
@@ -875,9 +873,8 @@ public final class Policy {
     /**
      * Protobuf type {@code policy.PolicyRuleState}
      */
-    public static final class // @@protoc_insertion_point(message_implements:policy.PolicyRuleState)
-    PolicyRuleState extends // @@protoc_insertion_point(message_implements:policy.PolicyRuleState)
-    com.google.protobuf.GeneratedMessageV3 implements PolicyRuleStateOrBuilder {
+    public static final class PolicyRuleState extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:policy.PolicyRuleState)
+    PolicyRuleStateOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -1117,9 +1114,8 @@ public final class Policy {
         /**
          * Protobuf type {@code policy.PolicyRuleState}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:policy.PolicyRuleState)
-        Builder extends // @@protoc_insertion_point(builder_implements:policy.PolicyRuleState)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements policy.Policy.PolicyRuleStateOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:policy.PolicyRuleState)
+        policy.Policy.PolicyRuleStateOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return policy.Policy.internal_static_policy_PolicyRuleState_descriptor;
@@ -1457,8 +1453,8 @@ public final class Policy {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:policy.PolicyRuleBasic)
-    PolicyRuleBasicOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface PolicyRuleBasicOrBuilder extends // @@protoc_insertion_point(interface_extends:policy.PolicyRuleBasic)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.policy.PolicyRuleId policyRuleId = 1;</code>
@@ -1594,9 +1590,8 @@ public final class Policy {
      *
      * Protobuf type {@code policy.PolicyRuleBasic}
      */
-    public static final class // @@protoc_insertion_point(message_implements:policy.PolicyRuleBasic)
-    PolicyRuleBasic extends // @@protoc_insertion_point(message_implements:policy.PolicyRuleBasic)
-    com.google.protobuf.GeneratedMessageV3 implements PolicyRuleBasicOrBuilder {
+    public static final class PolicyRuleBasic extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:policy.PolicyRuleBasic)
+    PolicyRuleBasicOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -2020,9 +2015,8 @@ public final class Policy {
          *
          * Protobuf type {@code policy.PolicyRuleBasic}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:policy.PolicyRuleBasic)
-        Builder extends // @@protoc_insertion_point(builder_implements:policy.PolicyRuleBasic)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements policy.Policy.PolicyRuleBasicOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:policy.PolicyRuleBasic)
+        policy.Policy.PolicyRuleBasicOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return policy.Policy.internal_static_policy_PolicyRuleBasic_descriptor;
@@ -3089,8 +3083,8 @@ public final class Policy {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:policy.PolicyRuleService)
-    PolicyRuleServiceOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface PolicyRuleServiceOrBuilder extends // @@protoc_insertion_point(interface_extends:policy.PolicyRuleService)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <pre>
@@ -3203,9 +3197,8 @@ public final class Policy {
      *
      * Protobuf type {@code policy.PolicyRuleService}
      */
-    public static final class // @@protoc_insertion_point(message_implements:policy.PolicyRuleService)
-    PolicyRuleService extends // @@protoc_insertion_point(message_implements:policy.PolicyRuleService)
-    com.google.protobuf.GeneratedMessageV3 implements PolicyRuleServiceOrBuilder {
+    public static final class PolicyRuleService extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:policy.PolicyRuleService)
+    PolicyRuleServiceOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -3560,9 +3553,8 @@ public final class Policy {
          *
          * Protobuf type {@code policy.PolicyRuleService}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:policy.PolicyRuleService)
-        Builder extends // @@protoc_insertion_point(builder_implements:policy.PolicyRuleService)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements policy.Policy.PolicyRuleServiceOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:policy.PolicyRuleService)
+        policy.Policy.PolicyRuleServiceOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return policy.Policy.internal_static_policy_PolicyRuleService_descriptor;
@@ -4445,8 +4437,8 @@ public final class Policy {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:policy.PolicyRuleDevice)
-    PolicyRuleDeviceOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface PolicyRuleDeviceOrBuilder extends // @@protoc_insertion_point(interface_extends:policy.PolicyRuleDevice)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <pre>
@@ -4530,9 +4522,8 @@ public final class Policy {
      *
      * Protobuf type {@code policy.PolicyRuleDevice}
      */
-    public static final class // @@protoc_insertion_point(message_implements:policy.PolicyRuleDevice)
-    PolicyRuleDevice extends // @@protoc_insertion_point(message_implements:policy.PolicyRuleDevice)
-    com.google.protobuf.GeneratedMessageV3 implements PolicyRuleDeviceOrBuilder {
+    public static final class PolicyRuleDevice extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:policy.PolicyRuleDevice)
+    PolicyRuleDeviceOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -4829,9 +4820,8 @@ public final class Policy {
          *
          * Protobuf type {@code policy.PolicyRuleDevice}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:policy.PolicyRuleDevice)
-        Builder extends // @@protoc_insertion_point(builder_implements:policy.PolicyRuleDevice)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements policy.Policy.PolicyRuleDeviceOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:policy.PolicyRuleDevice)
+        policy.Policy.PolicyRuleDeviceOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return policy.Policy.internal_static_policy_PolicyRuleDevice_descriptor;
@@ -5542,8 +5532,8 @@ public final class Policy {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:policy.PolicyRule)
-    PolicyRuleOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface PolicyRuleOrBuilder extends // @@protoc_insertion_point(interface_extends:policy.PolicyRule)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.policy.PolicyRuleService service = 1;</code>
@@ -5589,9 +5579,8 @@ public final class Policy {
      *
      * Protobuf type {@code policy.PolicyRule}
      */
-    public static final class // @@protoc_insertion_point(message_implements:policy.PolicyRule)
-    PolicyRule extends // @@protoc_insertion_point(message_implements:policy.PolicyRule)
-    com.google.protobuf.GeneratedMessageV3 implements PolicyRuleOrBuilder {
+    public static final class PolicyRule extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:policy.PolicyRule)
+    PolicyRuleOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -5905,9 +5894,8 @@ public final class Policy {
          *
          * Protobuf type {@code policy.PolicyRule}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:policy.PolicyRule)
-        Builder extends // @@protoc_insertion_point(builder_implements:policy.PolicyRule)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements policy.Policy.PolicyRuleOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:policy.PolicyRule)
+        policy.Policy.PolicyRuleOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return policy.Policy.internal_static_policy_PolicyRule_descriptor;
@@ -6428,8 +6416,8 @@ public final class Policy {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:policy.PolicyRuleIdList)
-    PolicyRuleIdListOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface PolicyRuleIdListOrBuilder extends // @@protoc_insertion_point(interface_extends:policy.PolicyRuleIdList)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .policy.PolicyRuleId policyRuleIdList = 1;</code>
@@ -6464,9 +6452,8 @@ public final class Policy {
      *
      * Protobuf type {@code policy.PolicyRuleIdList}
      */
-    public static final class // @@protoc_insertion_point(message_implements:policy.PolicyRuleIdList)
-    PolicyRuleIdList extends // @@protoc_insertion_point(message_implements:policy.PolicyRuleIdList)
-    com.google.protobuf.GeneratedMessageV3 implements PolicyRuleIdListOrBuilder {
+    public static final class PolicyRuleIdList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:policy.PolicyRuleIdList)
+    PolicyRuleIdListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -6685,9 +6672,8 @@ public final class Policy {
          *
          * Protobuf type {@code policy.PolicyRuleIdList}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:policy.PolicyRuleIdList)
-        Builder extends // @@protoc_insertion_point(builder_implements:policy.PolicyRuleIdList)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements policy.Policy.PolicyRuleIdListOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:policy.PolicyRuleIdList)
+        policy.Policy.PolicyRuleIdListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return policy.Policy.internal_static_policy_PolicyRuleIdList_descriptor;
@@ -7154,8 +7140,8 @@ public final class Policy {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:policy.PolicyRuleServiceList)
-    PolicyRuleServiceListOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface PolicyRuleServiceListOrBuilder extends // @@protoc_insertion_point(interface_extends:policy.PolicyRuleServiceList)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .policy.PolicyRuleService policyRuleServiceList = 1;</code>
@@ -7190,9 +7176,8 @@ public final class Policy {
      *
      * Protobuf type {@code policy.PolicyRuleServiceList}
      */
-    public static final class // @@protoc_insertion_point(message_implements:policy.PolicyRuleServiceList)
-    PolicyRuleServiceList extends // @@protoc_insertion_point(message_implements:policy.PolicyRuleServiceList)
-    com.google.protobuf.GeneratedMessageV3 implements PolicyRuleServiceListOrBuilder {
+    public static final class PolicyRuleServiceList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:policy.PolicyRuleServiceList)
+    PolicyRuleServiceListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -7411,9 +7396,8 @@ public final class Policy {
          *
          * Protobuf type {@code policy.PolicyRuleServiceList}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:policy.PolicyRuleServiceList)
-        Builder extends // @@protoc_insertion_point(builder_implements:policy.PolicyRuleServiceList)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements policy.Policy.PolicyRuleServiceListOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:policy.PolicyRuleServiceList)
+        policy.Policy.PolicyRuleServiceListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return policy.Policy.internal_static_policy_PolicyRuleServiceList_descriptor;
@@ -7880,8 +7864,8 @@ public final class Policy {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:policy.PolicyRuleDeviceList)
-    PolicyRuleDeviceListOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface PolicyRuleDeviceListOrBuilder extends // @@protoc_insertion_point(interface_extends:policy.PolicyRuleDeviceList)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .policy.PolicyRuleDevice policyRuleDeviceList = 1;</code>
@@ -7916,9 +7900,8 @@ public final class Policy {
      *
      * Protobuf type {@code policy.PolicyRuleDeviceList}
      */
-    public static final class // @@protoc_insertion_point(message_implements:policy.PolicyRuleDeviceList)
-    PolicyRuleDeviceList extends // @@protoc_insertion_point(message_implements:policy.PolicyRuleDeviceList)
-    com.google.protobuf.GeneratedMessageV3 implements PolicyRuleDeviceListOrBuilder {
+    public static final class PolicyRuleDeviceList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:policy.PolicyRuleDeviceList)
+    PolicyRuleDeviceListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -8137,9 +8120,8 @@ public final class Policy {
          *
          * Protobuf type {@code policy.PolicyRuleDeviceList}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:policy.PolicyRuleDeviceList)
-        Builder extends // @@protoc_insertion_point(builder_implements:policy.PolicyRuleDeviceList)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements policy.Policy.PolicyRuleDeviceListOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:policy.PolicyRuleDeviceList)
+        policy.Policy.PolicyRuleDeviceListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return policy.Policy.internal_static_policy_PolicyRuleDeviceList_descriptor;
@@ -8606,8 +8588,8 @@ public final class Policy {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:policy.PolicyRuleList)
-    PolicyRuleListOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface PolicyRuleListOrBuilder extends // @@protoc_insertion_point(interface_extends:policy.PolicyRuleList)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .policy.PolicyRule policyRules = 1;</code>
@@ -8642,9 +8624,8 @@ public final class Policy {
      *
      * Protobuf type {@code policy.PolicyRuleList}
      */
-    public static final class // @@protoc_insertion_point(message_implements:policy.PolicyRuleList)
-    PolicyRuleList extends // @@protoc_insertion_point(message_implements:policy.PolicyRuleList)
-    com.google.protobuf.GeneratedMessageV3 implements PolicyRuleListOrBuilder {
+    public static final class PolicyRuleList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:policy.PolicyRuleList)
+    PolicyRuleListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -8863,9 +8844,8 @@ public final class Policy {
          *
          * Protobuf type {@code policy.PolicyRuleList}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:policy.PolicyRuleList)
-        Builder extends // @@protoc_insertion_point(builder_implements:policy.PolicyRuleList)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements policy.Policy.PolicyRuleListOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:policy.PolicyRuleList)
+        policy.Policy.PolicyRuleListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return policy.Policy.internal_static_policy_PolicyRuleList_descriptor;
diff --git a/src/policy/target/generated-sources/grpc/policy/PolicyAction.java b/src/policy/target/generated-sources/grpc/policy/PolicyAction.java
index eb5ee9f5e..097097d6f 100644
--- a/src/policy/target/generated-sources/grpc/policy/PolicyAction.java
+++ b/src/policy/target/generated-sources/grpc/policy/PolicyAction.java
@@ -160,8 +160,8 @@ public final class PolicyAction {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:policy.PolicyRuleAction)
-    PolicyRuleActionOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface PolicyRuleActionOrBuilder extends // @@protoc_insertion_point(interface_extends:policy.PolicyRuleAction)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.policy.PolicyRuleActionEnum action = 1;</code>
@@ -208,9 +208,8 @@ public final class PolicyAction {
      *
      * Protobuf type {@code policy.PolicyRuleAction}
      */
-    public static final class // @@protoc_insertion_point(message_implements:policy.PolicyRuleAction)
-    PolicyRuleAction extends // @@protoc_insertion_point(message_implements:policy.PolicyRuleAction)
-    com.google.protobuf.GeneratedMessageV3 implements PolicyRuleActionOrBuilder {
+    public static final class PolicyRuleAction extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:policy.PolicyRuleAction)
+    PolicyRuleActionOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -463,9 +462,8 @@ public final class PolicyAction {
          *
          * Protobuf type {@code policy.PolicyRuleAction}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:policy.PolicyRuleAction)
-        Builder extends // @@protoc_insertion_point(builder_implements:policy.PolicyRuleAction)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements policy.PolicyAction.PolicyRuleActionOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:policy.PolicyRuleAction)
+        policy.PolicyAction.PolicyRuleActionOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return policy.PolicyAction.internal_static_policy_PolicyRuleAction_descriptor;
@@ -1005,8 +1003,8 @@ public final class PolicyAction {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:policy.PolicyRuleActionConfig)
-    PolicyRuleActionConfigOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface PolicyRuleActionConfigOrBuilder extends // @@protoc_insertion_point(interface_extends:policy.PolicyRuleActionConfig)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>string action_key = 1;</code>
@@ -1040,9 +1038,8 @@ public final class PolicyAction {
      *
      * Protobuf type {@code policy.PolicyRuleActionConfig}
      */
-    public static final class // @@protoc_insertion_point(message_implements:policy.PolicyRuleActionConfig)
-    PolicyRuleActionConfig extends // @@protoc_insertion_point(message_implements:policy.PolicyRuleActionConfig)
-    com.google.protobuf.GeneratedMessageV3 implements PolicyRuleActionConfigOrBuilder {
+    public static final class PolicyRuleActionConfig extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:policy.PolicyRuleActionConfig)
+    PolicyRuleActionConfigOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -1301,9 +1298,8 @@ public final class PolicyAction {
          *
          * Protobuf type {@code policy.PolicyRuleActionConfig}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:policy.PolicyRuleActionConfig)
-        Builder extends // @@protoc_insertion_point(builder_implements:policy.PolicyRuleActionConfig)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements policy.PolicyAction.PolicyRuleActionConfigOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:policy.PolicyRuleActionConfig)
+        policy.PolicyAction.PolicyRuleActionConfigOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return policy.PolicyAction.internal_static_policy_PolicyRuleActionConfig_descriptor;
diff --git a/src/policy/target/generated-sources/grpc/policy/PolicyCondition.java b/src/policy/target/generated-sources/grpc/policy/PolicyCondition.java
index 9dd6ed753..f5b5fd967 100644
--- a/src/policy/target/generated-sources/grpc/policy/PolicyCondition.java
+++ b/src/policy/target/generated-sources/grpc/policy/PolicyCondition.java
@@ -372,8 +372,8 @@ public final class PolicyCondition {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:policy.PolicyRuleCondition)
-    PolicyRuleConditionOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface PolicyRuleConditionOrBuilder extends // @@protoc_insertion_point(interface_extends:policy.PolicyRuleCondition)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <pre>
@@ -441,9 +441,8 @@ public final class PolicyCondition {
      *
      * Protobuf type {@code policy.PolicyRuleCondition}
      */
-    public static final class // @@protoc_insertion_point(message_implements:policy.PolicyRuleCondition)
-    PolicyRuleCondition extends // @@protoc_insertion_point(message_implements:policy.PolicyRuleCondition)
-    com.google.protobuf.GeneratedMessageV3 implements PolicyRuleConditionOrBuilder {
+    public static final class PolicyRuleCondition extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:policy.PolicyRuleCondition)
+    PolicyRuleConditionOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -742,9 +741,8 @@ public final class PolicyCondition {
          *
          * Protobuf type {@code policy.PolicyRuleCondition}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:policy.PolicyRuleCondition)
-        Builder extends // @@protoc_insertion_point(builder_implements:policy.PolicyRuleCondition)
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements policy.PolicyCondition.PolicyRuleConditionOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:policy.PolicyRuleCondition)
+        policy.PolicyCondition.PolicyRuleConditionOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return policy.PolicyCondition.internal_static_policy_PolicyRuleCondition_descriptor;
diff --git a/src/policy/target/kubernetes/kubernetes.yml b/src/policy/target/kubernetes/kubernetes.yml
index 4b675c774..cab8865e0 100644
--- a/src/policy/target/kubernetes/kubernetes.yml
+++ b/src/policy/target/kubernetes/kubernetes.yml
@@ -3,8 +3,8 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
-    app.quarkus.io/commit-id: f6ca78538c88e1affff6dd8908e6f14379f5d9ac
-    app.quarkus.io/build-timestamp: 2025-10-27 - 16:25:07 +0000
+    app.quarkus.io/commit-id: 0539e363a3349889ebd7d3d7b0509744e2a4d0aa
+    app.quarkus.io/build-timestamp: 2025-10-28 - 10:10:47 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8080"
@@ -17,14 +17,14 @@ metadata:
   name: policyservice
 spec:
   ports:
-    - name: grpc
-      port: 6060
-      protocol: TCP
-      targetPort: 6060
     - name: http
       port: 9192
       protocol: TCP
       targetPort: 8080
+    - name: grpc
+      port: 6060
+      protocol: TCP
+      targetPort: 6060
     - name: https
       port: 443
       protocol: TCP
@@ -37,8 +37,8 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   annotations:
-    app.quarkus.io/commit-id: f6ca78538c88e1affff6dd8908e6f14379f5d9ac
-    app.quarkus.io/build-timestamp: 2025-10-27 - 16:25:07 +0000
+    app.quarkus.io/commit-id: 0539e363a3349889ebd7d3d7b0509744e2a4d0aa
+    app.quarkus.io/build-timestamp: 2025-10-28 - 10:10:47 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8080"
@@ -57,8 +57,8 @@ spec:
   template:
     metadata:
       annotations:
-        app.quarkus.io/commit-id: f6ca78538c88e1affff6dd8908e6f14379f5d9ac
-        app.quarkus.io/build-timestamp: 2025-10-27 - 16:25:07 +0000
+        app.quarkus.io/commit-id: 0539e363a3349889ebd7d3d7b0509744e2a4d0aa
+        app.quarkus.io/build-timestamp: 2025-10-28 - 10:10:47 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8080"
@@ -75,14 +75,14 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-            - name: MONITORING_SERVICE_HOST
-              value: monitoringservice
-            - name: SERVICE_SERVICE_HOST
-              value: serviceservice
-            - name: KAFKA_BROKER_HOST
-              value: kafka-service.kafka.svc.cluster.local
             - name: CONTEXT_SERVICE_HOST
               value: contextservice
+            - name: KAFKA_BROKER_HOST
+              value: kafka-service.kafka.svc.cluster.local
+            - name: SERVICE_SERVICE_HOST
+              value: serviceservice
+            - name: MONITORING_SERVICE_HOST
+              value: monitoringservice
           image: labs.etsi.org:5050/tfs/controller/policy:0.1.0
           imagePullPolicy: Always
           livenessProbe:
@@ -97,12 +97,12 @@ spec:
             timeoutSeconds: 10
           name: policyservice
           ports:
-            - containerPort: 6060
-              name: grpc
-              protocol: TCP
             - containerPort: 8080
               name: http
               protocol: TCP
+            - containerPort: 6060
+              name: grpc
+              protocol: TCP
             - containerPort: 8443
               name: https
               protocol: TCP
diff --git a/src/ztp/target/generated-sources/grpc/acl/Acl.java b/src/ztp/target/generated-sources/grpc/acl/Acl.java
index 69677b4cc..037bd3858 100644
--- a/src/ztp/target/generated-sources/grpc/acl/Acl.java
+++ b/src/ztp/target/generated-sources/grpc/acl/Acl.java
@@ -397,8 +397,8 @@ public final class Acl {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:acl.AclMatch)
-    AclMatchOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface AclMatchOrBuilder extends // @@protoc_insertion_point(interface_extends:acl.AclMatch)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>uint32 dscp = 1;</code>
@@ -476,9 +476,8 @@ public final class Acl {
     /**
      * Protobuf type {@code acl.AclMatch}
      */
-    public static final class // @@protoc_insertion_point(message_implements:acl.AclMatch)
-    // @@protoc_insertion_point(message_implements:acl.AclMatch)
-    AclMatch extends com.google.protobuf.GeneratedMessageV3 implements AclMatchOrBuilder {
+    public static final class AclMatch extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:acl.AclMatch)
+    AclMatchOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -920,9 +919,8 @@ public final class Acl {
         /**
          * Protobuf type {@code acl.AclMatch}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:acl.AclMatch)
-        // @@protoc_insertion_point(builder_implements:acl.AclMatch)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements acl.Acl.AclMatchOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:acl.AclMatch)
+        acl.Acl.AclMatchOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return acl.Acl.internal_static_acl_AclMatch_descriptor;
@@ -1657,8 +1655,8 @@ public final class Acl {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:acl.AclAction)
-    AclActionOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface AclActionOrBuilder extends // @@protoc_insertion_point(interface_extends:acl.AclAction)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.acl.AclForwardActionEnum forward_action = 1;</code>
@@ -1688,9 +1686,8 @@ public final class Acl {
     /**
      * Protobuf type {@code acl.AclAction}
      */
-    public static final class // @@protoc_insertion_point(message_implements:acl.AclAction)
-    // @@protoc_insertion_point(message_implements:acl.AclAction)
-    AclAction extends com.google.protobuf.GeneratedMessageV3 implements AclActionOrBuilder {
+    public static final class AclAction extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:acl.AclAction)
+    AclActionOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -1915,9 +1912,8 @@ public final class Acl {
         /**
          * Protobuf type {@code acl.AclAction}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:acl.AclAction)
-        // @@protoc_insertion_point(builder_implements:acl.AclAction)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements acl.Acl.AclActionOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:acl.AclAction)
+        acl.Acl.AclActionOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return acl.Acl.internal_static_acl_AclAction_descriptor;
@@ -2237,8 +2233,8 @@ public final class Acl {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:acl.AclEntry)
-    AclEntryOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface AclEntryOrBuilder extends // @@protoc_insertion_point(interface_extends:acl.AclEntry)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>uint32 sequence_id = 1;</code>
@@ -2296,9 +2292,8 @@ public final class Acl {
     /**
      * Protobuf type {@code acl.AclEntry}
      */
-    public static final class // @@protoc_insertion_point(message_implements:acl.AclEntry)
-    // @@protoc_insertion_point(message_implements:acl.AclEntry)
-    AclEntry extends com.google.protobuf.GeneratedMessageV3 implements AclEntryOrBuilder {
+    public static final class AclEntry extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:acl.AclEntry)
+    AclEntryOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -2619,9 +2614,8 @@ public final class Acl {
         /**
          * Protobuf type {@code acl.AclEntry}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:acl.AclEntry)
-        // @@protoc_insertion_point(builder_implements:acl.AclEntry)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements acl.Acl.AclEntryOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:acl.AclEntry)
+        acl.Acl.AclEntryOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return acl.Acl.internal_static_acl_AclEntry_descriptor;
@@ -3206,8 +3200,8 @@ public final class Acl {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:acl.AclRuleSet)
-    AclRuleSetOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface AclRuleSetOrBuilder extends // @@protoc_insertion_point(interface_extends:acl.AclRuleSet)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>string name = 1;</code>
@@ -3286,9 +3280,8 @@ public final class Acl {
     /**
      * Protobuf type {@code acl.AclRuleSet}
      */
-    public static final class // @@protoc_insertion_point(message_implements:acl.AclRuleSet)
-    // @@protoc_insertion_point(message_implements:acl.AclRuleSet)
-    AclRuleSet extends com.google.protobuf.GeneratedMessageV3 implements AclRuleSetOrBuilder {
+    public static final class AclRuleSet extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:acl.AclRuleSet)
+    AclRuleSetOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -3684,9 +3677,8 @@ public final class Acl {
         /**
          * Protobuf type {@code acl.AclRuleSet}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:acl.AclRuleSet)
-        // @@protoc_insertion_point(builder_implements:acl.AclRuleSet)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements acl.Acl.AclRuleSetOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:acl.AclRuleSet)
+        acl.Acl.AclRuleSetOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return acl.Acl.internal_static_acl_AclRuleSet_descriptor;
diff --git a/src/ztp/target/generated-sources/grpc/context/ContextOuterClass.java b/src/ztp/target/generated-sources/grpc/context/ContextOuterClass.java
index 5d488e676..558aa9778 100644
--- a/src/ztp/target/generated-sources/grpc/context/ContextOuterClass.java
+++ b/src/ztp/target/generated-sources/grpc/context/ContextOuterClass.java
@@ -1378,6 +1378,119 @@ public final class ContextOuterClass {
         }
     }
 
+    /**
+     * Protobuf enum {@code context.AclDirectionEnum}
+     */
+    public enum AclDirectionEnum implements com.google.protobuf.ProtocolMessageEnum {
+
+        /**
+         * <code>ACLDIRECTION_BOTH = 0;</code>
+         */
+        ACLDIRECTION_BOTH(0),
+        /**
+         * <code>ACLDIRECTION_INGRESS = 1;</code>
+         */
+        ACLDIRECTION_INGRESS(1),
+        /**
+         * <code>ACLDIRECTION_EGRESS = 2;</code>
+         */
+        ACLDIRECTION_EGRESS(2),
+        UNRECOGNIZED(-1);
+
+        /**
+         * <code>ACLDIRECTION_BOTH = 0;</code>
+         */
+        public static final int ACLDIRECTION_BOTH_VALUE = 0;
+
+        /**
+         * <code>ACLDIRECTION_INGRESS = 1;</code>
+         */
+        public static final int ACLDIRECTION_INGRESS_VALUE = 1;
+
+        /**
+         * <code>ACLDIRECTION_EGRESS = 2;</code>
+         */
+        public static final int ACLDIRECTION_EGRESS_VALUE = 2;
+
+        public final int getNumber() {
+            if (this == UNRECOGNIZED) {
+                throw new java.lang.IllegalArgumentException("Can't get the number of an unknown enum value.");
+            }
+            return value;
+        }
+
+        /**
+         * @param value The numeric wire value of the corresponding enum entry.
+         * @return The enum associated with the given numeric wire value.
+         * @deprecated Use {@link #forNumber(int)} instead.
+         */
+        @java.lang.Deprecated
+        public static AclDirectionEnum valueOf(int value) {
+            return forNumber(value);
+        }
+
+        /**
+         * @param value The numeric wire value of the corresponding enum entry.
+         * @return The enum associated with the given numeric wire value.
+         */
+        public static AclDirectionEnum forNumber(int value) {
+            switch(value) {
+                case 0:
+                    return ACLDIRECTION_BOTH;
+                case 1:
+                    return ACLDIRECTION_INGRESS;
+                case 2:
+                    return ACLDIRECTION_EGRESS;
+                default:
+                    return null;
+            }
+        }
+
+        public static com.google.protobuf.Internal.EnumLiteMap<AclDirectionEnum> internalGetValueMap() {
+            return internalValueMap;
+        }
+
+        private static final com.google.protobuf.Internal.EnumLiteMap<AclDirectionEnum> internalValueMap = new com.google.protobuf.Internal.EnumLiteMap<AclDirectionEnum>() {
+
+            public AclDirectionEnum findValueByNumber(int number) {
+                return AclDirectionEnum.forNumber(number);
+            }
+        };
+
+        public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() {
+            if (this == UNRECOGNIZED) {
+                throw new java.lang.IllegalStateException("Can't get the descriptor of an unrecognized enum value.");
+            }
+            return getDescriptor().getValues().get(ordinal());
+        }
+
+        public final com.google.protobuf.Descriptors.EnumDescriptor getDescriptorForType() {
+            return getDescriptor();
+        }
+
+        public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() {
+            return context.ContextOuterClass.getDescriptor().getEnumTypes().get(8);
+        }
+
+        private static final AclDirectionEnum[] VALUES = values();
+
+        public static AclDirectionEnum valueOf(com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+            if (desc.getType() != getDescriptor()) {
+                throw new java.lang.IllegalArgumentException("EnumValueDescriptor is not for this type.");
+            }
+            if (desc.getIndex() == -1) {
+                return UNRECOGNIZED;
+            }
+            return VALUES[desc.getIndex()];
+        }
+
+        private final int value;
+
+        private AclDirectionEnum(int value) {
+            this.value = value;
+        }
+    }
+
     /**
      * <pre>
      * ----- Constraint ----------------------------------------------------------------------------------------------------
@@ -1473,7 +1586,7 @@ public final class ContextOuterClass {
         }
 
         public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() {
-            return context.ContextOuterClass.getDescriptor().getEnumTypes().get(8);
+            return context.ContextOuterClass.getDescriptor().getEnumTypes().get(9);
         }
 
         private static final ConstraintActionEnum[] VALUES = values();
@@ -1652,7 +1765,7 @@ public final class ContextOuterClass {
         }
 
         public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() {
-            return context.ContextOuterClass.getDescriptor().getEnumTypes().get(9);
+            return context.ContextOuterClass.getDescriptor().getEnumTypes().get(10);
         }
 
         private static final IsolationLevelEnum[] VALUES = values();
@@ -1674,8 +1787,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.Empty)
-    EmptyOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface EmptyOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Empty)
+    com.google.protobuf.MessageOrBuilder {
     }
 
     /**
@@ -1685,9 +1798,8 @@ public final class ContextOuterClass {
      *
      * Protobuf type {@code context.Empty}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.Empty)
-    // @@protoc_insertion_point(message_implements:context.Empty)
-    Empty extends com.google.protobuf.GeneratedMessageV3 implements EmptyOrBuilder {
+    public static final class Empty extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Empty)
+    EmptyOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -1848,9 +1960,8 @@ public final class ContextOuterClass {
          *
          * Protobuf type {@code context.Empty}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.Empty)
-        // @@protoc_insertion_point(builder_implements:context.Empty)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.EmptyOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Empty)
+        context.ContextOuterClass.EmptyOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Empty_descriptor;
@@ -2014,8 +2125,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.Uuid)
-    UuidOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface UuidOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Uuid)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>string uuid = 1;</code>
@@ -2033,9 +2144,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Uuid}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.Uuid)
-    // @@protoc_insertion_point(message_implements:context.Uuid)
-    Uuid extends com.google.protobuf.GeneratedMessageV3 implements UuidOrBuilder {
+    public static final class Uuid extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Uuid)
+    UuidOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -2241,9 +2351,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Uuid}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.Uuid)
-        // @@protoc_insertion_point(builder_implements:context.Uuid)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.UuidOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Uuid)
+        context.ContextOuterClass.UuidOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Uuid_descriptor;
@@ -2508,8 +2617,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.Timestamp)
-    TimestampOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface TimestampOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Timestamp)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>double timestamp = 1;</code>
@@ -2521,9 +2630,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Timestamp}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.Timestamp)
-    // @@protoc_insertion_point(message_implements:context.Timestamp)
-    Timestamp extends com.google.protobuf.GeneratedMessageV3 implements TimestampOrBuilder {
+    public static final class Timestamp extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Timestamp)
+    TimestampOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -2703,9 +2811,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Timestamp}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.Timestamp)
-        // @@protoc_insertion_point(builder_implements:context.Timestamp)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.TimestampOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Timestamp)
+        context.ContextOuterClass.TimestampOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Timestamp_descriptor;
@@ -2927,8 +3034,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.Event)
-    EventOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface EventOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Event)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Timestamp timestamp = 1;</code>
@@ -2963,9 +3070,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Event}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.Event)
-    // @@protoc_insertion_point(message_implements:context.Event)
-    Event extends com.google.protobuf.GeneratedMessageV3 implements EventOrBuilder {
+    public static final class Event extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Event)
+    EventOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -3202,9 +3308,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Event}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.Event)
-        // @@protoc_insertion_point(builder_implements:context.Event)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.EventOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Event)
+        context.ContextOuterClass.EventOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Event_descriptor;
@@ -3587,8 +3692,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.AnyEvent)
-    AnyEventOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface AnyEventOrBuilder extends // @@protoc_insertion_point(interface_extends:context.AnyEvent)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.ContextEvent context = 1;</code>
@@ -3715,9 +3820,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.AnyEvent}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.AnyEvent)
-    // @@protoc_insertion_point(message_implements:context.AnyEvent)
-    AnyEvent extends com.google.protobuf.GeneratedMessageV3 implements AnyEventOrBuilder {
+    public static final class AnyEvent extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.AnyEvent)
+    AnyEventOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -4284,9 +4388,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.AnyEvent}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.AnyEvent)
-        // @@protoc_insertion_point(builder_implements:context.AnyEvent)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.AnyEventOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.AnyEvent)
+        context.ContextOuterClass.AnyEventOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_AnyEvent_descriptor;
@@ -5602,8 +5705,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.ContextId)
-    ContextIdOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface ContextIdOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ContextId)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Uuid context_uuid = 1;</code>
@@ -5630,9 +5733,8 @@ public final class ContextOuterClass {
      *
      * Protobuf type {@code context.ContextId}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.ContextId)
-    // @@protoc_insertion_point(message_implements:context.ContextId)
-    ContextId extends com.google.protobuf.GeneratedMessageV3 implements ContextIdOrBuilder {
+    public static final class ContextId extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ContextId)
+    ContextIdOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -5839,9 +5941,8 @@ public final class ContextOuterClass {
          *
          * Protobuf type {@code context.ContextId}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.ContextId)
-        // @@protoc_insertion_point(builder_implements:context.ContextId)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ContextIdOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ContextId)
+        context.ContextOuterClass.ContextIdOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ContextId_descriptor;
@@ -6151,8 +6252,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.Context)
-    ContextOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface ContextOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Context)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.ContextId context_id = 1;</code>
@@ -6279,9 +6380,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Context}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.Context)
-    // @@protoc_insertion_point(message_implements:context.Context)
-    Context extends com.google.protobuf.GeneratedMessageV3 implements ContextOrBuilder {
+    public static final class Context extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Context)
+    ContextOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -6753,9 +6853,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Context}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.Context)
-        // @@protoc_insertion_point(builder_implements:context.Context)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ContextOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Context)
+        context.ContextOuterClass.ContextOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Context_descriptor;
@@ -8163,8 +8262,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.ContextIdList)
-    ContextIdListOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface ContextIdListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ContextIdList)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.ContextId context_ids = 1;</code>
@@ -8195,9 +8294,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ContextIdList}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.ContextIdList)
-    // @@protoc_insertion_point(message_implements:context.ContextIdList)
-    ContextIdList extends com.google.protobuf.GeneratedMessageV3 implements ContextIdListOrBuilder {
+    public static final class ContextIdList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ContextIdList)
+    ContextIdListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -8412,9 +8510,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ContextIdList}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.ContextIdList)
-        // @@protoc_insertion_point(builder_implements:context.ContextIdList)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ContextIdListOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ContextIdList)
+        context.ContextOuterClass.ContextIdListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ContextIdList_descriptor;
@@ -8881,8 +8978,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.ContextList)
-    ContextListOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface ContextListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ContextList)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.Context contexts = 1;</code>
@@ -8913,9 +9010,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ContextList}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.ContextList)
-    // @@protoc_insertion_point(message_implements:context.ContextList)
-    ContextList extends com.google.protobuf.GeneratedMessageV3 implements ContextListOrBuilder {
+    public static final class ContextList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ContextList)
+    ContextListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -9130,9 +9226,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ContextList}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.ContextList)
-        // @@protoc_insertion_point(builder_implements:context.ContextList)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ContextListOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ContextList)
+        context.ContextOuterClass.ContextListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ContextList_descriptor;
@@ -9599,8 +9694,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.ContextEvent)
-    ContextEventOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface ContextEventOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ContextEvent)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Event event = 1;</code>
@@ -9640,9 +9735,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ContextEvent}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.ContextEvent)
-    // @@protoc_insertion_point(message_implements:context.ContextEvent)
-    ContextEvent extends com.google.protobuf.GeneratedMessageV3 implements ContextEventOrBuilder {
+    public static final class ContextEvent extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ContextEvent)
+    ContextEventOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -9891,9 +9985,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ContextEvent}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.ContextEvent)
-        // @@protoc_insertion_point(builder_implements:context.ContextEvent)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ContextEventOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ContextEvent)
+        context.ContextOuterClass.ContextEventOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ContextEvent_descriptor;
@@ -10339,8 +10432,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.TopologyId)
-    TopologyIdOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface TopologyIdOrBuilder extends // @@protoc_insertion_point(interface_extends:context.TopologyId)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.ContextId context_id = 1;</code>
@@ -10384,9 +10477,8 @@ public final class ContextOuterClass {
      *
      * Protobuf type {@code context.TopologyId}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.TopologyId)
-    // @@protoc_insertion_point(message_implements:context.TopologyId)
-    TopologyId extends com.google.protobuf.GeneratedMessageV3 implements TopologyIdOrBuilder {
+    public static final class TopologyId extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.TopologyId)
+    TopologyIdOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -10639,9 +10731,8 @@ public final class ContextOuterClass {
          *
          * Protobuf type {@code context.TopologyId}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.TopologyId)
-        // @@protoc_insertion_point(builder_implements:context.TopologyId)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.TopologyIdOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.TopologyId)
+        context.ContextOuterClass.TopologyIdOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_TopologyId_descriptor;
@@ -11087,8 +11178,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.Topology)
-    TopologyOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface TopologyOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Topology)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.TopologyId topology_id = 1;</code>
@@ -11198,9 +11289,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Topology}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.Topology)
-    // @@protoc_insertion_point(message_implements:context.Topology)
-    Topology extends com.google.protobuf.GeneratedMessageV3 implements TopologyOrBuilder {
+    public static final class Topology extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Topology)
+    TopologyOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -11626,9 +11716,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Topology}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.Topology)
-        // @@protoc_insertion_point(builder_implements:context.Topology)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.TopologyOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Topology)
+        context.ContextOuterClass.TopologyOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Topology_descriptor;
@@ -12900,8 +12989,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.TopologyDetails)
-    TopologyDetailsOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface TopologyDetailsOrBuilder extends // @@protoc_insertion_point(interface_extends:context.TopologyDetails)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.TopologyId topology_id = 1;</code>
@@ -13011,9 +13100,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.TopologyDetails}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.TopologyDetails)
-    // @@protoc_insertion_point(message_implements:context.TopologyDetails)
-    TopologyDetails extends com.google.protobuf.GeneratedMessageV3 implements TopologyDetailsOrBuilder {
+    public static final class TopologyDetails extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.TopologyDetails)
+    TopologyDetailsOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -13439,9 +13527,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.TopologyDetails}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.TopologyDetails)
-        // @@protoc_insertion_point(builder_implements:context.TopologyDetails)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.TopologyDetailsOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.TopologyDetails)
+        context.ContextOuterClass.TopologyDetailsOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_TopologyDetails_descriptor;
@@ -14713,8 +14800,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.TopologyIdList)
-    TopologyIdListOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface TopologyIdListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.TopologyIdList)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.TopologyId topology_ids = 1;</code>
@@ -14745,9 +14832,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.TopologyIdList}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.TopologyIdList)
-    // @@protoc_insertion_point(message_implements:context.TopologyIdList)
-    TopologyIdList extends com.google.protobuf.GeneratedMessageV3 implements TopologyIdListOrBuilder {
+    public static final class TopologyIdList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.TopologyIdList)
+    TopologyIdListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -14962,9 +15048,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.TopologyIdList}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.TopologyIdList)
-        // @@protoc_insertion_point(builder_implements:context.TopologyIdList)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.TopologyIdListOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.TopologyIdList)
+        context.ContextOuterClass.TopologyIdListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_TopologyIdList_descriptor;
@@ -15431,8 +15516,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.TopologyList)
-    TopologyListOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface TopologyListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.TopologyList)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.Topology topologies = 1;</code>
@@ -15463,9 +15548,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.TopologyList}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.TopologyList)
-    // @@protoc_insertion_point(message_implements:context.TopologyList)
-    TopologyList extends com.google.protobuf.GeneratedMessageV3 implements TopologyListOrBuilder {
+    public static final class TopologyList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.TopologyList)
+    TopologyListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -15680,9 +15764,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.TopologyList}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.TopologyList)
-        // @@protoc_insertion_point(builder_implements:context.TopologyList)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.TopologyListOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.TopologyList)
+        context.ContextOuterClass.TopologyListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_TopologyList_descriptor;
@@ -16149,8 +16232,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.TopologyEvent)
-    TopologyEventOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface TopologyEventOrBuilder extends // @@protoc_insertion_point(interface_extends:context.TopologyEvent)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Event event = 1;</code>
@@ -16190,9 +16273,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.TopologyEvent}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.TopologyEvent)
-    // @@protoc_insertion_point(message_implements:context.TopologyEvent)
-    TopologyEvent extends com.google.protobuf.GeneratedMessageV3 implements TopologyEventOrBuilder {
+    public static final class TopologyEvent extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.TopologyEvent)
+    TopologyEventOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -16441,9 +16523,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.TopologyEvent}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.TopologyEvent)
-        // @@protoc_insertion_point(builder_implements:context.TopologyEvent)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.TopologyEventOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.TopologyEvent)
+        context.ContextOuterClass.TopologyEventOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_TopologyEvent_descriptor;
@@ -16889,8 +16970,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.DeviceId)
-    DeviceIdOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface DeviceIdOrBuilder extends // @@protoc_insertion_point(interface_extends:context.DeviceId)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Uuid device_uuid = 1;</code>
@@ -16917,9 +16998,8 @@ public final class ContextOuterClass {
      *
      * Protobuf type {@code context.DeviceId}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.DeviceId)
-    // @@protoc_insertion_point(message_implements:context.DeviceId)
-    DeviceId extends com.google.protobuf.GeneratedMessageV3 implements DeviceIdOrBuilder {
+    public static final class DeviceId extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.DeviceId)
+    DeviceIdOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -17126,9 +17206,8 @@ public final class ContextOuterClass {
          *
          * Protobuf type {@code context.DeviceId}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.DeviceId)
-        // @@protoc_insertion_point(builder_implements:context.DeviceId)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.DeviceIdOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.DeviceId)
+        context.ContextOuterClass.DeviceIdOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_DeviceId_descriptor;
@@ -17438,8 +17517,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.Device)
-    DeviceOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface DeviceOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Device)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.DeviceId device_id = 1;</code>
@@ -17646,9 +17725,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Device}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.Device)
-    // @@protoc_insertion_point(message_implements:context.Device)
-    Device extends com.google.protobuf.GeneratedMessageV3 implements DeviceOrBuilder {
+    public static final class Device extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Device)
+    DeviceOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -18312,9 +18390,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Device}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.Device)
-        // @@protoc_insertion_point(builder_implements:context.Device)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.DeviceOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Device)
+        context.ContextOuterClass.DeviceOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Device_descriptor;
@@ -20025,8 +20102,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.Component)
-    ComponentOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface ComponentOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Component)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Uuid component_uuid = 1;</code>
@@ -20142,9 +20219,8 @@ public final class ContextOuterClass {
      *
      * Protobuf type {@code context.Component}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.Component)
-    // @@protoc_insertion_point(message_implements:context.Component)
-    Component extends com.google.protobuf.GeneratedMessageV3 implements ComponentOrBuilder {
+    public static final class Component extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Component)
+    ComponentOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -20614,9 +20690,8 @@ public final class ContextOuterClass {
          *
          * Protobuf type {@code context.Component}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.Component)
-        // @@protoc_insertion_point(builder_implements:context.Component)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ComponentOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Component)
+        context.ContextOuterClass.ComponentOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Component_descriptor;
@@ -21394,8 +21469,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.DeviceConfig)
-    DeviceConfigOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface DeviceConfigOrBuilder extends // @@protoc_insertion_point(interface_extends:context.DeviceConfig)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.ConfigRule config_rules = 1;</code>
@@ -21426,9 +21501,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.DeviceConfig}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.DeviceConfig)
-    // @@protoc_insertion_point(message_implements:context.DeviceConfig)
-    DeviceConfig extends com.google.protobuf.GeneratedMessageV3 implements DeviceConfigOrBuilder {
+    public static final class DeviceConfig extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.DeviceConfig)
+    DeviceConfigOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -21643,9 +21717,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.DeviceConfig}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.DeviceConfig)
-        // @@protoc_insertion_point(builder_implements:context.DeviceConfig)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.DeviceConfigOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.DeviceConfig)
+        context.ContextOuterClass.DeviceConfigOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_DeviceConfig_descriptor;
@@ -22112,8 +22185,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.DeviceIdList)
-    DeviceIdListOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface DeviceIdListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.DeviceIdList)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.DeviceId device_ids = 1;</code>
@@ -22144,9 +22217,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.DeviceIdList}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.DeviceIdList)
-    // @@protoc_insertion_point(message_implements:context.DeviceIdList)
-    DeviceIdList extends com.google.protobuf.GeneratedMessageV3 implements DeviceIdListOrBuilder {
+    public static final class DeviceIdList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.DeviceIdList)
+    DeviceIdListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -22361,9 +22433,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.DeviceIdList}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.DeviceIdList)
-        // @@protoc_insertion_point(builder_implements:context.DeviceIdList)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.DeviceIdListOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.DeviceIdList)
+        context.ContextOuterClass.DeviceIdListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_DeviceIdList_descriptor;
@@ -22830,8 +22901,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.DeviceList)
-    DeviceListOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface DeviceListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.DeviceList)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.Device devices = 1;</code>
@@ -22862,9 +22933,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.DeviceList}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.DeviceList)
-    // @@protoc_insertion_point(message_implements:context.DeviceList)
-    DeviceList extends com.google.protobuf.GeneratedMessageV3 implements DeviceListOrBuilder {
+    public static final class DeviceList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.DeviceList)
+    DeviceListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -23079,9 +23149,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.DeviceList}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.DeviceList)
-        // @@protoc_insertion_point(builder_implements:context.DeviceList)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.DeviceListOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.DeviceList)
+        context.ContextOuterClass.DeviceListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_DeviceList_descriptor;
@@ -23548,8 +23617,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.DeviceFilter)
-    DeviceFilterOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface DeviceFilterOrBuilder extends // @@protoc_insertion_point(interface_extends:context.DeviceFilter)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.DeviceIdList device_ids = 1;</code>
@@ -23590,9 +23659,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.DeviceFilter}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.DeviceFilter)
-    // @@protoc_insertion_point(message_implements:context.DeviceFilter)
-    DeviceFilter extends com.google.protobuf.GeneratedMessageV3 implements DeviceFilterOrBuilder {
+    public static final class DeviceFilter extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.DeviceFilter)
+    DeviceFilterOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -23864,9 +23932,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.DeviceFilter}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.DeviceFilter)
-        // @@protoc_insertion_point(builder_implements:context.DeviceFilter)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.DeviceFilterOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.DeviceFilter)
+        context.ContextOuterClass.DeviceFilterOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_DeviceFilter_descriptor;
@@ -24320,8 +24387,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.DeviceEvent)
-    DeviceEventOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface DeviceEventOrBuilder extends // @@protoc_insertion_point(interface_extends:context.DeviceEvent)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Event event = 1;</code>
@@ -24378,9 +24445,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.DeviceEvent}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.DeviceEvent)
-    // @@protoc_insertion_point(message_implements:context.DeviceEvent)
-    DeviceEvent extends com.google.protobuf.GeneratedMessageV3 implements DeviceEventOrBuilder {
+    public static final class DeviceEvent extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.DeviceEvent)
+    DeviceEventOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -24675,9 +24741,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.DeviceEvent}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.DeviceEvent)
-        // @@protoc_insertion_point(builder_implements:context.DeviceEvent)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.DeviceEventOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.DeviceEvent)
+        context.ContextOuterClass.DeviceEventOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_DeviceEvent_descriptor;
@@ -25259,8 +25324,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.LinkId)
-    LinkIdOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface LinkIdOrBuilder extends // @@protoc_insertion_point(interface_extends:context.LinkId)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Uuid link_uuid = 1;</code>
@@ -25287,9 +25352,8 @@ public final class ContextOuterClass {
      *
      * Protobuf type {@code context.LinkId}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.LinkId)
-    // @@protoc_insertion_point(message_implements:context.LinkId)
-    LinkId extends com.google.protobuf.GeneratedMessageV3 implements LinkIdOrBuilder {
+    public static final class LinkId extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.LinkId)
+    LinkIdOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -25496,9 +25560,8 @@ public final class ContextOuterClass {
          *
          * Protobuf type {@code context.LinkId}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.LinkId)
-        // @@protoc_insertion_point(builder_implements:context.LinkId)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.LinkIdOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.LinkId)
+        context.ContextOuterClass.LinkIdOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_LinkId_descriptor;
@@ -25808,8 +25871,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.LinkAttributes)
-    LinkAttributesOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface LinkAttributesOrBuilder extends // @@protoc_insertion_point(interface_extends:context.LinkAttributes)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>bool is_bidirectional = 1;</code>
@@ -25833,9 +25896,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.LinkAttributes}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.LinkAttributes)
-    // @@protoc_insertion_point(message_implements:context.LinkAttributes)
-    LinkAttributes extends com.google.protobuf.GeneratedMessageV3 implements LinkAttributesOrBuilder {
+    public static final class LinkAttributes extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.LinkAttributes)
+    LinkAttributesOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -26061,9 +26123,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.LinkAttributes}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.LinkAttributes)
-        // @@protoc_insertion_point(builder_implements:context.LinkAttributes)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.LinkAttributesOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.LinkAttributes)
+        context.ContextOuterClass.LinkAttributesOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_LinkAttributes_descriptor;
@@ -26381,8 +26442,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.Link)
-    LinkOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface LinkOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Link)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.LinkId link_id = 1;</code>
@@ -26471,9 +26532,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Link}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.Link)
-    // @@protoc_insertion_point(message_implements:context.Link)
-    Link extends com.google.protobuf.GeneratedMessageV3 implements LinkOrBuilder {
+    public static final class Link extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Link)
+    LinkOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -26863,9 +26923,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Link}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.Link)
-        // @@protoc_insertion_point(builder_implements:context.Link)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.LinkOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Link)
+        context.ContextOuterClass.LinkOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Link_descriptor;
@@ -27768,8 +27827,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.LinkIdList)
-    LinkIdListOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface LinkIdListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.LinkIdList)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.LinkId link_ids = 1;</code>
@@ -27800,9 +27859,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.LinkIdList}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.LinkIdList)
-    // @@protoc_insertion_point(message_implements:context.LinkIdList)
-    LinkIdList extends com.google.protobuf.GeneratedMessageV3 implements LinkIdListOrBuilder {
+    public static final class LinkIdList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.LinkIdList)
+    LinkIdListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -28017,9 +28075,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.LinkIdList}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.LinkIdList)
-        // @@protoc_insertion_point(builder_implements:context.LinkIdList)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.LinkIdListOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.LinkIdList)
+        context.ContextOuterClass.LinkIdListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_LinkIdList_descriptor;
@@ -28486,8 +28543,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.LinkList)
-    LinkListOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface LinkListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.LinkList)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.Link links = 1;</code>
@@ -28518,9 +28575,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.LinkList}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.LinkList)
-    // @@protoc_insertion_point(message_implements:context.LinkList)
-    LinkList extends com.google.protobuf.GeneratedMessageV3 implements LinkListOrBuilder {
+    public static final class LinkList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.LinkList)
+    LinkListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -28735,9 +28791,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.LinkList}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.LinkList)
-        // @@protoc_insertion_point(builder_implements:context.LinkList)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.LinkListOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.LinkList)
+        context.ContextOuterClass.LinkListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_LinkList_descriptor;
@@ -29204,8 +29259,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.LinkEvent)
-    LinkEventOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface LinkEventOrBuilder extends // @@protoc_insertion_point(interface_extends:context.LinkEvent)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Event event = 1;</code>
@@ -29245,9 +29300,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.LinkEvent}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.LinkEvent)
-    // @@protoc_insertion_point(message_implements:context.LinkEvent)
-    LinkEvent extends com.google.protobuf.GeneratedMessageV3 implements LinkEventOrBuilder {
+    public static final class LinkEvent extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.LinkEvent)
+    LinkEventOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -29496,9 +29550,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.LinkEvent}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.LinkEvent)
-        // @@protoc_insertion_point(builder_implements:context.LinkEvent)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.LinkEventOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.LinkEvent)
+        context.ContextOuterClass.LinkEventOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_LinkEvent_descriptor;
@@ -29944,8 +29997,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.ServiceId)
-    ServiceIdOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface ServiceIdOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ServiceId)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.ContextId context_id = 1;</code>
@@ -29989,9 +30042,8 @@ public final class ContextOuterClass {
      *
      * Protobuf type {@code context.ServiceId}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.ServiceId)
-    // @@protoc_insertion_point(message_implements:context.ServiceId)
-    ServiceId extends com.google.protobuf.GeneratedMessageV3 implements ServiceIdOrBuilder {
+    public static final class ServiceId extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ServiceId)
+    ServiceIdOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -30244,9 +30296,8 @@ public final class ContextOuterClass {
          *
          * Protobuf type {@code context.ServiceId}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.ServiceId)
-        // @@protoc_insertion_point(builder_implements:context.ServiceId)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ServiceIdOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ServiceId)
+        context.ContextOuterClass.ServiceIdOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ServiceId_descriptor;
@@ -30692,8 +30743,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.Service)
-    ServiceOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface ServiceOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Service)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.ServiceId service_id = 1;</code>
@@ -30841,9 +30892,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Service}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.Service)
-    // @@protoc_insertion_point(message_implements:context.Service)
-    Service extends com.google.protobuf.GeneratedMessageV3 implements ServiceOrBuilder {
+    public static final class Service extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Service)
+    ServiceOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -31383,9 +31433,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Service}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.Service)
-        // @@protoc_insertion_point(builder_implements:context.Service)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ServiceOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Service)
+        context.ContextOuterClass.ServiceOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Service_descriptor;
@@ -32849,8 +32898,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.ServiceStatus)
-    ServiceStatusOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface ServiceStatusOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ServiceStatus)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.ServiceStatusEnum service_status = 1;</code>
@@ -32868,9 +32917,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ServiceStatus}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.ServiceStatus)
-    // @@protoc_insertion_point(message_implements:context.ServiceStatus)
-    ServiceStatus extends com.google.protobuf.GeneratedMessageV3 implements ServiceStatusOrBuilder {
+    public static final class ServiceStatus extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ServiceStatus)
+    ServiceStatusOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -33061,9 +33109,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ServiceStatus}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.ServiceStatus)
-        // @@protoc_insertion_point(builder_implements:context.ServiceStatus)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ServiceStatusOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ServiceStatus)
+        context.ContextOuterClass.ServiceStatusOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ServiceStatus_descriptor;
@@ -33310,8 +33357,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.ServiceConfig)
-    ServiceConfigOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface ServiceConfigOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ServiceConfig)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.ConfigRule config_rules = 1;</code>
@@ -33342,9 +33389,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ServiceConfig}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.ServiceConfig)
-    // @@protoc_insertion_point(message_implements:context.ServiceConfig)
-    ServiceConfig extends com.google.protobuf.GeneratedMessageV3 implements ServiceConfigOrBuilder {
+    public static final class ServiceConfig extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ServiceConfig)
+    ServiceConfigOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -33559,9 +33605,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ServiceConfig}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.ServiceConfig)
-        // @@protoc_insertion_point(builder_implements:context.ServiceConfig)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ServiceConfigOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ServiceConfig)
+        context.ContextOuterClass.ServiceConfigOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ServiceConfig_descriptor;
@@ -34028,8 +34073,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.ServiceIdList)
-    ServiceIdListOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface ServiceIdListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ServiceIdList)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.ServiceId service_ids = 1;</code>
@@ -34060,9 +34105,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ServiceIdList}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.ServiceIdList)
-    // @@protoc_insertion_point(message_implements:context.ServiceIdList)
-    ServiceIdList extends com.google.protobuf.GeneratedMessageV3 implements ServiceIdListOrBuilder {
+    public static final class ServiceIdList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ServiceIdList)
+    ServiceIdListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -34277,9 +34321,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ServiceIdList}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.ServiceIdList)
-        // @@protoc_insertion_point(builder_implements:context.ServiceIdList)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ServiceIdListOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ServiceIdList)
+        context.ContextOuterClass.ServiceIdListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ServiceIdList_descriptor;
@@ -34746,8 +34789,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.ServiceList)
-    ServiceListOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface ServiceListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ServiceList)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.Service services = 1;</code>
@@ -34778,9 +34821,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ServiceList}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.ServiceList)
-    // @@protoc_insertion_point(message_implements:context.ServiceList)
-    ServiceList extends com.google.protobuf.GeneratedMessageV3 implements ServiceListOrBuilder {
+    public static final class ServiceList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ServiceList)
+    ServiceListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -34995,9 +35037,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ServiceList}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.ServiceList)
-        // @@protoc_insertion_point(builder_implements:context.ServiceList)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ServiceListOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ServiceList)
+        context.ContextOuterClass.ServiceListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ServiceList_descriptor;
@@ -35464,8 +35505,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.ServiceFilter)
-    ServiceFilterOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface ServiceFilterOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ServiceFilter)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.ServiceIdList service_ids = 1;</code>
@@ -35506,9 +35547,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ServiceFilter}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.ServiceFilter)
-    // @@protoc_insertion_point(message_implements:context.ServiceFilter)
-    ServiceFilter extends com.google.protobuf.GeneratedMessageV3 implements ServiceFilterOrBuilder {
+    public static final class ServiceFilter extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ServiceFilter)
+    ServiceFilterOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -35780,9 +35820,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ServiceFilter}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.ServiceFilter)
-        // @@protoc_insertion_point(builder_implements:context.ServiceFilter)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ServiceFilterOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ServiceFilter)
+        context.ContextOuterClass.ServiceFilterOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ServiceFilter_descriptor;
@@ -36236,8 +36275,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.ServiceEvent)
-    ServiceEventOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface ServiceEventOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ServiceEvent)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Event event = 1;</code>
@@ -36277,9 +36316,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ServiceEvent}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.ServiceEvent)
-    // @@protoc_insertion_point(message_implements:context.ServiceEvent)
-    ServiceEvent extends com.google.protobuf.GeneratedMessageV3 implements ServiceEventOrBuilder {
+    public static final class ServiceEvent extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ServiceEvent)
+    ServiceEventOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -36528,9 +36566,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ServiceEvent}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.ServiceEvent)
-        // @@protoc_insertion_point(builder_implements:context.ServiceEvent)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ServiceEventOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ServiceEvent)
+        context.ContextOuterClass.ServiceEventOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ServiceEvent_descriptor;
@@ -36976,8 +37013,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.SliceId)
-    SliceIdOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface SliceIdOrBuilder extends // @@protoc_insertion_point(interface_extends:context.SliceId)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.ContextId context_id = 1;</code>
@@ -37021,9 +37058,8 @@ public final class ContextOuterClass {
      *
      * Protobuf type {@code context.SliceId}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.SliceId)
-    // @@protoc_insertion_point(message_implements:context.SliceId)
-    SliceId extends com.google.protobuf.GeneratedMessageV3 implements SliceIdOrBuilder {
+    public static final class SliceId extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.SliceId)
+    SliceIdOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -37276,9 +37312,8 @@ public final class ContextOuterClass {
          *
          * Protobuf type {@code context.SliceId}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.SliceId)
-        // @@protoc_insertion_point(builder_implements:context.SliceId)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.SliceIdOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.SliceId)
+        context.ContextOuterClass.SliceIdOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_SliceId_descriptor;
@@ -37724,8 +37759,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.Slice)
-    SliceOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface SliceOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Slice)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.SliceId slice_id = 1;</code>
@@ -37928,9 +37963,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Slice}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.Slice)
-    // @@protoc_insertion_point(message_implements:context.Slice)
-    Slice extends com.google.protobuf.GeneratedMessageV3 implements SliceOrBuilder {
+    public static final class Slice extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Slice)
+    SliceOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -38598,9 +38632,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Slice}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.Slice)
-        // @@protoc_insertion_point(builder_implements:context.Slice)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.SliceOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Slice)
+        context.ContextOuterClass.SliceOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Slice_descriptor;
@@ -40705,8 +40738,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.SliceOwner)
-    SliceOwnerOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface SliceOwnerOrBuilder extends // @@protoc_insertion_point(interface_extends:context.SliceOwner)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Uuid owner_uuid = 1;</code>
@@ -40741,9 +40774,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.SliceOwner}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.SliceOwner)
-    // @@protoc_insertion_point(message_implements:context.SliceOwner)
-    SliceOwner extends com.google.protobuf.GeneratedMessageV3 implements SliceOwnerOrBuilder {
+    public static final class SliceOwner extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.SliceOwner)
+    SliceOwnerOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -40995,9 +41027,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.SliceOwner}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.SliceOwner)
-        // @@protoc_insertion_point(builder_implements:context.SliceOwner)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.SliceOwnerOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.SliceOwner)
+        context.ContextOuterClass.SliceOwnerOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_SliceOwner_descriptor;
@@ -41398,8 +41429,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.SliceStatus)
-    SliceStatusOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface SliceStatusOrBuilder extends // @@protoc_insertion_point(interface_extends:context.SliceStatus)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.SliceStatusEnum slice_status = 1;</code>
@@ -41417,9 +41448,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.SliceStatus}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.SliceStatus)
-    // @@protoc_insertion_point(message_implements:context.SliceStatus)
-    SliceStatus extends com.google.protobuf.GeneratedMessageV3 implements SliceStatusOrBuilder {
+    public static final class SliceStatus extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.SliceStatus)
+    SliceStatusOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -41610,9 +41640,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.SliceStatus}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.SliceStatus)
-        // @@protoc_insertion_point(builder_implements:context.SliceStatus)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.SliceStatusOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.SliceStatus)
+        context.ContextOuterClass.SliceStatusOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_SliceStatus_descriptor;
@@ -41859,8 +41888,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.SliceConfig)
-    SliceConfigOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface SliceConfigOrBuilder extends // @@protoc_insertion_point(interface_extends:context.SliceConfig)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.ConfigRule config_rules = 1;</code>
@@ -41891,9 +41920,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.SliceConfig}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.SliceConfig)
-    // @@protoc_insertion_point(message_implements:context.SliceConfig)
-    SliceConfig extends com.google.protobuf.GeneratedMessageV3 implements SliceConfigOrBuilder {
+    public static final class SliceConfig extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.SliceConfig)
+    SliceConfigOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -42108,9 +42136,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.SliceConfig}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.SliceConfig)
-        // @@protoc_insertion_point(builder_implements:context.SliceConfig)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.SliceConfigOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.SliceConfig)
+        context.ContextOuterClass.SliceConfigOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_SliceConfig_descriptor;
@@ -42577,8 +42604,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.SliceIdList)
-    SliceIdListOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface SliceIdListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.SliceIdList)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.SliceId slice_ids = 1;</code>
@@ -42609,9 +42636,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.SliceIdList}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.SliceIdList)
-    // @@protoc_insertion_point(message_implements:context.SliceIdList)
-    SliceIdList extends com.google.protobuf.GeneratedMessageV3 implements SliceIdListOrBuilder {
+    public static final class SliceIdList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.SliceIdList)
+    SliceIdListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -42826,9 +42852,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.SliceIdList}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.SliceIdList)
-        // @@protoc_insertion_point(builder_implements:context.SliceIdList)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.SliceIdListOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.SliceIdList)
+        context.ContextOuterClass.SliceIdListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_SliceIdList_descriptor;
@@ -43295,8 +43320,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.SliceList)
-    SliceListOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface SliceListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.SliceList)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.Slice slices = 1;</code>
@@ -43327,9 +43352,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.SliceList}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.SliceList)
-    // @@protoc_insertion_point(message_implements:context.SliceList)
-    SliceList extends com.google.protobuf.GeneratedMessageV3 implements SliceListOrBuilder {
+    public static final class SliceList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.SliceList)
+    SliceListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -43544,9 +43568,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.SliceList}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.SliceList)
-        // @@protoc_insertion_point(builder_implements:context.SliceList)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.SliceListOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.SliceList)
+        context.ContextOuterClass.SliceListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_SliceList_descriptor;
@@ -44013,8 +44036,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.SliceFilter)
-    SliceFilterOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface SliceFilterOrBuilder extends // @@protoc_insertion_point(interface_extends:context.SliceFilter)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.SliceIdList slice_ids = 1;</code>
@@ -44067,9 +44090,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.SliceFilter}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.SliceFilter)
-    // @@protoc_insertion_point(message_implements:context.SliceFilter)
-    SliceFilter extends com.google.protobuf.GeneratedMessageV3 implements SliceFilterOrBuilder {
+    public static final class SliceFilter extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.SliceFilter)
+    SliceFilterOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -44387,9 +44409,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.SliceFilter}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.SliceFilter)
-        // @@protoc_insertion_point(builder_implements:context.SliceFilter)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.SliceFilterOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.SliceFilter)
+        context.ContextOuterClass.SliceFilterOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_SliceFilter_descriptor;
@@ -44939,8 +44960,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.SliceEvent)
-    SliceEventOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface SliceEventOrBuilder extends // @@protoc_insertion_point(interface_extends:context.SliceEvent)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Event event = 1;</code>
@@ -44980,9 +45001,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.SliceEvent}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.SliceEvent)
-    // @@protoc_insertion_point(message_implements:context.SliceEvent)
-    SliceEvent extends com.google.protobuf.GeneratedMessageV3 implements SliceEventOrBuilder {
+    public static final class SliceEvent extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.SliceEvent)
+    SliceEventOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -45231,9 +45251,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.SliceEvent}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.SliceEvent)
-        // @@protoc_insertion_point(builder_implements:context.SliceEvent)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.SliceEventOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.SliceEvent)
+        context.ContextOuterClass.SliceEventOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_SliceEvent_descriptor;
@@ -45679,8 +45698,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.ConnectionId)
-    ConnectionIdOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface ConnectionIdOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ConnectionId)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Uuid connection_uuid = 1;</code>
@@ -45707,9 +45726,8 @@ public final class ContextOuterClass {
      *
      * Protobuf type {@code context.ConnectionId}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.ConnectionId)
-    // @@protoc_insertion_point(message_implements:context.ConnectionId)
-    ConnectionId extends com.google.protobuf.GeneratedMessageV3 implements ConnectionIdOrBuilder {
+    public static final class ConnectionId extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ConnectionId)
+    ConnectionIdOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -45916,9 +45934,8 @@ public final class ContextOuterClass {
          *
          * Protobuf type {@code context.ConnectionId}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.ConnectionId)
-        // @@protoc_insertion_point(builder_implements:context.ConnectionId)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ConnectionIdOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ConnectionId)
+        context.ContextOuterClass.ConnectionIdOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ConnectionId_descriptor;
@@ -46228,8 +46245,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.ConnectionSettings_L0)
-    ConnectionSettings_L0OrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface ConnectionSettings_L0OrBuilder extends // @@protoc_insertion_point(interface_extends:context.ConnectionSettings_L0)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>string lsp_symbolic_name = 1;</code>
@@ -46247,9 +46264,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ConnectionSettings_L0}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.ConnectionSettings_L0)
-    // @@protoc_insertion_point(message_implements:context.ConnectionSettings_L0)
-    ConnectionSettings_L0 extends com.google.protobuf.GeneratedMessageV3 implements ConnectionSettings_L0OrBuilder {
+    public static final class ConnectionSettings_L0 extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ConnectionSettings_L0)
+    ConnectionSettings_L0OrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -46455,9 +46471,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ConnectionSettings_L0}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.ConnectionSettings_L0)
-        // @@protoc_insertion_point(builder_implements:context.ConnectionSettings_L0)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ConnectionSettings_L0OrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ConnectionSettings_L0)
+        context.ContextOuterClass.ConnectionSettings_L0OrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ConnectionSettings_L0_descriptor;
@@ -46722,8 +46737,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.ConnectionSettings_L2)
-    ConnectionSettings_L2OrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface ConnectionSettings_L2OrBuilder extends // @@protoc_insertion_point(interface_extends:context.ConnectionSettings_L2)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>string src_mac_address = 1;</code>
@@ -46777,9 +46792,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ConnectionSettings_L2}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.ConnectionSettings_L2)
-    // @@protoc_insertion_point(message_implements:context.ConnectionSettings_L2)
-    ConnectionSettings_L2 extends com.google.protobuf.GeneratedMessageV3 implements ConnectionSettings_L2OrBuilder {
+    public static final class ConnectionSettings_L2 extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ConnectionSettings_L2)
+    ConnectionSettings_L2OrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -47126,9 +47140,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ConnectionSettings_L2}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.ConnectionSettings_L2)
-        // @@protoc_insertion_point(builder_implements:context.ConnectionSettings_L2)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ConnectionSettings_L2OrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ConnectionSettings_L2)
+        context.ContextOuterClass.ConnectionSettings_L2OrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ConnectionSettings_L2_descriptor;
@@ -47676,8 +47689,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.ConnectionSettings_L3)
-    ConnectionSettings_L3OrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface ConnectionSettings_L3OrBuilder extends // @@protoc_insertion_point(interface_extends:context.ConnectionSettings_L3)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>string src_ip_address = 1;</code>
@@ -47725,9 +47738,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ConnectionSettings_L3}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.ConnectionSettings_L3)
-    // @@protoc_insertion_point(message_implements:context.ConnectionSettings_L3)
-    ConnectionSettings_L3 extends com.google.protobuf.GeneratedMessageV3 implements ConnectionSettings_L3OrBuilder {
+    public static final class ConnectionSettings_L3 extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ConnectionSettings_L3)
+    ConnectionSettings_L3OrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -48051,9 +48063,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ConnectionSettings_L3}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.ConnectionSettings_L3)
-        // @@protoc_insertion_point(builder_implements:context.ConnectionSettings_L3)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ConnectionSettings_L3OrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ConnectionSettings_L3)
+        context.ContextOuterClass.ConnectionSettings_L3OrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ConnectionSettings_L3_descriptor;
@@ -48553,8 +48564,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.ConnectionSettings_L4)
-    ConnectionSettings_L4OrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface ConnectionSettings_L4OrBuilder extends // @@protoc_insertion_point(interface_extends:context.ConnectionSettings_L4)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>uint32 src_port = 1;</code>
@@ -48584,9 +48595,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ConnectionSettings_L4}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.ConnectionSettings_L4)
-    // @@protoc_insertion_point(message_implements:context.ConnectionSettings_L4)
-    ConnectionSettings_L4 extends com.google.protobuf.GeneratedMessageV3 implements ConnectionSettings_L4OrBuilder {
+    public static final class ConnectionSettings_L4 extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ConnectionSettings_L4)
+    ConnectionSettings_L4OrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -48835,9 +48845,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ConnectionSettings_L4}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.ConnectionSettings_L4)
-        // @@protoc_insertion_point(builder_implements:context.ConnectionSettings_L4)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ConnectionSettings_L4OrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ConnectionSettings_L4)
+        context.ContextOuterClass.ConnectionSettings_L4OrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ConnectionSettings_L4_descriptor;
@@ -49203,8 +49212,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.ConnectionSettings)
-    ConnectionSettingsOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface ConnectionSettingsOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ConnectionSettings)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.ConnectionSettings_L0 l0 = 1;</code>
@@ -49278,9 +49287,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ConnectionSettings}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.ConnectionSettings)
-    // @@protoc_insertion_point(message_implements:context.ConnectionSettings)
-    ConnectionSettings extends com.google.protobuf.GeneratedMessageV3 implements ConnectionSettingsOrBuilder {
+    public static final class ConnectionSettings extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ConnectionSettings)
+    ConnectionSettingsOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -49621,9 +49629,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ConnectionSettings}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.ConnectionSettings)
-        // @@protoc_insertion_point(builder_implements:context.ConnectionSettings)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ConnectionSettingsOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ConnectionSettings)
+        context.ContextOuterClass.ConnectionSettingsOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ConnectionSettings_descriptor;
@@ -50341,8 +50348,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.Connection)
-    ConnectionOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface ConnectionOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Connection)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.ConnectionId connection_id = 1;</code>
@@ -50449,9 +50456,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Connection}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.Connection)
-    // @@protoc_insertion_point(message_implements:context.Connection)
-    Connection extends com.google.protobuf.GeneratedMessageV3 implements ConnectionOrBuilder {
+    public static final class Connection extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Connection)
+    ConnectionOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -50862,9 +50868,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Connection}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.Connection)
-        // @@protoc_insertion_point(builder_implements:context.Connection)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ConnectionOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Connection)
+        context.ContextOuterClass.ConnectionOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Connection_descriptor;
@@ -52028,8 +52033,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.ConnectionIdList)
-    ConnectionIdListOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface ConnectionIdListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ConnectionIdList)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.ConnectionId connection_ids = 1;</code>
@@ -52060,9 +52065,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ConnectionIdList}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.ConnectionIdList)
-    // @@protoc_insertion_point(message_implements:context.ConnectionIdList)
-    ConnectionIdList extends com.google.protobuf.GeneratedMessageV3 implements ConnectionIdListOrBuilder {
+    public static final class ConnectionIdList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ConnectionIdList)
+    ConnectionIdListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -52277,9 +52281,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ConnectionIdList}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.ConnectionIdList)
-        // @@protoc_insertion_point(builder_implements:context.ConnectionIdList)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ConnectionIdListOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ConnectionIdList)
+        context.ContextOuterClass.ConnectionIdListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ConnectionIdList_descriptor;
@@ -52746,8 +52749,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.ConnectionList)
-    ConnectionListOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface ConnectionListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ConnectionList)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.Connection connections = 1;</code>
@@ -52778,9 +52781,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ConnectionList}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.ConnectionList)
-    // @@protoc_insertion_point(message_implements:context.ConnectionList)
-    ConnectionList extends com.google.protobuf.GeneratedMessageV3 implements ConnectionListOrBuilder {
+    public static final class ConnectionList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ConnectionList)
+    ConnectionListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -52995,9 +52997,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ConnectionList}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.ConnectionList)
-        // @@protoc_insertion_point(builder_implements:context.ConnectionList)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ConnectionListOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ConnectionList)
+        context.ContextOuterClass.ConnectionListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ConnectionList_descriptor;
@@ -53464,8 +53465,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.ConnectionEvent)
-    ConnectionEventOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface ConnectionEventOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ConnectionEvent)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Event event = 1;</code>
@@ -53505,9 +53506,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ConnectionEvent}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.ConnectionEvent)
-    // @@protoc_insertion_point(message_implements:context.ConnectionEvent)
-    ConnectionEvent extends com.google.protobuf.GeneratedMessageV3 implements ConnectionEventOrBuilder {
+    public static final class ConnectionEvent extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ConnectionEvent)
+    ConnectionEventOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -53756,9 +53756,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ConnectionEvent}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.ConnectionEvent)
-        // @@protoc_insertion_point(builder_implements:context.ConnectionEvent)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ConnectionEventOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ConnectionEvent)
+        context.ContextOuterClass.ConnectionEventOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ConnectionEvent_descriptor;
@@ -54204,8 +54203,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.EndPointId)
-    EndPointIdOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface EndPointIdOrBuilder extends // @@protoc_insertion_point(interface_extends:context.EndPointId)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.TopologyId topology_id = 1;</code>
@@ -54266,9 +54265,8 @@ public final class ContextOuterClass {
      *
      * Protobuf type {@code context.EndPointId}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.EndPointId)
-    // @@protoc_insertion_point(message_implements:context.EndPointId)
-    EndPointId extends com.google.protobuf.GeneratedMessageV3 implements EndPointIdOrBuilder {
+    public static final class EndPointId extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.EndPointId)
+    EndPointIdOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -54567,9 +54565,8 @@ public final class ContextOuterClass {
          *
          * Protobuf type {@code context.EndPointId}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.EndPointId)
-        // @@protoc_insertion_point(builder_implements:context.EndPointId)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.EndPointIdOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.EndPointId)
+        context.ContextOuterClass.EndPointIdOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_EndPointId_descriptor;
@@ -55151,8 +55148,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.EndPoint)
-    EndPointOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface EndPointOrBuilder extends // @@protoc_insertion_point(interface_extends:context.EndPoint)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.EndPointId endpoint_id = 1;</code>
@@ -55281,9 +55278,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.EndPoint}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.EndPoint)
-    // @@protoc_insertion_point(message_implements:context.EndPoint)
-    EndPoint extends com.google.protobuf.GeneratedMessageV3 implements EndPointOrBuilder {
+    public static final class EndPoint extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.EndPoint)
+    EndPointOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -55819,9 +55815,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.EndPoint}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.EndPoint)
-        // @@protoc_insertion_point(builder_implements:context.EndPoint)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.EndPointOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.EndPoint)
+        context.ContextOuterClass.EndPointOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_EndPoint_descriptor;
@@ -56804,8 +56799,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.EndPointName)
-    EndPointNameOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface EndPointNameOrBuilder extends // @@protoc_insertion_point(interface_extends:context.EndPointName)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.EndPointId endpoint_id = 1;</code>
@@ -56864,9 +56859,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.EndPointName}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.EndPointName)
-    // @@protoc_insertion_point(message_implements:context.EndPointName)
-    EndPointName extends com.google.protobuf.GeneratedMessageV3 implements EndPointNameOrBuilder {
+    public static final class EndPointName extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.EndPointName)
+    EndPointNameOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -57216,9 +57210,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.EndPointName}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.EndPointName)
-        // @@protoc_insertion_point(builder_implements:context.EndPointName)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.EndPointNameOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.EndPointName)
+        context.ContextOuterClass.EndPointNameOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_EndPointName_descriptor;
@@ -57801,8 +57794,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.EndPointIdList)
-    EndPointIdListOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface EndPointIdListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.EndPointIdList)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.EndPointId endpoint_ids = 1;</code>
@@ -57833,9 +57826,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.EndPointIdList}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.EndPointIdList)
-    // @@protoc_insertion_point(message_implements:context.EndPointIdList)
-    EndPointIdList extends com.google.protobuf.GeneratedMessageV3 implements EndPointIdListOrBuilder {
+    public static final class EndPointIdList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.EndPointIdList)
+    EndPointIdListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -58050,9 +58042,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.EndPointIdList}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.EndPointIdList)
-        // @@protoc_insertion_point(builder_implements:context.EndPointIdList)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.EndPointIdListOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.EndPointIdList)
+        context.ContextOuterClass.EndPointIdListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_EndPointIdList_descriptor;
@@ -58519,8 +58510,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.EndPointNameList)
-    EndPointNameListOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface EndPointNameListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.EndPointNameList)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.EndPointName endpoint_names = 1;</code>
@@ -58551,9 +58542,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.EndPointNameList}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.EndPointNameList)
-    // @@protoc_insertion_point(message_implements:context.EndPointNameList)
-    EndPointNameList extends com.google.protobuf.GeneratedMessageV3 implements EndPointNameListOrBuilder {
+    public static final class EndPointNameList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.EndPointNameList)
+    EndPointNameListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -58768,9 +58758,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.EndPointNameList}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.EndPointNameList)
-        // @@protoc_insertion_point(builder_implements:context.EndPointNameList)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.EndPointNameListOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.EndPointNameList)
+        context.ContextOuterClass.EndPointNameListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_EndPointNameList_descriptor;
@@ -59237,8 +59226,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.ConfigRule_Custom)
-    ConfigRule_CustomOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface ConfigRule_CustomOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ConfigRule_Custom)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>string resource_key = 1;</code>
@@ -59268,9 +59257,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ConfigRule_Custom}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.ConfigRule_Custom)
-    // @@protoc_insertion_point(message_implements:context.ConfigRule_Custom)
-    ConfigRule_Custom extends com.google.protobuf.GeneratedMessageV3 implements ConfigRule_CustomOrBuilder {
+    public static final class ConfigRule_Custom extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ConfigRule_Custom)
+    ConfigRule_CustomOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -59525,9 +59513,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ConfigRule_Custom}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.ConfigRule_Custom)
-        // @@protoc_insertion_point(builder_implements:context.ConfigRule_Custom)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ConfigRule_CustomOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ConfigRule_Custom)
+        context.ContextOuterClass.ConfigRule_CustomOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ConfigRule_Custom_descriptor;
@@ -59883,8 +59870,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.ConfigRule_ACL)
-    ConfigRule_ACLOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface ConfigRule_ACLOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ConfigRule_ACL)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.EndPointId endpoint_id = 1;</code>
@@ -59904,19 +59891,31 @@ public final class ContextOuterClass {
         context.ContextOuterClass.EndPointIdOrBuilder getEndpointIdOrBuilder();
 
         /**
-         * <code>.acl.AclRuleSet rule_set = 2;</code>
+         * <code>.context.AclDirectionEnum direction = 2;</code>
+         * @return The enum numeric value on the wire for direction.
+         */
+        int getDirectionValue();
+
+        /**
+         * <code>.context.AclDirectionEnum direction = 2;</code>
+         * @return The direction.
+         */
+        context.ContextOuterClass.AclDirectionEnum getDirection();
+
+        /**
+         * <code>.acl.AclRuleSet rule_set = 3;</code>
          * @return Whether the ruleSet field is set.
          */
         boolean hasRuleSet();
 
         /**
-         * <code>.acl.AclRuleSet rule_set = 2;</code>
+         * <code>.acl.AclRuleSet rule_set = 3;</code>
          * @return The ruleSet.
          */
         acl.Acl.AclRuleSet getRuleSet();
 
         /**
-         * <code>.acl.AclRuleSet rule_set = 2;</code>
+         * <code>.acl.AclRuleSet rule_set = 3;</code>
          */
         acl.Acl.AclRuleSetOrBuilder getRuleSetOrBuilder();
     }
@@ -59924,9 +59923,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ConfigRule_ACL}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.ConfigRule_ACL)
-    // @@protoc_insertion_point(message_implements:context.ConfigRule_ACL)
-    ConfigRule_ACL extends com.google.protobuf.GeneratedMessageV3 implements ConfigRule_ACLOrBuilder {
+    public static final class ConfigRule_ACL extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ConfigRule_ACL)
+    ConfigRule_ACLOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -59936,6 +59934,7 @@ public final class ContextOuterClass {
         }
 
         private ConfigRule_ACL() {
+            direction_ = 0;
         }
 
         @java.lang.Override
@@ -59983,12 +59982,35 @@ public final class ContextOuterClass {
             return endpointId_ == null ? context.ContextOuterClass.EndPointId.getDefaultInstance() : endpointId_;
         }
 
-        public static final int RULE_SET_FIELD_NUMBER = 2;
+        public static final int DIRECTION_FIELD_NUMBER = 2;
+
+        private int direction_ = 0;
+
+        /**
+         * <code>.context.AclDirectionEnum direction = 2;</code>
+         * @return The enum numeric value on the wire for direction.
+         */
+        @java.lang.Override
+        public int getDirectionValue() {
+            return direction_;
+        }
+
+        /**
+         * <code>.context.AclDirectionEnum direction = 2;</code>
+         * @return The direction.
+         */
+        @java.lang.Override
+        public context.ContextOuterClass.AclDirectionEnum getDirection() {
+            context.ContextOuterClass.AclDirectionEnum result = context.ContextOuterClass.AclDirectionEnum.forNumber(direction_);
+            return result == null ? context.ContextOuterClass.AclDirectionEnum.UNRECOGNIZED : result;
+        }
+
+        public static final int RULE_SET_FIELD_NUMBER = 3;
 
         private acl.Acl.AclRuleSet ruleSet_;
 
         /**
-         * <code>.acl.AclRuleSet rule_set = 2;</code>
+         * <code>.acl.AclRuleSet rule_set = 3;</code>
          * @return Whether the ruleSet field is set.
          */
         @java.lang.Override
@@ -59997,7 +60019,7 @@ public final class ContextOuterClass {
         }
 
         /**
-         * <code>.acl.AclRuleSet rule_set = 2;</code>
+         * <code>.acl.AclRuleSet rule_set = 3;</code>
          * @return The ruleSet.
          */
         @java.lang.Override
@@ -60006,7 +60028,7 @@ public final class ContextOuterClass {
         }
 
         /**
-         * <code>.acl.AclRuleSet rule_set = 2;</code>
+         * <code>.acl.AclRuleSet rule_set = 3;</code>
          */
         @java.lang.Override
         public acl.Acl.AclRuleSetOrBuilder getRuleSetOrBuilder() {
@@ -60031,8 +60053,11 @@ public final class ContextOuterClass {
             if (endpointId_ != null) {
                 output.writeMessage(1, getEndpointId());
             }
+            if (direction_ != context.ContextOuterClass.AclDirectionEnum.ACLDIRECTION_BOTH.getNumber()) {
+                output.writeEnum(2, direction_);
+            }
             if (ruleSet_ != null) {
-                output.writeMessage(2, getRuleSet());
+                output.writeMessage(3, getRuleSet());
             }
             getUnknownFields().writeTo(output);
         }
@@ -60046,8 +60071,11 @@ public final class ContextOuterClass {
             if (endpointId_ != null) {
                 size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getEndpointId());
             }
+            if (direction_ != context.ContextOuterClass.AclDirectionEnum.ACLDIRECTION_BOTH.getNumber()) {
+                size += com.google.protobuf.CodedOutputStream.computeEnumSize(2, direction_);
+            }
             if (ruleSet_ != null) {
-                size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getRuleSet());
+                size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getRuleSet());
             }
             size += getUnknownFields().getSerializedSize();
             memoizedSize = size;
@@ -60069,6 +60097,8 @@ public final class ContextOuterClass {
                 if (!getEndpointId().equals(other.getEndpointId()))
                     return false;
             }
+            if (direction_ != other.direction_)
+                return false;
             if (hasRuleSet() != other.hasRuleSet())
                 return false;
             if (hasRuleSet()) {
@@ -60091,6 +60121,8 @@ public final class ContextOuterClass {
                 hash = (37 * hash) + ENDPOINT_ID_FIELD_NUMBER;
                 hash = (53 * hash) + getEndpointId().hashCode();
             }
+            hash = (37 * hash) + DIRECTION_FIELD_NUMBER;
+            hash = (53 * hash) + direction_;
             if (hasRuleSet()) {
                 hash = (37 * hash) + RULE_SET_FIELD_NUMBER;
                 hash = (53 * hash) + getRuleSet().hashCode();
@@ -60175,9 +60207,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ConfigRule_ACL}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.ConfigRule_ACL)
-        // @@protoc_insertion_point(builder_implements:context.ConfigRule_ACL)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ConfigRule_ACLOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ConfigRule_ACL)
+        context.ContextOuterClass.ConfigRule_ACLOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ConfigRule_ACL_descriptor;
@@ -60205,6 +60236,7 @@ public final class ContextOuterClass {
                     endpointIdBuilder_.dispose();
                     endpointIdBuilder_ = null;
                 }
+                direction_ = 0;
                 ruleSet_ = null;
                 if (ruleSetBuilder_ != null) {
                     ruleSetBuilder_.dispose();
@@ -60248,6 +60280,9 @@ public final class ContextOuterClass {
                     result.endpointId_ = endpointIdBuilder_ == null ? endpointId_ : endpointIdBuilder_.build();
                 }
                 if (((from_bitField0_ & 0x00000002) != 0)) {
+                    result.direction_ = direction_;
+                }
+                if (((from_bitField0_ & 0x00000004) != 0)) {
                     result.ruleSet_ = ruleSetBuilder_ == null ? ruleSet_ : ruleSetBuilder_.build();
                 }
             }
@@ -60268,6 +60303,9 @@ public final class ContextOuterClass {
                 if (other.hasEndpointId()) {
                     mergeEndpointId(other.getEndpointId());
                 }
+                if (other.direction_ != 0) {
+                    setDirectionValue(other.getDirectionValue());
+                }
                 if (other.hasRuleSet()) {
                     mergeRuleSet(other.getRuleSet());
                 }
@@ -60301,13 +60339,20 @@ public final class ContextOuterClass {
                                     break;
                                 }
                             // case 10
-                            case 18:
+                            case 16:
                                 {
-                                    input.readMessage(getRuleSetFieldBuilder().getBuilder(), extensionRegistry);
+                                    direction_ = input.readEnum();
                                     bitField0_ |= 0x00000002;
                                     break;
                                 }
-                            // case 18
+                            // case 16
+                            case 26:
+                                {
+                                    input.readMessage(getRuleSetFieldBuilder().getBuilder(), extensionRegistry);
+                                    bitField0_ |= 0x00000004;
+                                    break;
+                                }
+                            // case 26
                             default:
                                 {
                                     if (!super.parseUnknownField(input, extensionRegistry, tag)) {
@@ -60449,20 +60494,79 @@ public final class ContextOuterClass {
                 return endpointIdBuilder_;
             }
 
+            private int direction_ = 0;
+
+            /**
+             * <code>.context.AclDirectionEnum direction = 2;</code>
+             * @return The enum numeric value on the wire for direction.
+             */
+            @java.lang.Override
+            public int getDirectionValue() {
+                return direction_;
+            }
+
+            /**
+             * <code>.context.AclDirectionEnum direction = 2;</code>
+             * @param value The enum numeric value on the wire for direction to set.
+             * @return This builder for chaining.
+             */
+            public Builder setDirectionValue(int value) {
+                direction_ = value;
+                bitField0_ |= 0x00000002;
+                onChanged();
+                return this;
+            }
+
+            /**
+             * <code>.context.AclDirectionEnum direction = 2;</code>
+             * @return The direction.
+             */
+            @java.lang.Override
+            public context.ContextOuterClass.AclDirectionEnum getDirection() {
+                context.ContextOuterClass.AclDirectionEnum result = context.ContextOuterClass.AclDirectionEnum.forNumber(direction_);
+                return result == null ? context.ContextOuterClass.AclDirectionEnum.UNRECOGNIZED : result;
+            }
+
+            /**
+             * <code>.context.AclDirectionEnum direction = 2;</code>
+             * @param value The direction to set.
+             * @return This builder for chaining.
+             */
+            public Builder setDirection(context.ContextOuterClass.AclDirectionEnum value) {
+                if (value == null) {
+                    throw new NullPointerException();
+                }
+                bitField0_ |= 0x00000002;
+                direction_ = value.getNumber();
+                onChanged();
+                return this;
+            }
+
+            /**
+             * <code>.context.AclDirectionEnum direction = 2;</code>
+             * @return This builder for chaining.
+             */
+            public Builder clearDirection() {
+                bitField0_ = (bitField0_ & ~0x00000002);
+                direction_ = 0;
+                onChanged();
+                return this;
+            }
+
             private acl.Acl.AclRuleSet ruleSet_;
 
             private com.google.protobuf.SingleFieldBuilderV3<acl.Acl.AclRuleSet, acl.Acl.AclRuleSet.Builder, acl.Acl.AclRuleSetOrBuilder> ruleSetBuilder_;
 
             /**
-             * <code>.acl.AclRuleSet rule_set = 2;</code>
+             * <code>.acl.AclRuleSet rule_set = 3;</code>
              * @return Whether the ruleSet field is set.
              */
             public boolean hasRuleSet() {
-                return ((bitField0_ & 0x00000002) != 0);
+                return ((bitField0_ & 0x00000004) != 0);
             }
 
             /**
-             * <code>.acl.AclRuleSet rule_set = 2;</code>
+             * <code>.acl.AclRuleSet rule_set = 3;</code>
              * @return The ruleSet.
              */
             public acl.Acl.AclRuleSet getRuleSet() {
@@ -60474,7 +60578,7 @@ public final class ContextOuterClass {
             }
 
             /**
-             * <code>.acl.AclRuleSet rule_set = 2;</code>
+             * <code>.acl.AclRuleSet rule_set = 3;</code>
              */
             public Builder setRuleSet(acl.Acl.AclRuleSet value) {
                 if (ruleSetBuilder_ == null) {
@@ -60485,13 +60589,13 @@ public final class ContextOuterClass {
                 } else {
                     ruleSetBuilder_.setMessage(value);
                 }
-                bitField0_ |= 0x00000002;
+                bitField0_ |= 0x00000004;
                 onChanged();
                 return this;
             }
 
             /**
-             * <code>.acl.AclRuleSet rule_set = 2;</code>
+             * <code>.acl.AclRuleSet rule_set = 3;</code>
              */
             public Builder setRuleSet(acl.Acl.AclRuleSet.Builder builderForValue) {
                 if (ruleSetBuilder_ == null) {
@@ -60499,17 +60603,17 @@ public final class ContextOuterClass {
                 } else {
                     ruleSetBuilder_.setMessage(builderForValue.build());
                 }
-                bitField0_ |= 0x00000002;
+                bitField0_ |= 0x00000004;
                 onChanged();
                 return this;
             }
 
             /**
-             * <code>.acl.AclRuleSet rule_set = 2;</code>
+             * <code>.acl.AclRuleSet rule_set = 3;</code>
              */
             public Builder mergeRuleSet(acl.Acl.AclRuleSet value) {
                 if (ruleSetBuilder_ == null) {
-                    if (((bitField0_ & 0x00000002) != 0) && ruleSet_ != null && ruleSet_ != acl.Acl.AclRuleSet.getDefaultInstance()) {
+                    if (((bitField0_ & 0x00000004) != 0) && ruleSet_ != null && ruleSet_ != acl.Acl.AclRuleSet.getDefaultInstance()) {
                         getRuleSetBuilder().mergeFrom(value);
                     } else {
                         ruleSet_ = value;
@@ -60517,16 +60621,16 @@ public final class ContextOuterClass {
                 } else {
                     ruleSetBuilder_.mergeFrom(value);
                 }
-                bitField0_ |= 0x00000002;
+                bitField0_ |= 0x00000004;
                 onChanged();
                 return this;
             }
 
             /**
-             * <code>.acl.AclRuleSet rule_set = 2;</code>
+             * <code>.acl.AclRuleSet rule_set = 3;</code>
              */
             public Builder clearRuleSet() {
-                bitField0_ = (bitField0_ & ~0x00000002);
+                bitField0_ = (bitField0_ & ~0x00000004);
                 ruleSet_ = null;
                 if (ruleSetBuilder_ != null) {
                     ruleSetBuilder_.dispose();
@@ -60537,16 +60641,16 @@ public final class ContextOuterClass {
             }
 
             /**
-             * <code>.acl.AclRuleSet rule_set = 2;</code>
+             * <code>.acl.AclRuleSet rule_set = 3;</code>
              */
             public acl.Acl.AclRuleSet.Builder getRuleSetBuilder() {
-                bitField0_ |= 0x00000002;
+                bitField0_ |= 0x00000004;
                 onChanged();
                 return getRuleSetFieldBuilder().getBuilder();
             }
 
             /**
-             * <code>.acl.AclRuleSet rule_set = 2;</code>
+             * <code>.acl.AclRuleSet rule_set = 3;</code>
              */
             public acl.Acl.AclRuleSetOrBuilder getRuleSetOrBuilder() {
                 if (ruleSetBuilder_ != null) {
@@ -60557,7 +60661,7 @@ public final class ContextOuterClass {
             }
 
             /**
-             * <code>.acl.AclRuleSet rule_set = 2;</code>
+             * <code>.acl.AclRuleSet rule_set = 3;</code>
              */
             private com.google.protobuf.SingleFieldBuilderV3<acl.Acl.AclRuleSet, acl.Acl.AclRuleSet.Builder, acl.Acl.AclRuleSetOrBuilder> getRuleSetFieldBuilder() {
                 if (ruleSetBuilder_ == null) {
@@ -62317,9 +62421,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ConfigRule_IP_LINK}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.ConfigRule_IP_LINK)
-    // @@protoc_insertion_point(message_implements:context.ConfigRule_IP_LINK)
-    ConfigRule_IP_LINK extends com.google.protobuf.GeneratedMessageV3 implements ConfigRule_IP_LINKOrBuilder {
+    public static final class ConfigRule_IP_LINK extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ConfigRule_IP_LINK)
+    ConfigRule_IP_LINKOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -62568,9 +62671,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ConfigRule_IP_LINK}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.ConfigRule_IP_LINK)
-        // @@protoc_insertion_point(builder_implements:context.ConfigRule_IP_LINK)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ConfigRule_IP_LINKOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ConfigRule_IP_LINK)
+        context.ContextOuterClass.ConfigRule_IP_LINKOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ConfigRule_IP_LINK_descriptor;
@@ -63016,8 +63118,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.ConfigRule)
-    ConfigRuleOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface ConfigRuleOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ConfigRule)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.ConfigActionEnum action = 1;</code>
@@ -63122,9 +63224,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ConfigRule}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.ConfigRule)
-    // @@protoc_insertion_point(message_implements:context.ConfigRule)
-    ConfigRule extends com.google.protobuf.GeneratedMessageV3 implements ConfigRuleOrBuilder {
+    public static final class ConfigRule extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ConfigRule)
+    ConfigRuleOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -63623,9 +63724,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ConfigRule}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.ConfigRule)
-        // @@protoc_insertion_point(builder_implements:context.ConfigRule)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ConfigRuleOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ConfigRule)
+        context.ContextOuterClass.ConfigRuleOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ConfigRule_descriptor;
@@ -64696,8 +64796,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.Constraint_Custom)
-    Constraint_CustomOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface Constraint_CustomOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Constraint_Custom)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>string constraint_type = 1;</code>
@@ -64727,9 +64827,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Constraint_Custom}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.Constraint_Custom)
-    // @@protoc_insertion_point(message_implements:context.Constraint_Custom)
-    Constraint_Custom extends com.google.protobuf.GeneratedMessageV3 implements Constraint_CustomOrBuilder {
+    public static final class Constraint_Custom extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Constraint_Custom)
+    Constraint_CustomOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -64984,9 +65083,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Constraint_Custom}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.Constraint_Custom)
-        // @@protoc_insertion_point(builder_implements:context.Constraint_Custom)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.Constraint_CustomOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Constraint_Custom)
+        context.ContextOuterClass.Constraint_CustomOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Constraint_Custom_descriptor;
@@ -65342,8 +65440,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.Constraint_Schedule)
-    Constraint_ScheduleOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface Constraint_ScheduleOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Constraint_Schedule)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>double start_timestamp = 1;</code>
@@ -65361,9 +65459,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Constraint_Schedule}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.Constraint_Schedule)
-    // @@protoc_insertion_point(message_implements:context.Constraint_Schedule)
-    Constraint_Schedule extends com.google.protobuf.GeneratedMessageV3 implements Constraint_ScheduleOrBuilder {
+    public static final class Constraint_Schedule extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Constraint_Schedule)
+    Constraint_ScheduleOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -65566,9 +65663,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Constraint_Schedule}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.Constraint_Schedule)
-        // @@protoc_insertion_point(builder_implements:context.Constraint_Schedule)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.Constraint_ScheduleOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Constraint_Schedule)
+        context.ContextOuterClass.Constraint_ScheduleOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Constraint_Schedule_descriptor;
@@ -65838,8 +65934,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.GPS_Position)
-    GPS_PositionOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface GPS_PositionOrBuilder extends // @@protoc_insertion_point(interface_extends:context.GPS_Position)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>float latitude = 1;</code>
@@ -65857,9 +65953,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.GPS_Position}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.GPS_Position)
-    // @@protoc_insertion_point(message_implements:context.GPS_Position)
-    GPS_Position extends com.google.protobuf.GeneratedMessageV3 implements GPS_PositionOrBuilder {
+    public static final class GPS_Position extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.GPS_Position)
+    GPS_PositionOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -66062,9 +66157,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.GPS_Position}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.GPS_Position)
-        // @@protoc_insertion_point(builder_implements:context.GPS_Position)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.GPS_PositionOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.GPS_Position)
+        context.ContextOuterClass.GPS_PositionOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_GPS_Position_descriptor;
@@ -66334,8 +66428,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.Location)
-    LocationOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface LocationOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Location)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>string region = 1;</code>
@@ -66414,9 +66508,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Location}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.Location)
-    // @@protoc_insertion_point(message_implements:context.Location)
-    Location extends com.google.protobuf.GeneratedMessageV3 implements LocationOrBuilder {
+    public static final class Location extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Location)
+    LocationOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -66877,9 +66970,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Location}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.Location)
-        // @@protoc_insertion_point(builder_implements:context.Location)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.LocationOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Location)
+        context.ContextOuterClass.LocationOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Location_descriptor;
@@ -67574,8 +67666,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.Constraint_EndPointLocation)
-    Constraint_EndPointLocationOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface Constraint_EndPointLocationOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Constraint_EndPointLocation)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.EndPointId endpoint_id = 1;</code>
@@ -67615,9 +67707,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Constraint_EndPointLocation}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.Constraint_EndPointLocation)
-    // @@protoc_insertion_point(message_implements:context.Constraint_EndPointLocation)
-    Constraint_EndPointLocation extends com.google.protobuf.GeneratedMessageV3 implements Constraint_EndPointLocationOrBuilder {
+    public static final class Constraint_EndPointLocation extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Constraint_EndPointLocation)
+    Constraint_EndPointLocationOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -67866,9 +67957,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Constraint_EndPointLocation}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.Constraint_EndPointLocation)
-        // @@protoc_insertion_point(builder_implements:context.Constraint_EndPointLocation)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.Constraint_EndPointLocationOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Constraint_EndPointLocation)
+        context.ContextOuterClass.Constraint_EndPointLocationOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Constraint_EndPointLocation_descriptor;
@@ -68314,8 +68404,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.Constraint_EndPointPriority)
-    Constraint_EndPointPriorityOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface Constraint_EndPointPriorityOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Constraint_EndPointPriority)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.EndPointId endpoint_id = 1;</code>
@@ -68344,9 +68434,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Constraint_EndPointPriority}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.Constraint_EndPointPriority)
-    // @@protoc_insertion_point(message_implements:context.Constraint_EndPointPriority)
-    Constraint_EndPointPriority extends com.google.protobuf.GeneratedMessageV3 implements Constraint_EndPointPriorityOrBuilder {
+    public static final class Constraint_EndPointPriority extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Constraint_EndPointPriority)
+    Constraint_EndPointPriorityOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -68572,9 +68661,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Constraint_EndPointPriority}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.Constraint_EndPointPriority)
-        // @@protoc_insertion_point(builder_implements:context.Constraint_EndPointPriority)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.Constraint_EndPointPriorityOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Constraint_EndPointPriority)
+        context.ContextOuterClass.Constraint_EndPointPriorityOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Constraint_EndPointPriority_descriptor;
@@ -68932,8 +69020,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.Constraint_SLA_Latency)
-    Constraint_SLA_LatencyOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface Constraint_SLA_LatencyOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Constraint_SLA_Latency)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>float e2e_latency_ms = 1;</code>
@@ -68945,9 +69033,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Constraint_SLA_Latency}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.Constraint_SLA_Latency)
-    // @@protoc_insertion_point(message_implements:context.Constraint_SLA_Latency)
-    Constraint_SLA_Latency extends com.google.protobuf.GeneratedMessageV3 implements Constraint_SLA_LatencyOrBuilder {
+    public static final class Constraint_SLA_Latency extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Constraint_SLA_Latency)
+    Constraint_SLA_LatencyOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -69127,9 +69214,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Constraint_SLA_Latency}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.Constraint_SLA_Latency)
-        // @@protoc_insertion_point(builder_implements:context.Constraint_SLA_Latency)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.Constraint_SLA_LatencyOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Constraint_SLA_Latency)
+        context.ContextOuterClass.Constraint_SLA_LatencyOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Constraint_SLA_Latency_descriptor;
@@ -69351,8 +69437,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.Constraint_SLA_Capacity)
-    Constraint_SLA_CapacityOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface Constraint_SLA_CapacityOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Constraint_SLA_Capacity)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>float capacity_gbps = 1;</code>
@@ -69364,9 +69450,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Constraint_SLA_Capacity}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.Constraint_SLA_Capacity)
-    // @@protoc_insertion_point(message_implements:context.Constraint_SLA_Capacity)
-    Constraint_SLA_Capacity extends com.google.protobuf.GeneratedMessageV3 implements Constraint_SLA_CapacityOrBuilder {
+    public static final class Constraint_SLA_Capacity extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Constraint_SLA_Capacity)
+    Constraint_SLA_CapacityOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -69546,9 +69631,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Constraint_SLA_Capacity}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.Constraint_SLA_Capacity)
-        // @@protoc_insertion_point(builder_implements:context.Constraint_SLA_Capacity)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.Constraint_SLA_CapacityOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Constraint_SLA_Capacity)
+        context.ContextOuterClass.Constraint_SLA_CapacityOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Constraint_SLA_Capacity_descriptor;
@@ -69770,8 +69854,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.Constraint_SLA_Availability)
-    Constraint_SLA_AvailabilityOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface Constraint_SLA_AvailabilityOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Constraint_SLA_Availability)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>uint32 num_disjoint_paths = 1;</code>
@@ -69799,9 +69883,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Constraint_SLA_Availability}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.Constraint_SLA_Availability)
-    // @@protoc_insertion_point(message_implements:context.Constraint_SLA_Availability)
-    Constraint_SLA_Availability extends com.google.protobuf.GeneratedMessageV3 implements Constraint_SLA_AvailabilityOrBuilder {
+    public static final class Constraint_SLA_Availability extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Constraint_SLA_Availability)
+    Constraint_SLA_AvailabilityOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -70031,9 +70114,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Constraint_SLA_Availability}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.Constraint_SLA_Availability)
-        // @@protoc_insertion_point(builder_implements:context.Constraint_SLA_Availability)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.Constraint_SLA_AvailabilityOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Constraint_SLA_Availability)
+        context.ContextOuterClass.Constraint_SLA_AvailabilityOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Constraint_SLA_Availability_descriptor;
@@ -70363,8 +70445,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.Constraint_SLA_Isolation_level)
-    Constraint_SLA_Isolation_levelOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface Constraint_SLA_Isolation_levelOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Constraint_SLA_Isolation_level)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.IsolationLevelEnum isolation_level = 1;</code>
@@ -70402,9 +70484,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Constraint_SLA_Isolation_level}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.Constraint_SLA_Isolation_level)
-    // @@protoc_insertion_point(message_implements:context.Constraint_SLA_Isolation_level)
-    Constraint_SLA_Isolation_level extends com.google.protobuf.GeneratedMessageV3 implements Constraint_SLA_Isolation_levelOrBuilder {
+    public static final class Constraint_SLA_Isolation_level extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Constraint_SLA_Isolation_level)
+    Constraint_SLA_Isolation_levelOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -70650,9 +70731,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Constraint_SLA_Isolation_level}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.Constraint_SLA_Isolation_level)
-        // @@protoc_insertion_point(builder_implements:context.Constraint_SLA_Isolation_level)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.Constraint_SLA_Isolation_levelOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Constraint_SLA_Isolation_level)
+        context.ContextOuterClass.Constraint_SLA_Isolation_levelOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Constraint_SLA_Isolation_level_descriptor;
@@ -71014,8 +71094,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.Constraint_Exclusions)
-    Constraint_ExclusionsOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface Constraint_ExclusionsOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Constraint_Exclusions)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>bool is_permanent = 1;</code>
@@ -71102,9 +71182,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Constraint_Exclusions}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.Constraint_Exclusions)
-    // @@protoc_insertion_point(message_implements:context.Constraint_Exclusions)
-    Constraint_Exclusions extends com.google.protobuf.GeneratedMessageV3 implements Constraint_ExclusionsOrBuilder {
+    public static final class Constraint_Exclusions extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Constraint_Exclusions)
+    Constraint_ExclusionsOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -71458,9 +71537,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Constraint_Exclusions}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.Constraint_Exclusions)
-        // @@protoc_insertion_point(builder_implements:context.Constraint_Exclusions)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.Constraint_ExclusionsOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Constraint_Exclusions)
+        context.ContextOuterClass.Constraint_ExclusionsOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Constraint_Exclusions_descriptor;
@@ -72553,8 +72631,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.QoSProfileId)
-    QoSProfileIdOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface QoSProfileIdOrBuilder extends // @@protoc_insertion_point(interface_extends:context.QoSProfileId)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Uuid qos_profile_id = 1;</code>
@@ -72577,9 +72655,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.QoSProfileId}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.QoSProfileId)
-    // @@protoc_insertion_point(message_implements:context.QoSProfileId)
-    QoSProfileId extends com.google.protobuf.GeneratedMessageV3 implements QoSProfileIdOrBuilder {
+    public static final class QoSProfileId extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.QoSProfileId)
+    QoSProfileIdOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -72782,9 +72859,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.QoSProfileId}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.QoSProfileId)
-        // @@protoc_insertion_point(builder_implements:context.QoSProfileId)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.QoSProfileIdOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.QoSProfileId)
+        context.ContextOuterClass.QoSProfileIdOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_QoSProfileId_descriptor;
@@ -73094,8 +73170,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.Constraint_QoSProfile)
-    Constraint_QoSProfileOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface Constraint_QoSProfileOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Constraint_QoSProfile)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.QoSProfileId qos_profile_id = 1;</code>
@@ -73130,9 +73206,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Constraint_QoSProfile}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.Constraint_QoSProfile)
-    // @@protoc_insertion_point(message_implements:context.Constraint_QoSProfile)
-    Constraint_QoSProfile extends com.google.protobuf.GeneratedMessageV3 implements Constraint_QoSProfileOrBuilder {
+    public static final class Constraint_QoSProfile extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Constraint_QoSProfile)
+    Constraint_QoSProfileOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -73384,9 +73459,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Constraint_QoSProfile}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.Constraint_QoSProfile)
-        // @@protoc_insertion_point(builder_implements:context.Constraint_QoSProfile)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.Constraint_QoSProfileOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Constraint_QoSProfile)
+        context.ContextOuterClass.Constraint_QoSProfileOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Constraint_QoSProfile_descriptor;
@@ -73787,8 +73861,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.Constraint)
-    ConstraintOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface ConstraintOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Constraint)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.ConstraintActionEnum action = 1;</code>
@@ -73978,9 +74052,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.Constraint}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.Constraint)
-    // @@protoc_insertion_point(message_implements:context.Constraint)
-    Constraint extends com.google.protobuf.GeneratedMessageV3 implements ConstraintOrBuilder {
+    public static final class Constraint extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.Constraint)
+    ConstraintOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -74734,9 +74807,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.Constraint}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.Constraint)
-        // @@protoc_insertion_point(builder_implements:context.Constraint)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ConstraintOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.Constraint)
+        context.ContextOuterClass.ConstraintOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_Constraint_descriptor;
@@ -76602,8 +76674,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.TeraFlowController)
-    TeraFlowControllerOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface TeraFlowControllerOrBuilder extends // @@protoc_insertion_point(interface_extends:context.TeraFlowController)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.ContextId context_id = 1;</code>
@@ -76648,9 +76720,8 @@ public final class ContextOuterClass {
      *
      * Protobuf type {@code context.TeraFlowController}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.TeraFlowController)
-    // @@protoc_insertion_point(message_implements:context.TeraFlowController)
-    TeraFlowController extends com.google.protobuf.GeneratedMessageV3 implements TeraFlowControllerOrBuilder {
+    public static final class TeraFlowController extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.TeraFlowController)
+    TeraFlowControllerOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -76929,9 +77000,8 @@ public final class ContextOuterClass {
          *
          * Protobuf type {@code context.TeraFlowController}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.TeraFlowController)
-        // @@protoc_insertion_point(builder_implements:context.TeraFlowController)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.TeraFlowControllerOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.TeraFlowController)
+        context.ContextOuterClass.TeraFlowControllerOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_TeraFlowController_descriptor;
@@ -77380,8 +77450,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.AuthenticationResult)
-    AuthenticationResultOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface AuthenticationResultOrBuilder extends // @@protoc_insertion_point(interface_extends:context.AuthenticationResult)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.ContextId context_id = 1;</code>
@@ -77410,9 +77480,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.AuthenticationResult}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.AuthenticationResult)
-    // @@protoc_insertion_point(message_implements:context.AuthenticationResult)
-    AuthenticationResult extends com.google.protobuf.GeneratedMessageV3 implements AuthenticationResultOrBuilder {
+    public static final class AuthenticationResult extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.AuthenticationResult)
+    AuthenticationResultOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -77638,9 +77707,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.AuthenticationResult}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.AuthenticationResult)
-        // @@protoc_insertion_point(builder_implements:context.AuthenticationResult)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.AuthenticationResultOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.AuthenticationResult)
+        context.ContextOuterClass.AuthenticationResultOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_AuthenticationResult_descriptor;
@@ -77998,8 +78066,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.OpticalConfigId)
-    OpticalConfigIdOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface OpticalConfigIdOrBuilder extends // @@protoc_insertion_point(interface_extends:context.OpticalConfigId)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>string opticalconfig_uuid = 1;</code>
@@ -78021,9 +78089,8 @@ public final class ContextOuterClass {
      *
      * Protobuf type {@code context.OpticalConfigId}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.OpticalConfigId)
-    // @@protoc_insertion_point(message_implements:context.OpticalConfigId)
-    OpticalConfigId extends com.google.protobuf.GeneratedMessageV3 implements OpticalConfigIdOrBuilder {
+    public static final class OpticalConfigId extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.OpticalConfigId)
+    OpticalConfigIdOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -78233,9 +78300,8 @@ public final class ContextOuterClass {
          *
          * Protobuf type {@code context.OpticalConfigId}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.OpticalConfigId)
-        // @@protoc_insertion_point(builder_implements:context.OpticalConfigId)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.OpticalConfigIdOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.OpticalConfigId)
+        context.ContextOuterClass.OpticalConfigIdOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_OpticalConfigId_descriptor;
@@ -78500,8 +78566,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.OpticalConfig)
-    OpticalConfigOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface OpticalConfigOrBuilder extends // @@protoc_insertion_point(interface_extends:context.OpticalConfig)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.OpticalConfigId opticalconfig_id = 1;</code>
@@ -78553,9 +78619,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.OpticalConfig}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.OpticalConfig)
-    // @@protoc_insertion_point(message_implements:context.OpticalConfig)
-    OpticalConfig extends com.google.protobuf.GeneratedMessageV3 implements OpticalConfigOrBuilder {
+    public static final class OpticalConfig extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.OpticalConfig)
+    OpticalConfigOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -78853,9 +78918,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.OpticalConfig}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.OpticalConfig)
-        // @@protoc_insertion_point(builder_implements:context.OpticalConfig)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.OpticalConfigOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.OpticalConfig)
+        context.ContextOuterClass.OpticalConfigOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_OpticalConfig_descriptor;
@@ -79392,8 +79456,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.OpticalConfigList)
-    OpticalConfigListOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface OpticalConfigListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.OpticalConfigList)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.OpticalConfig opticalconfigs = 1;</code>
@@ -79424,9 +79488,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.OpticalConfigList}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.OpticalConfigList)
-    // @@protoc_insertion_point(message_implements:context.OpticalConfigList)
-    OpticalConfigList extends com.google.protobuf.GeneratedMessageV3 implements OpticalConfigListOrBuilder {
+    public static final class OpticalConfigList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.OpticalConfigList)
+    OpticalConfigListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -79641,9 +79704,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.OpticalConfigList}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.OpticalConfigList)
-        // @@protoc_insertion_point(builder_implements:context.OpticalConfigList)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.OpticalConfigListOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.OpticalConfigList)
+        context.ContextOuterClass.OpticalConfigListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_OpticalConfigList_descriptor;
@@ -80110,8 +80172,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.OpticalConfigEvent)
-    OpticalConfigEventOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface OpticalConfigEventOrBuilder extends // @@protoc_insertion_point(interface_extends:context.OpticalConfigEvent)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Event event = 1;</code>
@@ -80151,9 +80213,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.OpticalConfigEvent}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.OpticalConfigEvent)
-    // @@protoc_insertion_point(message_implements:context.OpticalConfigEvent)
-    OpticalConfigEvent extends com.google.protobuf.GeneratedMessageV3 implements OpticalConfigEventOrBuilder {
+    public static final class OpticalConfigEvent extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.OpticalConfigEvent)
+    OpticalConfigEventOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -80402,9 +80463,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.OpticalConfigEvent}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.OpticalConfigEvent)
-        // @@protoc_insertion_point(builder_implements:context.OpticalConfigEvent)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.OpticalConfigEventOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.OpticalConfigEvent)
+        context.ContextOuterClass.OpticalConfigEventOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_OpticalConfigEvent_descriptor;
@@ -80850,8 +80910,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.OpticalEndPointId)
-    OpticalEndPointIdOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface OpticalEndPointIdOrBuilder extends // @@protoc_insertion_point(interface_extends:context.OpticalEndPointId)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.DeviceId device_id = 2;</code>
@@ -80891,9 +80951,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.OpticalEndPointId}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.OpticalEndPointId)
-    // @@protoc_insertion_point(message_implements:context.OpticalEndPointId)
-    OpticalEndPointId extends com.google.protobuf.GeneratedMessageV3 implements OpticalEndPointIdOrBuilder {
+    public static final class OpticalEndPointId extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.OpticalEndPointId)
+    OpticalEndPointIdOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -81142,9 +81201,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.OpticalEndPointId}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.OpticalEndPointId)
-        // @@protoc_insertion_point(builder_implements:context.OpticalEndPointId)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.OpticalEndPointIdOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.OpticalEndPointId)
+        context.ContextOuterClass.OpticalEndPointIdOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_OpticalEndPointId_descriptor;
@@ -81590,8 +81648,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.OpticalLinkList)
-    OpticalLinkListOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface OpticalLinkListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.OpticalLinkList)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.OpticalLink optical_links = 1;</code>
@@ -81622,9 +81680,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.OpticalLinkList}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.OpticalLinkList)
-    // @@protoc_insertion_point(message_implements:context.OpticalLinkList)
-    OpticalLinkList extends com.google.protobuf.GeneratedMessageV3 implements OpticalLinkListOrBuilder {
+    public static final class OpticalLinkList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.OpticalLinkList)
+    OpticalLinkListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -81839,9 +81896,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.OpticalLinkList}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.OpticalLinkList)
-        // @@protoc_insertion_point(builder_implements:context.OpticalLinkList)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.OpticalLinkListOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.OpticalLinkList)
+        context.ContextOuterClass.OpticalLinkListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_OpticalLinkList_descriptor;
@@ -82308,8 +82364,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.OpticalLinkDetails)
-    OpticalLinkDetailsOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface OpticalLinkDetailsOrBuilder extends // @@protoc_insertion_point(interface_extends:context.OpticalLinkDetails)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>float length = 1;</code>
@@ -82468,9 +82524,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.OpticalLinkDetails}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.OpticalLinkDetails)
-    // @@protoc_insertion_point(message_implements:context.OpticalLinkDetails)
-    OpticalLinkDetails extends com.google.protobuf.GeneratedMessageV3 implements OpticalLinkDetailsOrBuilder {
+    public static final class OpticalLinkDetails extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.OpticalLinkDetails)
+    OpticalLinkDetailsOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -83145,9 +83200,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.OpticalLinkDetails}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.OpticalLinkDetails)
-        // @@protoc_insertion_point(builder_implements:context.OpticalLinkDetails)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.OpticalLinkDetailsOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.OpticalLinkDetails)
+        context.ContextOuterClass.OpticalLinkDetailsOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_OpticalLinkDetails_descriptor;
@@ -84235,8 +84289,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.OpticalLink)
-    OpticalLinkOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface OpticalLinkOrBuilder extends // @@protoc_insertion_point(interface_extends:context.OpticalLink)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>string name = 1;</code>
@@ -84313,9 +84367,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.OpticalLink}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.OpticalLink)
-    // @@protoc_insertion_point(message_implements:context.OpticalLink)
-    OpticalLink extends com.google.protobuf.GeneratedMessageV3 implements OpticalLinkOrBuilder {
+    public static final class OpticalLink extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.OpticalLink)
+    OpticalLinkOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -84671,9 +84724,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.OpticalLink}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.OpticalLink)
-        // @@protoc_insertion_point(builder_implements:context.OpticalLink)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.OpticalLinkOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.OpticalLink)
+        context.ContextOuterClass.OpticalLinkOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_OpticalLink_descriptor;
@@ -85503,8 +85555,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.ChannelId)
-    ChannelIdOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface ChannelIdOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ChannelId)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Uuid channel_uuid = 1;</code>
@@ -85527,9 +85579,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ChannelId}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.ChannelId)
-    // @@protoc_insertion_point(message_implements:context.ChannelId)
-    ChannelId extends com.google.protobuf.GeneratedMessageV3 implements ChannelIdOrBuilder {
+    public static final class ChannelId extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ChannelId)
+    ChannelIdOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -85732,9 +85783,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ChannelId}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.ChannelId)
-        // @@protoc_insertion_point(builder_implements:context.ChannelId)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ChannelIdOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ChannelId)
+        context.ContextOuterClass.ChannelIdOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ChannelId_descriptor;
@@ -86044,8 +86094,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.OpticalBandId)
-    OpticalBandIdOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface OpticalBandIdOrBuilder extends // @@protoc_insertion_point(interface_extends:context.OpticalBandId)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Uuid opticalband_uuid = 1;</code>
@@ -86068,9 +86118,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.OpticalBandId}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.OpticalBandId)
-    // @@protoc_insertion_point(message_implements:context.OpticalBandId)
-    OpticalBandId extends com.google.protobuf.GeneratedMessageV3 implements OpticalBandIdOrBuilder {
+    public static final class OpticalBandId extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.OpticalBandId)
+    OpticalBandIdOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -86273,9 +86322,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.OpticalBandId}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.OpticalBandId)
-        // @@protoc_insertion_point(builder_implements:context.OpticalBandId)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.OpticalBandIdOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.OpticalBandId)
+        context.ContextOuterClass.OpticalBandIdOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_OpticalBandId_descriptor;
@@ -86585,8 +86633,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.OpticalBand)
-    OpticalBandOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface OpticalBandOrBuilder extends // @@protoc_insertion_point(interface_extends:context.OpticalBand)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.OpticalBandId opticalband_id = 1;</code>
@@ -86714,9 +86762,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.OpticalBand}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.OpticalBand)
-    // @@protoc_insertion_point(message_implements:context.OpticalBand)
-    OpticalBand extends com.google.protobuf.GeneratedMessageV3 implements OpticalBandOrBuilder {
+    public static final class OpticalBand extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.OpticalBand)
+    OpticalBandOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -87277,9 +87324,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.OpticalBand}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.OpticalBand)
-        // @@protoc_insertion_point(builder_implements:context.OpticalBand)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.OpticalBandOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.OpticalBand)
+        context.ContextOuterClass.OpticalBandOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_OpticalBand_descriptor;
@@ -88455,8 +88501,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.OpticalBandList)
-    OpticalBandListOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface OpticalBandListOrBuilder extends // @@protoc_insertion_point(interface_extends:context.OpticalBandList)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .context.OpticalBand opticalbands = 1;</code>
@@ -88487,9 +88533,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.OpticalBandList}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.OpticalBandList)
-    // @@protoc_insertion_point(message_implements:context.OpticalBandList)
-    OpticalBandList extends com.google.protobuf.GeneratedMessageV3 implements OpticalBandListOrBuilder {
+    public static final class OpticalBandList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.OpticalBandList)
+    OpticalBandListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -88704,9 +88749,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.OpticalBandList}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.OpticalBandList)
-        // @@protoc_insertion_point(builder_implements:context.OpticalBandList)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.OpticalBandListOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.OpticalBandList)
+        context.ContextOuterClass.OpticalBandListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_OpticalBandList_descriptor;
@@ -89173,8 +89217,8 @@ public final class ContextOuterClass {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:context.ServiceConfigRule)
-    ServiceConfigRuleOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface ServiceConfigRuleOrBuilder extends // @@protoc_insertion_point(interface_extends:context.ServiceConfigRule)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.ServiceId service_id = 1;</code>
@@ -89214,9 +89258,8 @@ public final class ContextOuterClass {
     /**
      * Protobuf type {@code context.ServiceConfigRule}
      */
-    public static final class // @@protoc_insertion_point(message_implements:context.ServiceConfigRule)
-    // @@protoc_insertion_point(message_implements:context.ServiceConfigRule)
-    ServiceConfigRule extends com.google.protobuf.GeneratedMessageV3 implements ServiceConfigRuleOrBuilder {
+    public static final class ServiceConfigRule extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:context.ServiceConfigRule)
+    ServiceConfigRuleOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -89465,9 +89508,8 @@ public final class ContextOuterClass {
         /**
          * Protobuf type {@code context.ServiceConfigRule}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:context.ServiceConfigRule)
-        // @@protoc_insertion_point(builder_implements:context.ServiceConfigRule)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements context.ContextOuterClass.ServiceConfigRuleOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:context.ServiceConfigRule)
+        context.ContextOuterClass.ServiceConfigRuleOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return context.ContextOuterClass.internal_static_context_ServiceConfigRule_descriptor;
@@ -90328,7 +90370,7 @@ public final class ContextOuterClass {
     private static com.google.protobuf.Descriptors.FileDescriptor descriptor;
 
     static {
-        java.lang.String[] descriptorData = { "\n\rcontext.proto\022\007context\032\031google/protobu" + "f/any.proto\032\tacl.proto\032\014ipowdm.proto\032\rip" + "_link.proto\032\026kpi_sample_types.proto\032\016tap" + "i_lsp.proto\"\007\n\005Empty\"\024\n\004Uuid\022\014\n\004uuid\030\001 \001" + "(\t\"\036\n\tTimestamp\022\021\n\ttimestamp\030\001 \001(\001\"Z\n\005Ev" + "ent\022%\n\ttimestamp\030\001 \001(\0132\022.context.Timesta" + "mp\022*\n\nevent_type\030\002 \001(\0162\026.context.EventTy" + "peEnum\"\265\002\n\010AnyEvent\022(\n\007context\030\001 \001(\0132\025.c" + "ontext.ContextEventH\000\022*\n\010topology\030\002 \001(\0132" + "\026.context.TopologyEventH\000\022&\n\006device\030\003 \001(" + "\0132\024.context.DeviceEventH\000\022\"\n\004link\030\004 \001(\0132" + "\022.context.LinkEventH\000\022(\n\007service\030\005 \001(\0132\025" + ".context.ServiceEventH\000\022$\n\005slice\030\006 \001(\0132\023" + ".context.SliceEventH\000\022.\n\nconnection\030\007 \001(" + "\0132\030.context.ConnectionEventH\000B\007\n\005event\"0" + "\n\tContextId\022#\n\014context_uuid\030\001 \001(\0132\r.cont" + "ext.Uuid\"\351\001\n\007Context\022&\n\ncontext_id\030\001 \001(\013" + "2\022.context.ContextId\022\014\n\004name\030\002 \001(\t\022)\n\014to" + "pology_ids\030\003 \003(\0132\023.context.TopologyId\022\'\n" + "\013service_ids\030\004 \003(\0132\022.context.ServiceId\022#" + "\n\tslice_ids\030\005 \003(\0132\020.context.SliceId\022/\n\nc" + "ontroller\030\006 \001(\0132\033.context.TeraFlowContro" + "ller\"8\n\rContextIdList\022\'\n\013context_ids\030\001 \003" + "(\0132\022.context.ContextId\"1\n\013ContextList\022\"\n" + "\010contexts\030\001 \003(\0132\020.context.Context\"U\n\014Con" + "textEvent\022\035\n\005event\030\001 \001(\0132\016.context.Event" + "\022&\n\ncontext_id\030\002 \001(\0132\022.context.ContextId" + "\"Z\n\nTopologyId\022&\n\ncontext_id\030\001 \001(\0132\022.con" + "text.ContextId\022$\n\rtopology_uuid\030\002 \001(\0132\r." + "context.Uuid\"\267\001\n\010Topology\022(\n\013topology_id" + "\030\001 \001(\0132\023.context.TopologyId\022\014\n\004name\030\002 \001(" + "\t\022%\n\ndevice_ids\030\003 \003(\0132\021.context.DeviceId" + "\022!\n\010link_ids\030\004 \003(\0132\017.context.LinkId\022)\n\020o" + "ptical_link_ids\030\005 \003(\0132\017.context.LinkId\"\266" + "\001\n\017TopologyDetails\022(\n\013topology_id\030\001 \001(\0132" + "\023.context.TopologyId\022\014\n\004name\030\002 \001(\t\022 \n\007de" + "vices\030\003 \003(\0132\017.context.Device\022\034\n\005links\030\004 " + "\003(\0132\r.context.Link\022+\n\roptical_links\030\005 \003(" + "\0132\024.context.OpticalLink\";\n\016TopologyIdLis" + "t\022)\n\014topology_ids\030\001 \003(\0132\023.context.Topolo" + "gyId\"5\n\014TopologyList\022%\n\ntopologies\030\001 \003(\013" + "2\021.context.Topology\"X\n\rTopologyEvent\022\035\n\005" + "event\030\001 \001(\0132\016.context.Event\022(\n\013topology_" + "id\030\002 \001(\0132\023.context.TopologyId\".\n\010DeviceI" + "d\022\"\n\013device_uuid\030\001 \001(\0132\r.context.Uuid\"\372\002" + "\n\006Device\022$\n\tdevice_id\030\001 \001(\0132\021.context.De" + "viceId\022\014\n\004name\030\002 \001(\t\022\023\n\013device_type\030\003 \001(" + "\t\022,\n\rdevice_config\030\004 \001(\0132\025.context.Devic" + "eConfig\022G\n\031device_operational_status\030\005 \001" + "(\0162$.context.DeviceOperationalStatusEnum" + "\0221\n\016device_drivers\030\006 \003(\0162\031.context.Devic" + "eDriverEnum\022+\n\020device_endpoints\030\007 \003(\0132\021." + "context.EndPoint\022&\n\ncomponents\030\010 \003(\0132\022.c" + "ontext.Component\022(\n\rcontroller_id\030\t \001(\0132" + "\021.context.DeviceId\"\311\001\n\tComponent\022%\n\016comp" + "onent_uuid\030\001 \001(\0132\r.context.Uuid\022\014\n\004name\030" + "\002 \001(\t\022\014\n\004type\030\003 \001(\t\0226\n\nattributes\030\004 \003(\0132" + "\".context.Component.AttributesEntry\022\016\n\006p" + "arent\030\005 \001(\t\0321\n\017AttributesEntry\022\013\n\003key\030\001 " + "\001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"9\n\014DeviceConfig\022)" + "\n\014config_rules\030\001 \003(\0132\023.context.ConfigRul" + "e\"5\n\014DeviceIdList\022%\n\ndevice_ids\030\001 \003(\0132\021." + "context.DeviceId\".\n\nDeviceList\022 \n\007device" + "s\030\001 \003(\0132\017.context.Device\"\216\001\n\014DeviceFilte" + "r\022)\n\ndevice_ids\030\001 \001(\0132\025.context.DeviceId" + "List\022\031\n\021include_endpoints\030\002 \001(\010\022\034\n\024inclu" + "de_config_rules\030\003 \001(\010\022\032\n\022include_compone" + "nts\030\004 \001(\010\"\200\001\n\013DeviceEvent\022\035\n\005event\030\001 \001(\013" + "2\016.context.Event\022$\n\tdevice_id\030\002 \001(\0132\021.co" + "ntext.DeviceId\022,\n\rdevice_config\030\003 \001(\0132\025." + "context.DeviceConfig\"*\n\006LinkId\022 \n\tlink_u" + "uid\030\001 \001(\0132\r.context.Uuid\"c\n\016LinkAttribut" + "es\022\030\n\020is_bidirectional\030\001 \001(\010\022\033\n\023total_ca" + "pacity_gbps\030\002 \001(\002\022\032\n\022used_capacity_gbps\030" + "\003 \001(\002\"\275\001\n\004Link\022 \n\007link_id\030\001 \001(\0132\017.contex" + "t.LinkId\022\014\n\004name\030\002 \001(\t\022(\n\tlink_type\030\003 \001(" + "\0162\025.context.LinkTypeEnum\022.\n\021link_endpoin" + "t_ids\030\004 \003(\0132\023.context.EndPointId\022+\n\nattr" + "ibutes\030\005 \001(\0132\027.context.LinkAttributes\"/\n" + "\nLinkIdList\022!\n\010link_ids\030\001 \003(\0132\017.context." + "LinkId\"(\n\010LinkList\022\034\n\005links\030\001 \003(\0132\r.cont" + "ext.Link\"L\n\tLinkEvent\022\035\n\005event\030\001 \001(\0132\016.c" + "ontext.Event\022 \n\007link_id\030\002 \001(\0132\017.context." + "LinkId\"X\n\tServiceId\022&\n\ncontext_id\030\001 \001(\0132" + "\022.context.ContextId\022#\n\014service_uuid\030\002 \001(" + "\0132\r.context.Uuid\"\333\002\n\007Service\022&\n\nservice_" + "id\030\001 \001(\0132\022.context.ServiceId\022\014\n\004name\030\002 \001" + "(\t\022.\n\014service_type\030\003 \001(\0162\030.context.Servi" + "ceTypeEnum\0221\n\024service_endpoint_ids\030\004 \003(\013" + "2\023.context.EndPointId\0220\n\023service_constra" + "ints\030\005 \003(\0132\023.context.Constraint\022.\n\016servi" + "ce_status\030\006 \001(\0132\026.context.ServiceStatus\022" + ".\n\016service_config\030\007 \001(\0132\026.context.Servic" + "eConfig\022%\n\ttimestamp\030\010 \001(\0132\022.context.Tim" + "estamp\"C\n\rServiceStatus\0222\n\016service_statu" + "s\030\001 \001(\0162\032.context.ServiceStatusEnum\":\n\rS" + "erviceConfig\022)\n\014config_rules\030\001 \003(\0132\023.con" + "text.ConfigRule\"8\n\rServiceIdList\022\'\n\013serv" + "ice_ids\030\001 \003(\0132\022.context.ServiceId\"1\n\013Ser" + "viceList\022\"\n\010services\030\001 \003(\0132\020.context.Ser" + "vice\"\225\001\n\rServiceFilter\022+\n\013service_ids\030\001 " + "\001(\0132\026.context.ServiceIdList\022\034\n\024include_e" + "ndpoint_ids\030\002 \001(\010\022\033\n\023include_constraints" + "\030\003 \001(\010\022\034\n\024include_config_rules\030\004 \001(\010\"U\n\014" + "ServiceEvent\022\035\n\005event\030\001 \001(\0132\016.context.Ev" + "ent\022&\n\nservice_id\030\002 \001(\0132\022.context.Servic" + "eId\"T\n\007SliceId\022&\n\ncontext_id\030\001 \001(\0132\022.con" + "text.ContextId\022!\n\nslice_uuid\030\002 \001(\0132\r.con" + "text.Uuid\"\240\003\n\005Slice\022\"\n\010slice_id\030\001 \001(\0132\020." + "context.SliceId\022\014\n\004name\030\002 \001(\t\022/\n\022slice_e" + "ndpoint_ids\030\003 \003(\0132\023.context.EndPointId\022." + "\n\021slice_constraints\030\004 \003(\0132\023.context.Cons" + "traint\022-\n\021slice_service_ids\030\005 \003(\0132\022.cont" + "ext.ServiceId\022,\n\022slice_subslice_ids\030\006 \003(" + "\0132\020.context.SliceId\022*\n\014slice_status\030\007 \001(" + "\0132\024.context.SliceStatus\022*\n\014slice_config\030" + "\010 \001(\0132\024.context.SliceConfig\022(\n\013slice_own" + "er\030\t \001(\0132\023.context.SliceOwner\022%\n\ttimesta" + "mp\030\n \001(\0132\022.context.Timestamp\"E\n\nSliceOwn" + "er\022!\n\nowner_uuid\030\001 \001(\0132\r.context.Uuid\022\024\n" + "\014owner_string\030\002 \001(\t\"=\n\013SliceStatus\022.\n\014sl" + "ice_status\030\001 \001(\0162\030.context.SliceStatusEn" + "um\"8\n\013SliceConfig\022)\n\014config_rules\030\001 \003(\0132" + "\023.context.ConfigRule\"2\n\013SliceIdList\022#\n\ts" + "lice_ids\030\001 \003(\0132\020.context.SliceId\"+\n\tSlic" + "eList\022\036\n\006slices\030\001 \003(\0132\016.context.Slice\"\312\001" + "\n\013SliceFilter\022\'\n\tslice_ids\030\001 \001(\0132\024.conte" + "xt.SliceIdList\022\034\n\024include_endpoint_ids\030\002" + " \001(\010\022\033\n\023include_constraints\030\003 \001(\010\022\033\n\023inc" + "lude_service_ids\030\004 \001(\010\022\034\n\024include_subsli" + "ce_ids\030\005 \001(\010\022\034\n\024include_config_rules\030\006 \001" + "(\010\"O\n\nSliceEvent\022\035\n\005event\030\001 \001(\0132\016.contex" + "t.Event\022\"\n\010slice_id\030\002 \001(\0132\020.context.Slic" + "eId\"6\n\014ConnectionId\022&\n\017connection_uuid\030\001" + " \001(\0132\r.context.Uuid\"2\n\025ConnectionSetting" + "s_L0\022\031\n\021lsp_symbolic_name\030\001 \001(\t\"\236\001\n\025Conn" + "ectionSettings_L2\022\027\n\017src_mac_address\030\001 \001" + "(\t\022\027\n\017dst_mac_address\030\002 \001(\t\022\022\n\nether_typ" + "e\030\003 \001(\r\022\017\n\007vlan_id\030\004 \001(\r\022\022\n\nmpls_label\030\005" + " \001(\r\022\032\n\022mpls_traffic_class\030\006 \001(\r\"t\n\025Conn" + "ectionSettings_L3\022\026\n\016src_ip_address\030\001 \001(" + "\t\022\026\n\016dst_ip_address\030\002 \001(\t\022\014\n\004dscp\030\003 \001(\r\022" + "\020\n\010protocol\030\004 \001(\r\022\013\n\003ttl\030\005 \001(\r\"[\n\025Connec" + "tionSettings_L4\022\020\n\010src_port\030\001 \001(\r\022\020\n\010dst" + "_port\030\002 \001(\r\022\021\n\ttcp_flags\030\003 \001(\r\022\013\n\003ttl\030\004 " + "\001(\r\"\304\001\n\022ConnectionSettings\022*\n\002l0\030\001 \001(\0132\036" + ".context.ConnectionSettings_L0\022*\n\002l2\030\002 \001" + "(\0132\036.context.ConnectionSettings_L2\022*\n\002l3" + "\030\003 \001(\0132\036.context.ConnectionSettings_L3\022*" + "\n\002l4\030\004 \001(\0132\036.context.ConnectionSettings_" + "L4\"\363\001\n\nConnection\022,\n\rconnection_id\030\001 \001(\013" + "2\025.context.ConnectionId\022&\n\nservice_id\030\002 " + "\001(\0132\022.context.ServiceId\0223\n\026path_hops_end" + "point_ids\030\003 \003(\0132\023.context.EndPointId\022+\n\017" + "sub_service_ids\030\004 \003(\0132\022.context.ServiceI" + "d\022-\n\010settings\030\005 \001(\0132\033.context.Connection" + "Settings\"A\n\020ConnectionIdList\022-\n\016connecti" + "on_ids\030\001 \003(\0132\025.context.ConnectionId\":\n\016C" + "onnectionList\022(\n\013connections\030\001 \003(\0132\023.con" + "text.Connection\"^\n\017ConnectionEvent\022\035\n\005ev" + "ent\030\001 \001(\0132\016.context.Event\022,\n\rconnection_" + "id\030\002 \001(\0132\025.context.ConnectionId\"\202\001\n\nEndP" + "ointId\022(\n\013topology_id\030\001 \001(\0132\023.context.To" + "pologyId\022$\n\tdevice_id\030\002 \001(\0132\021.context.De" + "viceId\022$\n\rendpoint_uuid\030\003 \001(\0132\r.context." + "Uuid\"\310\002\n\010EndPoint\022(\n\013endpoint_id\030\001 \001(\0132\023" + ".context.EndPointId\022\014\n\004name\030\002 \001(\t\022\025\n\rend" + "point_type\030\003 \001(\t\0229\n\020kpi_sample_types\030\004 \003" + "(\0162\037.kpi_sample_types.KpiSampleType\022,\n\021e" + "ndpoint_location\030\005 \001(\0132\021.context.Locatio" + "n\0229\n\014capabilities\030\006 \003(\0132#.context.EndPoi" + "nt.CapabilitiesEntry\032I\n\021CapabilitiesEntr" + "y\022\013\n\003key\030\001 \001(\t\022#\n\005value\030\002 \001(\0132\024.google.p" + "rotobuf.Any:\0028\001\"{\n\014EndPointName\022(\n\013endpo" + "int_id\030\001 \001(\0132\023.context.EndPointId\022\023\n\013dev" + "ice_name\030\002 \001(\t\022\025\n\rendpoint_name\030\003 \001(\t\022\025\n" + "\rendpoint_type\030\004 \001(\t\";\n\016EndPointIdList\022)" + "\n\014endpoint_ids\030\001 \003(\0132\023.context.EndPointI" + "d\"A\n\020EndPointNameList\022-\n\016endpoint_names\030" + "\001 \003(\0132\025.context.EndPointName\"A\n\021ConfigRu" + "le_Custom\022\024\n\014resource_key\030\001 \001(\t\022\026\n\016resou" + "rce_value\030\002 \001(\t\"]\n\016ConfigRule_ACL\022(\n\013end" + "point_id\030\001 \001(\0132\023.context.EndPointId\022!\n\010r" + "ule_set\030\002 \001(\0132\017.acl.AclRuleSet\"f\n\021Config" + "Rule_IPOWDM\022(\n\013endpoint_id\030\001 \001(\0132\023.conte" + "xt.EndPointId\022\'\n\010rule_set\030\002 \001(\0132\025.ipowdm" + ".IpowdmRuleSet\"k\n\023ConfigRule_TAPI_LSP\022(\n" + "\013endpoint_id\030\001 \001(\0132\023.context.EndPointId\022" + "*\n\010rule_set\030\002 \003(\0132\030.tapi_lsp.TapiLspRule" + "Set\"h\n\022ConfigRule_IP_LINK\022(\n\013endpoint_id" + "\030\001 \001(\0132\023.context.EndPointId\022(\n\010rule_set\030" + "\002 \001(\0132\026.ip_link.IpLinkRuleSet\"\254\002\n\nConfig" + "Rule\022)\n\006action\030\001 \001(\0162\031.context.ConfigAct" + "ionEnum\022,\n\006custom\030\002 \001(\0132\032.context.Config" + "Rule_CustomH\000\022&\n\003acl\030\003 \001(\0132\027.context.Con" + "figRule_ACLH\000\022.\n\007ip_link\030\004 \001(\0132\033.context" + ".ConfigRule_IP_LINKH\000\0220\n\010tapi_lsp\030\005 \001(\0132" + "\034.context.ConfigRule_TAPI_LSPH\000\022,\n\006ipowd" + "m\030\006 \001(\0132\032.context.ConfigRule_IPOWDMH\000B\r\n" + "\013config_rule\"F\n\021Constraint_Custom\022\027\n\017con" + "straint_type\030\001 \001(\t\022\030\n\020constraint_value\030\002" + " \001(\t\"E\n\023Constraint_Schedule\022\027\n\017start_tim" + "estamp\030\001 \001(\001\022\025\n\rduration_days\030\002 \001(\002\"3\n\014G" + "PS_Position\022\020\n\010latitude\030\001 \001(\002\022\021\n\tlongitu" + "de\030\002 \001(\002\"\204\001\n\010Location\022\020\n\006region\030\001 \001(\tH\000\022" + "-\n\014gps_position\030\002 \001(\0132\025.context.GPS_Posi" + "tionH\000\022\023\n\tinterface\030\003 \001(\tH\000\022\026\n\014circuit_p" + "ack\030\004 \001(\tH\000B\n\n\010location\"l\n\033Constraint_En" + "dPointLocation\022(\n\013endpoint_id\030\001 \001(\0132\023.co" + "ntext.EndPointId\022#\n\010location\030\002 \001(\0132\021.con" + "text.Location\"Y\n\033Constraint_EndPointPrio" + "rity\022(\n\013endpoint_id\030\001 \001(\0132\023.context.EndP" + "ointId\022\020\n\010priority\030\002 \001(\r\"0\n\026Constraint_S" + "LA_Latency\022\026\n\016e2e_latency_ms\030\001 \001(\002\"0\n\027Co" + "nstraint_SLA_Capacity\022\025\n\rcapacity_gbps\030\001" + " \001(\002\"c\n\033Constraint_SLA_Availability\022\032\n\022n" + "um_disjoint_paths\030\001 \001(\r\022\022\n\nall_active\030\002 " + "\001(\010\022\024\n\014availability\030\003 \001(\002\"V\n\036Constraint_" + "SLA_Isolation_level\0224\n\017isolation_level\030\001" + " \003(\0162\033.context.IsolationLevelEnum\"\242\001\n\025Co" + "nstraint_Exclusions\022\024\n\014is_permanent\030\001 \001(" + "\010\022%\n\ndevice_ids\030\002 \003(\0132\021.context.DeviceId" + "\022)\n\014endpoint_ids\030\003 \003(\0132\023.context.EndPoin" + "tId\022!\n\010link_ids\030\004 \003(\0132\017.context.LinkId\"5" + "\n\014QoSProfileId\022%\n\016qos_profile_id\030\001 \001(\0132\r" + ".context.Uuid\"`\n\025Constraint_QoSProfile\022-" + "\n\016qos_profile_id\030\001 \001(\0132\025.context.QoSProf" + "ileId\022\030\n\020qos_profile_name\030\002 \001(\t\"\222\005\n\nCons" + "traint\022-\n\006action\030\001 \001(\0162\035.context.Constra" + "intActionEnum\022,\n\006custom\030\002 \001(\0132\032.context." + "Constraint_CustomH\000\0220\n\010schedule\030\003 \001(\0132\034." + "context.Constraint_ScheduleH\000\022A\n\021endpoin" + "t_location\030\004 \001(\0132$.context.Constraint_En" + "dPointLocationH\000\022A\n\021endpoint_priority\030\005 " + "\001(\0132$.context.Constraint_EndPointPriorit" + "yH\000\0228\n\014sla_capacity\030\006 \001(\0132 .context.Cons" + "traint_SLA_CapacityH\000\0226\n\013sla_latency\030\007 \001" + "(\0132\037.context.Constraint_SLA_LatencyH\000\022@\n" + "\020sla_availability\030\010 \001(\0132$.context.Constr" + "aint_SLA_AvailabilityH\000\022@\n\rsla_isolation" + "\030\t \001(\0132\'.context.Constraint_SLA_Isolatio" + "n_levelH\000\0224\n\nexclusions\030\n \001(\0132\036.context." + "Constraint_ExclusionsH\000\0225\n\013qos_profile\030\013" + " \001(\0132\036.context.Constraint_QoSProfileH\000B\014" + "\n\nconstraint\"^\n\022TeraFlowController\022&\n\nco" + "ntext_id\030\001 \001(\0132\022.context.ContextId\022\022\n\nip" + "_address\030\002 \001(\t\022\014\n\004port\030\003 \001(\r\"U\n\024Authenti" + "cationResult\022&\n\ncontext_id\030\001 \001(\0132\022.conte" + "xt.ContextId\022\025\n\rauthenticated\030\002 \001(\010\"-\n\017O" + "pticalConfigId\022\032\n\022opticalconfig_uuid\030\001 \001" + "(\t\"y\n\rOpticalConfig\0222\n\020opticalconfig_id\030" + "\001 \001(\0132\030.context.OpticalConfigId\022\016\n\006confi" + "g\030\002 \001(\t\022$\n\tdevice_id\030\003 \001(\0132\021.context.Dev" + "iceId\"C\n\021OpticalConfigList\022.\n\016opticalcon" + "figs\030\001 \003(\0132\026.context.OpticalConfig\"g\n\022Op" + "ticalConfigEvent\022\035\n\005event\030\001 \001(\0132\016.contex" + "t.Event\0222\n\020opticalconfig_id\030\002 \001(\0132\030.cont" + "ext.OpticalConfigId\"_\n\021OpticalEndPointId" + "\022$\n\tdevice_id\030\002 \001(\0132\021.context.DeviceId\022$" + "\n\rendpoint_uuid\030\003 \001(\0132\r.context.Uuid\">\n\017" + "OpticalLinkList\022+\n\roptical_links\030\001 \003(\0132\024" + ".context.OpticalLink\"\304\003\n\022OpticalLinkDeta" + "ils\022\016\n\006length\030\001 \001(\002\022\020\n\010src_port\030\002 \001(\t\022\020\n" + "\010dst_port\030\003 \001(\t\022\027\n\017local_peer_port\030\004 \001(\t" + "\022\030\n\020remote_peer_port\030\005 \001(\t\022\014\n\004used\030\006 \001(\010" + "\0228\n\007c_slots\030\007 \003(\0132\'.context.OpticalLinkD" + "etails.CSlotsEntry\0228\n\007l_slots\030\010 \003(\0132\'.co" + "ntext.OpticalLinkDetails.LSlotsEntry\0228\n\007" + "s_slots\030\t \003(\0132\'.context.OpticalLinkDetai" + "ls.SSlotsEntry\032-\n\013CSlotsEntry\022\013\n\003key\030\001 \001" + "(\t\022\r\n\005value\030\002 \001(\005:\0028\001\032-\n\013LSlotsEntry\022\013\n\003" + "key\030\001 \001(\t\022\r\n\005value\030\002 \001(\005:\0028\001\032-\n\013SSlotsEn" + "try\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\005:\0028\001\"\243\001\n\013" + "OpticalLink\022\014\n\004name\030\001 \001(\t\0224\n\017optical_det" + "ails\030\002 \001(\0132\033.context.OpticalLinkDetails\022" + " \n\007link_id\030\003 \001(\0132\017.context.LinkId\022.\n\021lin" + "k_endpoint_ids\030\004 \003(\0132\023.context.EndPointI" + "d\"0\n\tChannelId\022#\n\014channel_uuid\030\001 \001(\0132\r.c" + "ontext.Uuid\"8\n\rOpticalBandId\022\'\n\020opticalb" + "and_uuid\030\001 \001(\0132\r.context.Uuid\"\247\002\n\013Optica" + "lBand\022.\n\016opticalband_id\030\001 \001(\0132\026.context." + "OpticalBandId\022,\n\rconnection_id\030\002 \001(\0132\025.c" + "ontext.ConnectionId\022&\n\nchannel_id\030\003 \001(\0132" + "\022.context.ChannelId\022&\n\nservice_id\030\004 \001(\0132" + "\022.context.ServiceId\022#\n\007service\030\005 \001(\0132\020.c" + "ontext.ServiceH\000\022)\n\nconnection\030\006 \001(\0132\023.c" + "ontext.ConnectionH\000\022\021\n\007channel\030\007 \001(\tH\000B\007" + "\n\005field\"=\n\017OpticalBandList\022*\n\014opticalban" + "ds\030\001 \003(\0132\024.context.OpticalBand\"r\n\021Servic" + "eConfigRule\022&\n\nservice_id\030\001 \001(\0132\022.contex" + "t.ServiceId\0225\n\021configrule_custom\030\002 \001(\0132\032" + ".context.ConfigRule_Custom*j\n\rEventTypeE" + "num\022\027\n\023EVENTTYPE_UNDEFINED\020\000\022\024\n\020EVENTTYP" + "E_CREATE\020\001\022\024\n\020EVENTTYPE_UPDATE\020\002\022\024\n\020EVEN" + "TTYPE_REMOVE\020\003*\333\004\n\020DeviceDriverEnum\022\032\n\026D" + "EVICEDRIVER_UNDEFINED\020\000\022\033\n\027DEVICEDRIVER_" + "OPENCONFIG\020\001\022\036\n\032DEVICEDRIVER_TRANSPORT_A" + "PI\020\002\022\023\n\017DEVICEDRIVER_P4\020\003\022&\n\"DEVICEDRIVE" + "R_IETF_NETWORK_TOPOLOGY\020\004\022\033\n\027DEVICEDRIVE" + "R_ONF_TR_532\020\005\022\023\n\017DEVICEDRIVER_XR\020\006\022\033\n\027D" + "EVICEDRIVER_IETF_L2VPN\020\007\022 \n\034DEVICEDRIVER" + "_GNMI_OPENCONFIG\020\010\022\034\n\030DEVICEDRIVER_OPTIC" + "AL_TFS\020\t\022\032\n\026DEVICEDRIVER_IETF_ACTN\020\n\022\023\n\017" + "DEVICEDRIVER_OC\020\013\022\024\n\020DEVICEDRIVER_QKD\020\014\022" + "\033\n\027DEVICEDRIVER_IETF_L3VPN\020\r\022\033\n\027DEVICEDR" + "IVER_IETF_SLICE\020\016\022\024\n\020DEVICEDRIVER_NCE\020\017\022" + "\031\n\025DEVICEDRIVER_SMARTNIC\020\020\022\031\n\025DEVICEDRIV" + "ER_MORPHEUS\020\021\022\024\n\020DEVICEDRIVER_RYU\020\022\022#\n\037D" + "EVICEDRIVER_GNMI_NOKIA_SRLINUX\020\023\022\032\n\026DEVI" + "CEDRIVER_OPENROADM\020\024*\217\001\n\033DeviceOperation" + "alStatusEnum\022%\n!DEVICEOPERATIONALSTATUS_" + "UNDEFINED\020\000\022$\n DEVICEOPERATIONALSTATUS_D" + "ISABLED\020\001\022#\n\037DEVICEOPERATIONALSTATUS_ENA" + "BLED\020\002*\245\001\n\014LinkTypeEnum\022\024\n\020LINKTYPE_UNKN" + "OWN\020\000\022\023\n\017LINKTYPE_COPPER\020\001\022\022\n\016LINKTYPE_F" + "IBER\020\002\022\022\n\016LINKTYPE_RADIO\020\003\022\024\n\020LINKTYPE_V" + "IRTUAL\020\004\022\027\n\023LINKTYPE_MANAGEMENT\020\005\022\023\n\017LIN" + "KTYPE_REMOTE\020\006*\360\002\n\017ServiceTypeEnum\022\027\n\023SE" + "RVICETYPE_UNKNOWN\020\000\022\024\n\020SERVICETYPE_L3NM\020" + "\001\022\024\n\020SERVICETYPE_L2NM\020\002\022)\n%SERVICETYPE_T" + "API_CONNECTIVITY_SERVICE\020\003\022\022\n\016SERVICETYP" + "E_TE\020\004\022\023\n\017SERVICETYPE_E2E\020\005\022$\n SERVICETY" + "PE_OPTICAL_CONNECTIVITY\020\006\022\023\n\017SERVICETYPE" + "_QKD\020\007\022\024\n\020SERVICETYPE_L1NM\020\010\022\023\n\017SERVICET" + "YPE_INT\020\t\022\023\n\017SERVICETYPE_ACL\020\n\022\027\n\023SERVIC" + "ETYPE_IP_LINK\020\013\022\030\n\024SERVICETYPE_TAPI_LSP\020" + "\014\022\026\n\022SERVICETYPE_IPOWDM\020\r*\304\001\n\021ServiceSta" + "tusEnum\022\033\n\027SERVICESTATUS_UNDEFINED\020\000\022\031\n\025" + "SERVICESTATUS_PLANNED\020\001\022\030\n\024SERVICESTATUS" + "_ACTIVE\020\002\022\032\n\026SERVICESTATUS_UPDATING\020\003\022!\n" + "\035SERVICESTATUS_PENDING_REMOVAL\020\004\022\036\n\032SERV" + "ICESTATUS_SLA_VIOLATED\020\005*\251\001\n\017SliceStatus" + "Enum\022\031\n\025SLICESTATUS_UNDEFINED\020\000\022\027\n\023SLICE" + "STATUS_PLANNED\020\001\022\024\n\020SLICESTATUS_INIT\020\002\022\026" + "\n\022SLICESTATUS_ACTIVE\020\003\022\026\n\022SLICESTATUS_DE" + "INIT\020\004\022\034\n\030SLICESTATUS_SLA_VIOLATED\020\005*]\n\020" + "ConfigActionEnum\022\032\n\026CONFIGACTION_UNDEFIN" + "ED\020\000\022\024\n\020CONFIGACTION_SET\020\001\022\027\n\023CONFIGACTI" + "ON_DELETE\020\002*m\n\024ConstraintActionEnum\022\036\n\032C" + "ONSTRAINTACTION_UNDEFINED\020\000\022\030\n\024CONSTRAIN" + "TACTION_SET\020\001\022\033\n\027CONSTRAINTACTION_DELETE" + "\020\002*\203\002\n\022IsolationLevelEnum\022\020\n\014NO_ISOLATIO" + "N\020\000\022\026\n\022PHYSICAL_ISOLATION\020\001\022\025\n\021LOGICAL_I" + "SOLATION\020\002\022\025\n\021PROCESS_ISOLATION\020\003\022\035\n\031PHY" + "SICAL_MEMORY_ISOLATION\020\004\022\036\n\032PHYSICAL_NET" + "WORK_ISOLATION\020\005\022\036\n\032VIRTUAL_RESOURCE_ISO" + "LATION\020\006\022\037\n\033NETWORK_FUNCTIONS_ISOLATION\020" + "\007\022\025\n\021SERVICE_ISOLATION\020\0102\274\035\n\016ContextServ" + "ice\022:\n\016ListContextIds\022\016.context.Empty\032\026." + "context.ContextIdList\"\000\0226\n\014ListContexts\022" + "\016.context.Empty\032\024.context.ContextList\"\000\022" + "4\n\nGetContext\022\022.context.ContextId\032\020.cont" + "ext.Context\"\000\0224\n\nSetContext\022\020.context.Co" + "ntext\032\022.context.ContextId\"\000\0225\n\rRemoveCon" + "text\022\022.context.ContextId\032\016.context.Empty" + "\"\000\022=\n\020GetContextEvents\022\016.context.Empty\032\025" + ".context.ContextEvent\"\0000\001\022@\n\017ListTopolog" + "yIds\022\022.context.ContextId\032\027.context.Topol" + "ogyIdList\"\000\022=\n\016ListTopologies\022\022.context." + "ContextId\032\025.context.TopologyList\"\000\0227\n\013Ge" + "tTopology\022\023.context.TopologyId\032\021.context" + ".Topology\"\000\022E\n\022GetTopologyDetails\022\023.cont" + "ext.TopologyId\032\030.context.TopologyDetails" + "\"\000\0227\n\013SetTopology\022\021.context.Topology\032\023.c" + "ontext.TopologyId\"\000\0227\n\016RemoveTopology\022\023." + "context.TopologyId\032\016.context.Empty\"\000\022?\n\021" + "GetTopologyEvents\022\016.context.Empty\032\026.cont" + "ext.TopologyEvent\"\0000\001\0228\n\rListDeviceIds\022\016" + ".context.Empty\032\025.context.DeviceIdList\"\000\022" + "4\n\013ListDevices\022\016.context.Empty\032\023.context" + ".DeviceList\"\000\0221\n\tGetDevice\022\021.context.Dev" + "iceId\032\017.context.Device\"\000\0221\n\tSetDevice\022\017." + "context.Device\032\021.context.DeviceId\"\000\0223\n\014R" + "emoveDevice\022\021.context.DeviceId\032\016.context" + ".Empty\"\000\022;\n\017GetDeviceEvents\022\016.context.Em" + "pty\032\024.context.DeviceEvent\"\0000\001\022<\n\014SelectD" + "evice\022\025.context.DeviceFilter\032\023.context.D" + "eviceList\"\000\022I\n\021ListEndPointNames\022\027.conte" + "xt.EndPointIdList\032\031.context.EndPointName" + "List\"\000\0224\n\013ListLinkIds\022\016.context.Empty\032\023." + "context.LinkIdList\"\000\0220\n\tListLinks\022\016.cont" + "ext.Empty\032\021.context.LinkList\"\000\022+\n\007GetLin" + "k\022\017.context.LinkId\032\r.context.Link\"\000\022+\n\007S" + "etLink\022\r.context.Link\032\017.context.LinkId\"\000" + "\022/\n\nRemoveLink\022\017.context.LinkId\032\016.contex" + "t.Empty\"\000\0227\n\rGetLinkEvents\022\016.context.Emp" + "ty\032\022.context.LinkEvent\"\0000\001\022>\n\016ListServic" + "eIds\022\022.context.ContextId\032\026.context.Servi" + "ceIdList\"\000\022:\n\014ListServices\022\022.context.Con" + "textId\032\024.context.ServiceList\"\000\0224\n\nGetSer" + "vice\022\022.context.ServiceId\032\020.context.Servi" + "ce\"\000\0224\n\nSetService\022\020.context.Service\032\022.c" + "ontext.ServiceId\"\000\0226\n\014UnsetService\022\020.con" + "text.Service\032\022.context.ServiceId\"\000\0225\n\rRe" + "moveService\022\022.context.ServiceId\032\016.contex" + "t.Empty\"\000\022=\n\020GetServiceEvents\022\016.context." + "Empty\032\025.context.ServiceEvent\"\0000\001\022?\n\rSele" + "ctService\022\026.context.ServiceFilter\032\024.cont" + "ext.ServiceList\"\000\022:\n\014ListSliceIds\022\022.cont" + "ext.ContextId\032\024.context.SliceIdList\"\000\0226\n", "\nListSlices\022\022.context.ContextId\032\022.contex" + "t.SliceList\"\000\022.\n\010GetSlice\022\020.context.Slic" + "eId\032\016.context.Slice\"\000\022.\n\010SetSlice\022\016.cont" + "ext.Slice\032\020.context.SliceId\"\000\0220\n\nUnsetSl" + "ice\022\016.context.Slice\032\020.context.SliceId\"\000\022" + "1\n\013RemoveSlice\022\020.context.SliceId\032\016.conte" + "xt.Empty\"\000\0229\n\016GetSliceEvents\022\016.context.E" + "mpty\032\023.context.SliceEvent\"\0000\001\0229\n\013SelectS" + "lice\022\024.context.SliceFilter\032\022.context.Sli" + "ceList\"\000\022D\n\021ListConnectionIds\022\022.context." + "ServiceId\032\031.context.ConnectionIdList\"\000\022@" + "\n\017ListConnections\022\022.context.ServiceId\032\027." + "context.ConnectionList\"\000\022=\n\rGetConnectio" + "n\022\025.context.ConnectionId\032\023.context.Conne" + "ction\"\000\022=\n\rSetConnection\022\023.context.Conne" + "ction\032\025.context.ConnectionId\"\000\022;\n\020Remove" + "Connection\022\025.context.ConnectionId\032\016.cont" + "ext.Empty\"\000\022C\n\023GetConnectionEvents\022\016.con" + "text.Empty\032\030.context.ConnectionEvent\"\0000\001" + "\0225\n\014GetAllEvents\022\016.context.Empty\032\021.conte" + "xt.AnyEvent\"\0000\001\022@\n\020GetOpticalConfig\022\016.co" + "ntext.Empty\032\032.context.OpticalConfigList\"" + "\000\022F\n\020SetOpticalConfig\022\026.context.OpticalC" + "onfig\032\030.context.OpticalConfigId\"\000\022I\n\023Upd" + "ateOpticalConfig\022\026.context.OpticalConfig" + "\032\030.context.OpticalConfigId\"\000\022I\n\023SelectOp" + "ticalConfig\022\030.context.OpticalConfigId\032\026." + "context.OpticalConfig\"\000\022A\n\023DeleteOptical" + "Config\022\030.context.OpticalConfigId\032\016.conte" + "xt.Empty\"\000\022@\n\024DeleteOpticalChannel\022\026.con" + "text.OpticalConfig\032\016.context.Empty\"\000\0228\n\016" + "SetOpticalLink\022\024.context.OpticalLink\032\016.c" + "ontext.Empty\"\000\0229\n\016GetOpticalLink\022\017.conte" + "xt.LinkId\032\024.context.OpticalLink\"\000\0226\n\021Del" + "eteOpticalLink\022\017.context.LinkId\032\016.contex" + "t.Empty\"\000\022@\n\022GetOpticalLinkList\022\016.contex" + "t.Empty\032\030.context.OpticalLinkList\"\000\022<\n\016G" + "etOpticalBand\022\016.context.Empty\032\030.context." + "OpticalBandList\"\000\022C\n\021SelectOpticalBand\022\026" + ".context.OpticalBandId\032\024.context.Optical" + "Band\"\000\022G\n\027DeleteServiceConfigRule\022\032.cont" + "ext.ServiceConfigRule\032\016.context.Empty\"\000b" + "\006proto3" };
+        java.lang.String[] descriptorData = { "\n\rcontext.proto\022\007context\032\031google/protobu" + "f/any.proto\032\tacl.proto\032\014ipowdm.proto\032\rip" + "_link.proto\032\026kpi_sample_types.proto\032\016tap" + "i_lsp.proto\"\007\n\005Empty\"\024\n\004Uuid\022\014\n\004uuid\030\001 \001" + "(\t\"\036\n\tTimestamp\022\021\n\ttimestamp\030\001 \001(\001\"Z\n\005Ev" + "ent\022%\n\ttimestamp\030\001 \001(\0132\022.context.Timesta" + "mp\022*\n\nevent_type\030\002 \001(\0162\026.context.EventTy" + "peEnum\"\265\002\n\010AnyEvent\022(\n\007context\030\001 \001(\0132\025.c" + "ontext.ContextEventH\000\022*\n\010topology\030\002 \001(\0132" + "\026.context.TopologyEventH\000\022&\n\006device\030\003 \001(" + "\0132\024.context.DeviceEventH\000\022\"\n\004link\030\004 \001(\0132" + "\022.context.LinkEventH\000\022(\n\007service\030\005 \001(\0132\025" + ".context.ServiceEventH\000\022$\n\005slice\030\006 \001(\0132\023" + ".context.SliceEventH\000\022.\n\nconnection\030\007 \001(" + "\0132\030.context.ConnectionEventH\000B\007\n\005event\"0" + "\n\tContextId\022#\n\014context_uuid\030\001 \001(\0132\r.cont" + "ext.Uuid\"\351\001\n\007Context\022&\n\ncontext_id\030\001 \001(\013" + "2\022.context.ContextId\022\014\n\004name\030\002 \001(\t\022)\n\014to" + "pology_ids\030\003 \003(\0132\023.context.TopologyId\022\'\n" + "\013service_ids\030\004 \003(\0132\022.context.ServiceId\022#" + "\n\tslice_ids\030\005 \003(\0132\020.context.SliceId\022/\n\nc" + "ontroller\030\006 \001(\0132\033.context.TeraFlowContro" + "ller\"8\n\rContextIdList\022\'\n\013context_ids\030\001 \003" + "(\0132\022.context.ContextId\"1\n\013ContextList\022\"\n" + "\010contexts\030\001 \003(\0132\020.context.Context\"U\n\014Con" + "textEvent\022\035\n\005event\030\001 \001(\0132\016.context.Event" + "\022&\n\ncontext_id\030\002 \001(\0132\022.context.ContextId" + "\"Z\n\nTopologyId\022&\n\ncontext_id\030\001 \001(\0132\022.con" + "text.ContextId\022$\n\rtopology_uuid\030\002 \001(\0132\r." + "context.Uuid\"\267\001\n\010Topology\022(\n\013topology_id" + "\030\001 \001(\0132\023.context.TopologyId\022\014\n\004name\030\002 \001(" + "\t\022%\n\ndevice_ids\030\003 \003(\0132\021.context.DeviceId" + "\022!\n\010link_ids\030\004 \003(\0132\017.context.LinkId\022)\n\020o" + "ptical_link_ids\030\005 \003(\0132\017.context.LinkId\"\266" + "\001\n\017TopologyDetails\022(\n\013topology_id\030\001 \001(\0132" + "\023.context.TopologyId\022\014\n\004name\030\002 \001(\t\022 \n\007de" + "vices\030\003 \003(\0132\017.context.Device\022\034\n\005links\030\004 " + "\003(\0132\r.context.Link\022+\n\roptical_links\030\005 \003(" + "\0132\024.context.OpticalLink\";\n\016TopologyIdLis" + "t\022)\n\014topology_ids\030\001 \003(\0132\023.context.Topolo" + "gyId\"5\n\014TopologyList\022%\n\ntopologies\030\001 \003(\013" + "2\021.context.Topology\"X\n\rTopologyEvent\022\035\n\005" + "event\030\001 \001(\0132\016.context.Event\022(\n\013topology_" + "id\030\002 \001(\0132\023.context.TopologyId\".\n\010DeviceI" + "d\022\"\n\013device_uuid\030\001 \001(\0132\r.context.Uuid\"\372\002" + "\n\006Device\022$\n\tdevice_id\030\001 \001(\0132\021.context.De" + "viceId\022\014\n\004name\030\002 \001(\t\022\023\n\013device_type\030\003 \001(" + "\t\022,\n\rdevice_config\030\004 \001(\0132\025.context.Devic" + "eConfig\022G\n\031device_operational_status\030\005 \001" + "(\0162$.context.DeviceOperationalStatusEnum" + "\0221\n\016device_drivers\030\006 \003(\0162\031.context.Devic" + "eDriverEnum\022+\n\020device_endpoints\030\007 \003(\0132\021." + "context.EndPoint\022&\n\ncomponents\030\010 \003(\0132\022.c" + "ontext.Component\022(\n\rcontroller_id\030\t \001(\0132" + "\021.context.DeviceId\"\311\001\n\tComponent\022%\n\016comp" + "onent_uuid\030\001 \001(\0132\r.context.Uuid\022\014\n\004name\030" + "\002 \001(\t\022\014\n\004type\030\003 \001(\t\0226\n\nattributes\030\004 \003(\0132" + "\".context.Component.AttributesEntry\022\016\n\006p" + "arent\030\005 \001(\t\0321\n\017AttributesEntry\022\013\n\003key\030\001 " + "\001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"9\n\014DeviceConfig\022)" + "\n\014config_rules\030\001 \003(\0132\023.context.ConfigRul" + "e\"5\n\014DeviceIdList\022%\n\ndevice_ids\030\001 \003(\0132\021." + "context.DeviceId\".\n\nDeviceList\022 \n\007device" + "s\030\001 \003(\0132\017.context.Device\"\216\001\n\014DeviceFilte" + "r\022)\n\ndevice_ids\030\001 \001(\0132\025.context.DeviceId" + "List\022\031\n\021include_endpoints\030\002 \001(\010\022\034\n\024inclu" + "de_config_rules\030\003 \001(\010\022\032\n\022include_compone" + "nts\030\004 \001(\010\"\200\001\n\013DeviceEvent\022\035\n\005event\030\001 \001(\013" + "2\016.context.Event\022$\n\tdevice_id\030\002 \001(\0132\021.co" + "ntext.DeviceId\022,\n\rdevice_config\030\003 \001(\0132\025." + "context.DeviceConfig\"*\n\006LinkId\022 \n\tlink_u" + "uid\030\001 \001(\0132\r.context.Uuid\"c\n\016LinkAttribut" + "es\022\030\n\020is_bidirectional\030\001 \001(\010\022\033\n\023total_ca" + "pacity_gbps\030\002 \001(\002\022\032\n\022used_capacity_gbps\030" + "\003 \001(\002\"\275\001\n\004Link\022 \n\007link_id\030\001 \001(\0132\017.contex" + "t.LinkId\022\014\n\004name\030\002 \001(\t\022(\n\tlink_type\030\003 \001(" + "\0162\025.context.LinkTypeEnum\022.\n\021link_endpoin" + "t_ids\030\004 \003(\0132\023.context.EndPointId\022+\n\nattr" + "ibutes\030\005 \001(\0132\027.context.LinkAttributes\"/\n" + "\nLinkIdList\022!\n\010link_ids\030\001 \003(\0132\017.context." + "LinkId\"(\n\010LinkList\022\034\n\005links\030\001 \003(\0132\r.cont" + "ext.Link\"L\n\tLinkEvent\022\035\n\005event\030\001 \001(\0132\016.c" + "ontext.Event\022 \n\007link_id\030\002 \001(\0132\017.context." + "LinkId\"X\n\tServiceId\022&\n\ncontext_id\030\001 \001(\0132" + "\022.context.ContextId\022#\n\014service_uuid\030\002 \001(" + "\0132\r.context.Uuid\"\333\002\n\007Service\022&\n\nservice_" + "id\030\001 \001(\0132\022.context.ServiceId\022\014\n\004name\030\002 \001" + "(\t\022.\n\014service_type\030\003 \001(\0162\030.context.Servi" + "ceTypeEnum\0221\n\024service_endpoint_ids\030\004 \003(\013" + "2\023.context.EndPointId\0220\n\023service_constra" + "ints\030\005 \003(\0132\023.context.Constraint\022.\n\016servi" + "ce_status\030\006 \001(\0132\026.context.ServiceStatus\022" + ".\n\016service_config\030\007 \001(\0132\026.context.Servic" + "eConfig\022%\n\ttimestamp\030\010 \001(\0132\022.context.Tim" + "estamp\"C\n\rServiceStatus\0222\n\016service_statu" + "s\030\001 \001(\0162\032.context.ServiceStatusEnum\":\n\rS" + "erviceConfig\022)\n\014config_rules\030\001 \003(\0132\023.con" + "text.ConfigRule\"8\n\rServiceIdList\022\'\n\013serv" + "ice_ids\030\001 \003(\0132\022.context.ServiceId\"1\n\013Ser" + "viceList\022\"\n\010services\030\001 \003(\0132\020.context.Ser" + "vice\"\225\001\n\rServiceFilter\022+\n\013service_ids\030\001 " + "\001(\0132\026.context.ServiceIdList\022\034\n\024include_e" + "ndpoint_ids\030\002 \001(\010\022\033\n\023include_constraints" + "\030\003 \001(\010\022\034\n\024include_config_rules\030\004 \001(\010\"U\n\014" + "ServiceEvent\022\035\n\005event\030\001 \001(\0132\016.context.Ev" + "ent\022&\n\nservice_id\030\002 \001(\0132\022.context.Servic" + "eId\"T\n\007SliceId\022&\n\ncontext_id\030\001 \001(\0132\022.con" + "text.ContextId\022!\n\nslice_uuid\030\002 \001(\0132\r.con" + "text.Uuid\"\240\003\n\005Slice\022\"\n\010slice_id\030\001 \001(\0132\020." + "context.SliceId\022\014\n\004name\030\002 \001(\t\022/\n\022slice_e" + "ndpoint_ids\030\003 \003(\0132\023.context.EndPointId\022." + "\n\021slice_constraints\030\004 \003(\0132\023.context.Cons" + "traint\022-\n\021slice_service_ids\030\005 \003(\0132\022.cont" + "ext.ServiceId\022,\n\022slice_subslice_ids\030\006 \003(" + "\0132\020.context.SliceId\022*\n\014slice_status\030\007 \001(" + "\0132\024.context.SliceStatus\022*\n\014slice_config\030" + "\010 \001(\0132\024.context.SliceConfig\022(\n\013slice_own" + "er\030\t \001(\0132\023.context.SliceOwner\022%\n\ttimesta" + "mp\030\n \001(\0132\022.context.Timestamp\"E\n\nSliceOwn" + "er\022!\n\nowner_uuid\030\001 \001(\0132\r.context.Uuid\022\024\n" + "\014owner_string\030\002 \001(\t\"=\n\013SliceStatus\022.\n\014sl" + "ice_status\030\001 \001(\0162\030.context.SliceStatusEn" + "um\"8\n\013SliceConfig\022)\n\014config_rules\030\001 \003(\0132" + "\023.context.ConfigRule\"2\n\013SliceIdList\022#\n\ts" + "lice_ids\030\001 \003(\0132\020.context.SliceId\"+\n\tSlic" + "eList\022\036\n\006slices\030\001 \003(\0132\016.context.Slice\"\312\001" + "\n\013SliceFilter\022\'\n\tslice_ids\030\001 \001(\0132\024.conte" + "xt.SliceIdList\022\034\n\024include_endpoint_ids\030\002" + " \001(\010\022\033\n\023include_constraints\030\003 \001(\010\022\033\n\023inc" + "lude_service_ids\030\004 \001(\010\022\034\n\024include_subsli" + "ce_ids\030\005 \001(\010\022\034\n\024include_config_rules\030\006 \001" + "(\010\"O\n\nSliceEvent\022\035\n\005event\030\001 \001(\0132\016.contex" + "t.Event\022\"\n\010slice_id\030\002 \001(\0132\020.context.Slic" + "eId\"6\n\014ConnectionId\022&\n\017connection_uuid\030\001" + " \001(\0132\r.context.Uuid\"2\n\025ConnectionSetting" + "s_L0\022\031\n\021lsp_symbolic_name\030\001 \001(\t\"\236\001\n\025Conn" + "ectionSettings_L2\022\027\n\017src_mac_address\030\001 \001" + "(\t\022\027\n\017dst_mac_address\030\002 \001(\t\022\022\n\nether_typ" + "e\030\003 \001(\r\022\017\n\007vlan_id\030\004 \001(\r\022\022\n\nmpls_label\030\005" + " \001(\r\022\032\n\022mpls_traffic_class\030\006 \001(\r\"t\n\025Conn" + "ectionSettings_L3\022\026\n\016src_ip_address\030\001 \001(" + "\t\022\026\n\016dst_ip_address\030\002 \001(\t\022\014\n\004dscp\030\003 \001(\r\022" + "\020\n\010protocol\030\004 \001(\r\022\013\n\003ttl\030\005 \001(\r\"[\n\025Connec" + "tionSettings_L4\022\020\n\010src_port\030\001 \001(\r\022\020\n\010dst" + "_port\030\002 \001(\r\022\021\n\ttcp_flags\030\003 \001(\r\022\013\n\003ttl\030\004 " + "\001(\r\"\304\001\n\022ConnectionSettings\022*\n\002l0\030\001 \001(\0132\036" + ".context.ConnectionSettings_L0\022*\n\002l2\030\002 \001" + "(\0132\036.context.ConnectionSettings_L2\022*\n\002l3" + "\030\003 \001(\0132\036.context.ConnectionSettings_L3\022*" + "\n\002l4\030\004 \001(\0132\036.context.ConnectionSettings_" + "L4\"\363\001\n\nConnection\022,\n\rconnection_id\030\001 \001(\013" + "2\025.context.ConnectionId\022&\n\nservice_id\030\002 " + "\001(\0132\022.context.ServiceId\0223\n\026path_hops_end" + "point_ids\030\003 \003(\0132\023.context.EndPointId\022+\n\017" + "sub_service_ids\030\004 \003(\0132\022.context.ServiceI" + "d\022-\n\010settings\030\005 \001(\0132\033.context.Connection" + "Settings\"A\n\020ConnectionIdList\022-\n\016connecti" + "on_ids\030\001 \003(\0132\025.context.ConnectionId\":\n\016C" + "onnectionList\022(\n\013connections\030\001 \003(\0132\023.con" + "text.Connection\"^\n\017ConnectionEvent\022\035\n\005ev" + "ent\030\001 \001(\0132\016.context.Event\022,\n\rconnection_" + "id\030\002 \001(\0132\025.context.ConnectionId\"\202\001\n\nEndP" + "ointId\022(\n\013topology_id\030\001 \001(\0132\023.context.To" + "pologyId\022$\n\tdevice_id\030\002 \001(\0132\021.context.De" + "viceId\022$\n\rendpoint_uuid\030\003 \001(\0132\r.context." + "Uuid\"\310\002\n\010EndPoint\022(\n\013endpoint_id\030\001 \001(\0132\023" + ".context.EndPointId\022\014\n\004name\030\002 \001(\t\022\025\n\rend" + "point_type\030\003 \001(\t\0229\n\020kpi_sample_types\030\004 \003" + "(\0162\037.kpi_sample_types.KpiSampleType\022,\n\021e" + "ndpoint_location\030\005 \001(\0132\021.context.Locatio" + "n\0229\n\014capabilities\030\006 \003(\0132#.context.EndPoi" + "nt.CapabilitiesEntry\032I\n\021CapabilitiesEntr" + "y\022\013\n\003key\030\001 \001(\t\022#\n\005value\030\002 \001(\0132\024.google.p" + "rotobuf.Any:\0028\001\"{\n\014EndPointName\022(\n\013endpo" + "int_id\030\001 \001(\0132\023.context.EndPointId\022\023\n\013dev" + "ice_name\030\002 \001(\t\022\025\n\rendpoint_name\030\003 \001(\t\022\025\n" + "\rendpoint_type\030\004 \001(\t\";\n\016EndPointIdList\022)" + "\n\014endpoint_ids\030\001 \003(\0132\023.context.EndPointI" + "d\"A\n\020EndPointNameList\022-\n\016endpoint_names\030" + "\001 \003(\0132\025.context.EndPointName\"A\n\021ConfigRu" + "le_Custom\022\024\n\014resource_key\030\001 \001(\t\022\026\n\016resou" + "rce_value\030\002 \001(\t\"\213\001\n\016ConfigRule_ACL\022(\n\013en" + "dpoint_id\030\001 \001(\0132\023.context.EndPointId\022,\n\t" + "direction\030\002 \001(\0162\031.context.AclDirectionEn" + "um\022!\n\010rule_set\030\003 \001(\0132\017.acl.AclRuleSet\"f\n" + "\021ConfigRule_IPOWDM\022(\n\013endpoint_id\030\001 \001(\0132" + "\023.context.EndPointId\022\'\n\010rule_set\030\002 \001(\0132\025" + ".ipowdm.IpowdmRuleSet\"k\n\023ConfigRule_TAPI" + "_LSP\022(\n\013endpoint_id\030\001 \001(\0132\023.context.EndP" + "ointId\022*\n\010rule_set\030\002 \003(\0132\030.tapi_lsp.Tapi" + "LspRuleSet\"h\n\022ConfigRule_IP_LINK\022(\n\013endp" + "oint_id\030\001 \001(\0132\023.context.EndPointId\022(\n\010ru" + "le_set\030\002 \001(\0132\026.ip_link.IpLinkRuleSet\"\254\002\n" + "\nConfigRule\022)\n\006action\030\001 \001(\0162\031.context.Co" + "nfigActionEnum\022,\n\006custom\030\002 \001(\0132\032.context" + ".ConfigRule_CustomH\000\022&\n\003acl\030\003 \001(\0132\027.cont" + "ext.ConfigRule_ACLH\000\022.\n\007ip_link\030\004 \001(\0132\033." + "context.ConfigRule_IP_LINKH\000\0220\n\010tapi_lsp" + "\030\005 \001(\0132\034.context.ConfigRule_TAPI_LSPH\000\022," + "\n\006ipowdm\030\006 \001(\0132\032.context.ConfigRule_IPOW" + "DMH\000B\r\n\013config_rule\"F\n\021Constraint_Custom" + "\022\027\n\017constraint_type\030\001 \001(\t\022\030\n\020constraint_" + "value\030\002 \001(\t\"E\n\023Constraint_Schedule\022\027\n\017st" + "art_timestamp\030\001 \001(\001\022\025\n\rduration_days\030\002 \001" + "(\002\"3\n\014GPS_Position\022\020\n\010latitude\030\001 \001(\002\022\021\n\t" + "longitude\030\002 \001(\002\"\204\001\n\010Location\022\020\n\006region\030\001" + " \001(\tH\000\022-\n\014gps_position\030\002 \001(\0132\025.context.G" + "PS_PositionH\000\022\023\n\tinterface\030\003 \001(\tH\000\022\026\n\014ci" + "rcuit_pack\030\004 \001(\tH\000B\n\n\010location\"l\n\033Constr" + "aint_EndPointLocation\022(\n\013endpoint_id\030\001 \001" + "(\0132\023.context.EndPointId\022#\n\010location\030\002 \001(" + "\0132\021.context.Location\"Y\n\033Constraint_EndPo" + "intPriority\022(\n\013endpoint_id\030\001 \001(\0132\023.conte" + "xt.EndPointId\022\020\n\010priority\030\002 \001(\r\"0\n\026Const" + "raint_SLA_Latency\022\026\n\016e2e_latency_ms\030\001 \001(" + "\002\"0\n\027Constraint_SLA_Capacity\022\025\n\rcapacity" + "_gbps\030\001 \001(\002\"c\n\033Constraint_SLA_Availabili" + "ty\022\032\n\022num_disjoint_paths\030\001 \001(\r\022\022\n\nall_ac" + "tive\030\002 \001(\010\022\024\n\014availability\030\003 \001(\002\"V\n\036Cons" + "traint_SLA_Isolation_level\0224\n\017isolation_" + "level\030\001 \003(\0162\033.context.IsolationLevelEnum" + "\"\242\001\n\025Constraint_Exclusions\022\024\n\014is_permane" + "nt\030\001 \001(\010\022%\n\ndevice_ids\030\002 \003(\0132\021.context.D" + "eviceId\022)\n\014endpoint_ids\030\003 \003(\0132\023.context." + "EndPointId\022!\n\010link_ids\030\004 \003(\0132\017.context.L" + "inkId\"5\n\014QoSProfileId\022%\n\016qos_profile_id\030" + "\001 \001(\0132\r.context.Uuid\"`\n\025Constraint_QoSPr" + "ofile\022-\n\016qos_profile_id\030\001 \001(\0132\025.context." + "QoSProfileId\022\030\n\020qos_profile_name\030\002 \001(\t\"\222" + "\005\n\nConstraint\022-\n\006action\030\001 \001(\0162\035.context." + "ConstraintActionEnum\022,\n\006custom\030\002 \001(\0132\032.c" + "ontext.Constraint_CustomH\000\0220\n\010schedule\030\003" + " \001(\0132\034.context.Constraint_ScheduleH\000\022A\n\021" + "endpoint_location\030\004 \001(\0132$.context.Constr" + "aint_EndPointLocationH\000\022A\n\021endpoint_prio" + "rity\030\005 \001(\0132$.context.Constraint_EndPoint" + "PriorityH\000\0228\n\014sla_capacity\030\006 \001(\0132 .conte" + "xt.Constraint_SLA_CapacityH\000\0226\n\013sla_late" + "ncy\030\007 \001(\0132\037.context.Constraint_SLA_Laten" + "cyH\000\022@\n\020sla_availability\030\010 \001(\0132$.context" + ".Constraint_SLA_AvailabilityH\000\022@\n\rsla_is" + "olation\030\t \001(\0132\'.context.Constraint_SLA_I" + "solation_levelH\000\0224\n\nexclusions\030\n \001(\0132\036.c" + "ontext.Constraint_ExclusionsH\000\0225\n\013qos_pr" + "ofile\030\013 \001(\0132\036.context.Constraint_QoSProf" + "ileH\000B\014\n\nconstraint\"^\n\022TeraFlowControlle" + "r\022&\n\ncontext_id\030\001 \001(\0132\022.context.ContextI" + "d\022\022\n\nip_address\030\002 \001(\t\022\014\n\004port\030\003 \001(\r\"U\n\024A" + "uthenticationResult\022&\n\ncontext_id\030\001 \001(\0132" + "\022.context.ContextId\022\025\n\rauthenticated\030\002 \001" + "(\010\"-\n\017OpticalConfigId\022\032\n\022opticalconfig_u" + "uid\030\001 \001(\t\"y\n\rOpticalConfig\0222\n\020opticalcon" + "fig_id\030\001 \001(\0132\030.context.OpticalConfigId\022\016" + "\n\006config\030\002 \001(\t\022$\n\tdevice_id\030\003 \001(\0132\021.cont" + "ext.DeviceId\"C\n\021OpticalConfigList\022.\n\016opt" + "icalconfigs\030\001 \003(\0132\026.context.OpticalConfi" + "g\"g\n\022OpticalConfigEvent\022\035\n\005event\030\001 \001(\0132\016" + ".context.Event\0222\n\020opticalconfig_id\030\002 \001(\013" + "2\030.context.OpticalConfigId\"_\n\021OpticalEnd" + "PointId\022$\n\tdevice_id\030\002 \001(\0132\021.context.Dev" + "iceId\022$\n\rendpoint_uuid\030\003 \001(\0132\r.context.U" + "uid\">\n\017OpticalLinkList\022+\n\roptical_links\030" + "\001 \003(\0132\024.context.OpticalLink\"\304\003\n\022OpticalL" + "inkDetails\022\016\n\006length\030\001 \001(\002\022\020\n\010src_port\030\002" + " \001(\t\022\020\n\010dst_port\030\003 \001(\t\022\027\n\017local_peer_por" + "t\030\004 \001(\t\022\030\n\020remote_peer_port\030\005 \001(\t\022\014\n\004use" + "d\030\006 \001(\010\0228\n\007c_slots\030\007 \003(\0132\'.context.Optic" + "alLinkDetails.CSlotsEntry\0228\n\007l_slots\030\010 \003" + "(\0132\'.context.OpticalLinkDetails.LSlotsEn" + "try\0228\n\007s_slots\030\t \003(\0132\'.context.OpticalLi" + "nkDetails.SSlotsEntry\032-\n\013CSlotsEntry\022\013\n\003" + "key\030\001 \001(\t\022\r\n\005value\030\002 \001(\005:\0028\001\032-\n\013LSlotsEn" + "try\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\005:\0028\001\032-\n\013S" + "SlotsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\005:\002" + "8\001\"\243\001\n\013OpticalLink\022\014\n\004name\030\001 \001(\t\0224\n\017opti" + "cal_details\030\002 \001(\0132\033.context.OpticalLinkD" + "etails\022 \n\007link_id\030\003 \001(\0132\017.context.LinkId" + "\022.\n\021link_endpoint_ids\030\004 \003(\0132\023.context.En" + "dPointId\"0\n\tChannelId\022#\n\014channel_uuid\030\001 " + "\001(\0132\r.context.Uuid\"8\n\rOpticalBandId\022\'\n\020o" + "pticalband_uuid\030\001 \001(\0132\r.context.Uuid\"\247\002\n" + "\013OpticalBand\022.\n\016opticalband_id\030\001 \001(\0132\026.c" + "ontext.OpticalBandId\022,\n\rconnection_id\030\002 " + "\001(\0132\025.context.ConnectionId\022&\n\nchannel_id" + "\030\003 \001(\0132\022.context.ChannelId\022&\n\nservice_id" + "\030\004 \001(\0132\022.context.ServiceId\022#\n\007service\030\005 " + "\001(\0132\020.context.ServiceH\000\022)\n\nconnection\030\006 " + "\001(\0132\023.context.ConnectionH\000\022\021\n\007channel\030\007 " + "\001(\tH\000B\007\n\005field\"=\n\017OpticalBandList\022*\n\014opt" + "icalbands\030\001 \003(\0132\024.context.OpticalBand\"r\n" + "\021ServiceConfigRule\022&\n\nservice_id\030\001 \001(\0132\022" + ".context.ServiceId\0225\n\021configrule_custom\030" + "\002 \001(\0132\032.context.ConfigRule_Custom*j\n\rEve" + "ntTypeEnum\022\027\n\023EVENTTYPE_UNDEFINED\020\000\022\024\n\020E" + "VENTTYPE_CREATE\020\001\022\024\n\020EVENTTYPE_UPDATE\020\002\022" + "\024\n\020EVENTTYPE_REMOVE\020\003*\333\004\n\020DeviceDriverEn" + "um\022\032\n\026DEVICEDRIVER_UNDEFINED\020\000\022\033\n\027DEVICE" + "DRIVER_OPENCONFIG\020\001\022\036\n\032DEVICEDRIVER_TRAN" + "SPORT_API\020\002\022\023\n\017DEVICEDRIVER_P4\020\003\022&\n\"DEVI" + "CEDRIVER_IETF_NETWORK_TOPOLOGY\020\004\022\033\n\027DEVI" + "CEDRIVER_ONF_TR_532\020\005\022\023\n\017DEVICEDRIVER_XR" + "\020\006\022\033\n\027DEVICEDRIVER_IETF_L2VPN\020\007\022 \n\034DEVIC" + "EDRIVER_GNMI_OPENCONFIG\020\010\022\034\n\030DEVICEDRIVE" + "R_OPTICAL_TFS\020\t\022\032\n\026DEVICEDRIVER_IETF_ACT" + "N\020\n\022\023\n\017DEVICEDRIVER_OC\020\013\022\024\n\020DEVICEDRIVER" + "_QKD\020\014\022\033\n\027DEVICEDRIVER_IETF_L3VPN\020\r\022\033\n\027D" + "EVICEDRIVER_IETF_SLICE\020\016\022\024\n\020DEVICEDRIVER" + "_NCE\020\017\022\031\n\025DEVICEDRIVER_SMARTNIC\020\020\022\031\n\025DEV" + "ICEDRIVER_MORPHEUS\020\021\022\024\n\020DEVICEDRIVER_RYU" + "\020\022\022#\n\037DEVICEDRIVER_GNMI_NOKIA_SRLINUX\020\023\022" + "\032\n\026DEVICEDRIVER_OPENROADM\020\024*\217\001\n\033DeviceOp" + "erationalStatusEnum\022%\n!DEVICEOPERATIONAL" + "STATUS_UNDEFINED\020\000\022$\n DEVICEOPERATIONALS" + "TATUS_DISABLED\020\001\022#\n\037DEVICEOPERATIONALSTA" + "TUS_ENABLED\020\002*\245\001\n\014LinkTypeEnum\022\024\n\020LINKTY" + "PE_UNKNOWN\020\000\022\023\n\017LINKTYPE_COPPER\020\001\022\022\n\016LIN" + "KTYPE_FIBER\020\002\022\022\n\016LINKTYPE_RADIO\020\003\022\024\n\020LIN" + "KTYPE_VIRTUAL\020\004\022\027\n\023LINKTYPE_MANAGEMENT\020\005" + "\022\023\n\017LINKTYPE_REMOTE\020\006*\360\002\n\017ServiceTypeEnu" + "m\022\027\n\023SERVICETYPE_UNKNOWN\020\000\022\024\n\020SERVICETYP" + "E_L3NM\020\001\022\024\n\020SERVICETYPE_L2NM\020\002\022)\n%SERVIC" + "ETYPE_TAPI_CONNECTIVITY_SERVICE\020\003\022\022\n\016SER" + "VICETYPE_TE\020\004\022\023\n\017SERVICETYPE_E2E\020\005\022$\n SE" + "RVICETYPE_OPTICAL_CONNECTIVITY\020\006\022\023\n\017SERV" + "ICETYPE_QKD\020\007\022\024\n\020SERVICETYPE_L1NM\020\010\022\023\n\017S" + "ERVICETYPE_INT\020\t\022\023\n\017SERVICETYPE_ACL\020\n\022\027\n" + "\023SERVICETYPE_IP_LINK\020\013\022\030\n\024SERVICETYPE_TA" + "PI_LSP\020\014\022\026\n\022SERVICETYPE_IPOWDM\020\r*\304\001\n\021Ser" + "viceStatusEnum\022\033\n\027SERVICESTATUS_UNDEFINE" + "D\020\000\022\031\n\025SERVICESTATUS_PLANNED\020\001\022\030\n\024SERVIC" + "ESTATUS_ACTIVE\020\002\022\032\n\026SERVICESTATUS_UPDATI" + "NG\020\003\022!\n\035SERVICESTATUS_PENDING_REMOVAL\020\004\022" + "\036\n\032SERVICESTATUS_SLA_VIOLATED\020\005*\251\001\n\017Slic" + "eStatusEnum\022\031\n\025SLICESTATUS_UNDEFINED\020\000\022\027" + "\n\023SLICESTATUS_PLANNED\020\001\022\024\n\020SLICESTATUS_I" + "NIT\020\002\022\026\n\022SLICESTATUS_ACTIVE\020\003\022\026\n\022SLICEST" + "ATUS_DEINIT\020\004\022\034\n\030SLICESTATUS_SLA_VIOLATE" + "D\020\005*]\n\020ConfigActionEnum\022\032\n\026CONFIGACTION_" + "UNDEFINED\020\000\022\024\n\020CONFIGACTION_SET\020\001\022\027\n\023CON" + "FIGACTION_DELETE\020\002*\\\n\020AclDirectionEnum\022\025" + "\n\021ACLDIRECTION_BOTH\020\000\022\030\n\024ACLDIRECTION_IN" + "GRESS\020\001\022\027\n\023ACLDIRECTION_EGRESS\020\002*m\n\024Cons" + "traintActionEnum\022\036\n\032CONSTRAINTACTION_UND" + "EFINED\020\000\022\030\n\024CONSTRAINTACTION_SET\020\001\022\033\n\027CO" + "NSTRAINTACTION_DELETE\020\002*\203\002\n\022IsolationLev" + "elEnum\022\020\n\014NO_ISOLATION\020\000\022\026\n\022PHYSICAL_ISO" + "LATION\020\001\022\025\n\021LOGICAL_ISOLATION\020\002\022\025\n\021PROCE" + "SS_ISOLATION\020\003\022\035\n\031PHYSICAL_MEMORY_ISOLAT" + "ION\020\004\022\036\n\032PHYSICAL_NETWORK_ISOLATION\020\005\022\036\n" + "\032VIRTUAL_RESOURCE_ISOLATION\020\006\022\037\n\033NETWORK" + "_FUNCTIONS_ISOLATION\020\007\022\025\n\021SERVICE_ISOLAT" + "ION\020\0102\274\035\n\016ContextService\022:\n\016ListContextI" + "ds\022\016.context.Empty\032\026.context.ContextIdLi" + "st\"\000\0226\n\014ListContexts\022\016.context.Empty\032\024.c" + "ontext.ContextList\"\000\0224\n\nGetContext\022\022.con" + "text.ContextId\032\020.context.Context\"\000\0224\n\nSe" + "tContext\022\020.context.Context\032\022.context.Con" + "textId\"\000\0225\n\rRemoveContext\022\022.context.Cont" + "extId\032\016.context.Empty\"\000\022=\n\020GetContextEve" + "nts\022\016.context.Empty\032\025.context.ContextEve" + "nt\"\0000\001\022@\n\017ListTopologyIds\022\022.context.Cont" + "extId\032\027.context.TopologyIdList\"\000\022=\n\016List" + "Topologies\022\022.context.ContextId\032\025.context" + ".TopologyList\"\000\0227\n\013GetTopology\022\023.context" + ".TopologyId\032\021.context.Topology\"\000\022E\n\022GetT" + "opologyDetails\022\023.context.TopologyId\032\030.co" + "ntext.TopologyDetails\"\000\0227\n\013SetTopology\022\021" + ".context.Topology\032\023.context.TopologyId\"\000" + "\0227\n\016RemoveTopology\022\023.context.TopologyId\032" + "\016.context.Empty\"\000\022?\n\021GetTopologyEvents\022\016" + ".context.Empty\032\026.context.TopologyEvent\"\000" + "0\001\0228\n\rListDeviceIds\022\016.context.Empty\032\025.co" + "ntext.DeviceIdList\"\000\0224\n\013ListDevices\022\016.co" + "ntext.Empty\032\023.context.DeviceList\"\000\0221\n\tGe" + "tDevice\022\021.context.DeviceId\032\017.context.Dev" + "ice\"\000\0221\n\tSetDevice\022\017.context.Device\032\021.co" + "ntext.DeviceId\"\000\0223\n\014RemoveDevice\022\021.conte" + "xt.DeviceId\032\016.context.Empty\"\000\022;\n\017GetDevi" + "ceEvents\022\016.context.Empty\032\024.context.Devic" + "eEvent\"\0000\001\022<\n\014SelectDevice\022\025.context.Dev" + "iceFilter\032\023.context.DeviceList\"\000\022I\n\021List" + "EndPointNames\022\027.context.EndPointIdList\032\031" + ".context.EndPointNameList\"\000\0224\n\013ListLinkI" + "ds\022\016.context.Empty\032\023.context.LinkIdList\"" + "\000\0220\n\tListLinks\022\016.context.Empty\032\021.context" + ".LinkList\"\000\022+\n\007GetLink\022\017.context.LinkId\032" + "\r.context.Link\"\000\022+\n\007SetLink\022\r.context.Li" + "nk\032\017.context.LinkId\"\000\022/\n\nRemoveLink\022\017.co" + "ntext.LinkId\032\016.context.Empty\"\000\0227\n\rGetLin" + "kEvents\022\016.context.Empty\032\022.context.LinkEv" + "ent\"\0000\001\022>\n\016ListServiceIds\022\022.context.Cont" + "extId\032\026.context.ServiceIdList\"\000\022:\n\014ListS" + "ervices\022\022.context.ContextId\032\024.context.Se" + "rviceList\"\000\0224\n\nGetService\022\022.context.Serv" + "iceId\032\020.context.Service\"\000\0224\n\nSetService\022" + "\020.context.Service\032\022.context.ServiceId\"\000\022" + "6\n\014UnsetService\022\020.context.Service\032\022.cont" + "ext.ServiceId\"\000\0225\n\rRemoveService\022\022.conte" + "xt.ServiceId\032\016.context.Empty\"\000\022=\n\020GetSer" + "viceEvents\022\016.context.Empty\032\025.context.Ser", "viceEvent\"\0000\001\022?\n\rSelectService\022\026.context" + ".ServiceFilter\032\024.context.ServiceList\"\000\022:" + "\n\014ListSliceIds\022\022.context.ContextId\032\024.con" + "text.SliceIdList\"\000\0226\n\nListSlices\022\022.conte" + "xt.ContextId\032\022.context.SliceList\"\000\022.\n\010Ge" + "tSlice\022\020.context.SliceId\032\016.context.Slice" + "\"\000\022.\n\010SetSlice\022\016.context.Slice\032\020.context" + ".SliceId\"\000\0220\n\nUnsetSlice\022\016.context.Slice" + "\032\020.context.SliceId\"\000\0221\n\013RemoveSlice\022\020.co" + "ntext.SliceId\032\016.context.Empty\"\000\0229\n\016GetSl" + "iceEvents\022\016.context.Empty\032\023.context.Slic" + "eEvent\"\0000\001\0229\n\013SelectSlice\022\024.context.Slic" + "eFilter\032\022.context.SliceList\"\000\022D\n\021ListCon" + "nectionIds\022\022.context.ServiceId\032\031.context" + ".ConnectionIdList\"\000\022@\n\017ListConnections\022\022" + ".context.ServiceId\032\027.context.ConnectionL" + "ist\"\000\022=\n\rGetConnection\022\025.context.Connect" + "ionId\032\023.context.Connection\"\000\022=\n\rSetConne" + "ction\022\023.context.Connection\032\025.context.Con" + "nectionId\"\000\022;\n\020RemoveConnection\022\025.contex" + "t.ConnectionId\032\016.context.Empty\"\000\022C\n\023GetC" + "onnectionEvents\022\016.context.Empty\032\030.contex" + "t.ConnectionEvent\"\0000\001\0225\n\014GetAllEvents\022\016." + "context.Empty\032\021.context.AnyEvent\"\0000\001\022@\n\020" + "GetOpticalConfig\022\016.context.Empty\032\032.conte" + "xt.OpticalConfigList\"\000\022F\n\020SetOpticalConf" + "ig\022\026.context.OpticalConfig\032\030.context.Opt" + "icalConfigId\"\000\022I\n\023UpdateOpticalConfig\022\026." + "context.OpticalConfig\032\030.context.OpticalC" + "onfigId\"\000\022I\n\023SelectOpticalConfig\022\030.conte" + "xt.OpticalConfigId\032\026.context.OpticalConf" + "ig\"\000\022A\n\023DeleteOpticalConfig\022\030.context.Op" + "ticalConfigId\032\016.context.Empty\"\000\022@\n\024Delet" + "eOpticalChannel\022\026.context.OpticalConfig\032" + "\016.context.Empty\"\000\0228\n\016SetOpticalLink\022\024.co" + "ntext.OpticalLink\032\016.context.Empty\"\000\0229\n\016G" + "etOpticalLink\022\017.context.LinkId\032\024.context" + ".OpticalLink\"\000\0226\n\021DeleteOpticalLink\022\017.co" + "ntext.LinkId\032\016.context.Empty\"\000\022@\n\022GetOpt" + "icalLinkList\022\016.context.Empty\032\030.context.O" + "pticalLinkList\"\000\022<\n\016GetOpticalBand\022\016.con" + "text.Empty\032\030.context.OpticalBandList\"\000\022C" + "\n\021SelectOpticalBand\022\026.context.OpticalBan" + "dId\032\024.context.OpticalBand\"\000\022G\n\027DeleteSer" + "viceConfigRule\022\032.context.ServiceConfigRu" + "le\032\016.context.Empty\"\000b\006proto3" };
         descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { com.google.protobuf.AnyProto.getDescriptor(), acl.Acl.getDescriptor(), ipowdm.Ipowdm.getDescriptor(), ip_link.IpLink.getDescriptor(), kpi_sample_types.KpiSampleTypes.getDescriptor(), tapi_lsp.TapiLsp.getDescriptor() });
         internal_static_context_Empty_descriptor = getDescriptor().getMessageTypes().get(0);
         internal_static_context_Empty_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(internal_static_context_Empty_descriptor, new java.lang.String[] {});
@@ -90461,7 +90503,7 @@ public final class ContextOuterClass {
         internal_static_context_ConfigRule_Custom_descriptor = getDescriptor().getMessageTypes().get(62);
         internal_static_context_ConfigRule_Custom_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(internal_static_context_ConfigRule_Custom_descriptor, new java.lang.String[] { "ResourceKey", "ResourceValue" });
         internal_static_context_ConfigRule_ACL_descriptor = getDescriptor().getMessageTypes().get(63);
-        internal_static_context_ConfigRule_ACL_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(internal_static_context_ConfigRule_ACL_descriptor, new java.lang.String[] { "EndpointId", "RuleSet" });
+        internal_static_context_ConfigRule_ACL_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(internal_static_context_ConfigRule_ACL_descriptor, new java.lang.String[] { "EndpointId", "Direction", "RuleSet" });
         internal_static_context_ConfigRule_IPOWDM_descriptor = getDescriptor().getMessageTypes().get(64);
         internal_static_context_ConfigRule_IPOWDM_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(internal_static_context_ConfigRule_IPOWDM_descriptor, new java.lang.String[] { "EndpointId", "RuleSet" });
         internal_static_context_ConfigRule_TAPI_LSP_descriptor = getDescriptor().getMessageTypes().get(65);
diff --git a/src/ztp/target/generated-sources/grpc/device/Device.java b/src/ztp/target/generated-sources/grpc/device/Device.java
index 2390aa92d..87c434732 100644
--- a/src/ztp/target/generated-sources/grpc/device/Device.java
+++ b/src/ztp/target/generated-sources/grpc/device/Device.java
@@ -14,8 +14,8 @@ public final class Device {
         registerAllExtensions((com.google.protobuf.ExtensionRegistryLite) registry);
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:device.MonitoringSettings)
-    MonitoringSettingsOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface MonitoringSettingsOrBuilder extends // @@protoc_insertion_point(interface_extends:device.MonitoringSettings)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <pre>
@@ -91,9 +91,8 @@ public final class Device {
     /**
      * Protobuf type {@code device.MonitoringSettings}
      */
-    public static final class // @@protoc_insertion_point(message_implements:device.MonitoringSettings)
-    // @@protoc_insertion_point(message_implements:device.MonitoringSettings)
-    MonitoringSettings extends com.google.protobuf.GeneratedMessageV3 implements MonitoringSettingsOrBuilder {
+    public static final class MonitoringSettings extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:device.MonitoringSettings)
+    MonitoringSettingsOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -412,9 +411,8 @@ public final class Device {
         /**
          * Protobuf type {@code device.MonitoringSettings}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:device.MonitoringSettings)
-        // @@protoc_insertion_point(builder_implements:device.MonitoringSettings)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements device.Device.MonitoringSettingsOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:device.MonitoringSettings)
+        device.Device.MonitoringSettingsOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return device.Device.internal_static_device_MonitoringSettings_descriptor;
diff --git a/src/ztp/target/generated-sources/grpc/ip_link/IpLink.java b/src/ztp/target/generated-sources/grpc/ip_link/IpLink.java
index 6b89ffcef..865a27401 100644
--- a/src/ztp/target/generated-sources/grpc/ip_link/IpLink.java
+++ b/src/ztp/target/generated-sources/grpc/ip_link/IpLink.java
@@ -14,8 +14,8 @@ public final class IpLink {
         registerAllExtensions((com.google.protobuf.ExtensionRegistryLite) registry);
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:ip_link.IpLinkRuleSet)
-    IpLinkRuleSetOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface IpLinkRuleSetOrBuilder extends // @@protoc_insertion_point(interface_extends:ip_link.IpLinkRuleSet)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>string ip = 1;</code>
@@ -57,9 +57,8 @@ public final class IpLink {
     /**
      * Protobuf type {@code ip_link.IpLinkRuleSet}
      */
-    public static final class // @@protoc_insertion_point(message_implements:ip_link.IpLinkRuleSet)
-    // @@protoc_insertion_point(message_implements:ip_link.IpLinkRuleSet)
-    IpLinkRuleSet extends com.google.protobuf.GeneratedMessageV3 implements IpLinkRuleSetOrBuilder {
+    public static final class IpLinkRuleSet extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:ip_link.IpLinkRuleSet)
+    IpLinkRuleSetOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -363,9 +362,8 @@ public final class IpLink {
         /**
          * Protobuf type {@code ip_link.IpLinkRuleSet}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:ip_link.IpLinkRuleSet)
-        // @@protoc_insertion_point(builder_implements:ip_link.IpLinkRuleSet)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements ip_link.IpLink.IpLinkRuleSetOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:ip_link.IpLinkRuleSet)
+        ip_link.IpLink.IpLinkRuleSetOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return ip_link.IpLink.internal_static_ip_link_IpLinkRuleSet_descriptor;
diff --git a/src/ztp/target/generated-sources/grpc/monitoring/Monitoring.java b/src/ztp/target/generated-sources/grpc/monitoring/Monitoring.java
index ddd75a0db..8394fe275 100644
--- a/src/ztp/target/generated-sources/grpc/monitoring/Monitoring.java
+++ b/src/ztp/target/generated-sources/grpc/monitoring/Monitoring.java
@@ -14,8 +14,8 @@ public final class Monitoring {
         registerAllExtensions((com.google.protobuf.ExtensionRegistryLite) registry);
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:monitoring.KpiDescriptor)
-    KpiDescriptorOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface KpiDescriptorOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.KpiDescriptor)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.monitoring.KpiId kpi_id = 1;</code>
@@ -189,9 +189,8 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.KpiDescriptor}
      */
-    public static final class // @@protoc_insertion_point(message_implements:monitoring.KpiDescriptor)
-    // @@protoc_insertion_point(message_implements:monitoring.KpiDescriptor)
-    KpiDescriptor extends com.google.protobuf.GeneratedMessageV3 implements KpiDescriptorOrBuilder {
+    public static final class KpiDescriptor extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.KpiDescriptor)
+    KpiDescriptorOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -811,9 +810,8 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.KpiDescriptor}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:monitoring.KpiDescriptor)
-        // @@protoc_insertion_point(builder_implements:monitoring.KpiDescriptor)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.KpiDescriptorOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.KpiDescriptor)
+        monitoring.Monitoring.KpiDescriptorOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_KpiDescriptor_descriptor;
@@ -2396,8 +2394,8 @@ public final class Monitoring {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:monitoring.MonitorKpiRequest)
-    MonitorKpiRequestOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface MonitorKpiRequestOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.MonitorKpiRequest)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.monitoring.KpiId kpi_id = 1;</code>
@@ -2436,9 +2434,8 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.MonitorKpiRequest}
      */
-    public static final class // @@protoc_insertion_point(message_implements:monitoring.MonitorKpiRequest)
-    // @@protoc_insertion_point(message_implements:monitoring.MonitorKpiRequest)
-    MonitorKpiRequest extends com.google.protobuf.GeneratedMessageV3 implements MonitorKpiRequestOrBuilder {
+    public static final class MonitorKpiRequest extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.MonitorKpiRequest)
+    MonitorKpiRequestOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -2691,9 +2688,8 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.MonitorKpiRequest}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:monitoring.MonitorKpiRequest)
-        // @@protoc_insertion_point(builder_implements:monitoring.MonitorKpiRequest)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.MonitorKpiRequestOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.MonitorKpiRequest)
+        monitoring.Monitoring.MonitorKpiRequestOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_MonitorKpiRequest_descriptor;
@@ -3111,8 +3107,8 @@ public final class Monitoring {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:monitoring.KpiQuery)
-    KpiQueryOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface KpiQueryOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.KpiQuery)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .monitoring.KpiId kpi_ids = 1;</code>
@@ -3217,9 +3213,8 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.KpiQuery}
      */
-    public static final class // @@protoc_insertion_point(message_implements:monitoring.KpiQuery)
-    // @@protoc_insertion_point(message_implements:monitoring.KpiQuery)
-    KpiQuery extends com.google.protobuf.GeneratedMessageV3 implements KpiQueryOrBuilder {
+    public static final class KpiQuery extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.KpiQuery)
+    KpiQueryOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -3600,9 +3595,8 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.KpiQuery}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:monitoring.KpiQuery)
-        // @@protoc_insertion_point(builder_implements:monitoring.KpiQuery)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.KpiQueryOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.KpiQuery)
+        monitoring.Monitoring.KpiQueryOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_KpiQuery_descriptor;
@@ -4521,8 +4515,8 @@ public final class Monitoring {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:monitoring.RawKpi)
-    RawKpiOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface RawKpiOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.RawKpi)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Timestamp timestamp = 1;</code>
@@ -4566,9 +4560,8 @@ public final class Monitoring {
      *
      * Protobuf type {@code monitoring.RawKpi}
      */
-    public static final class // @@protoc_insertion_point(message_implements:monitoring.RawKpi)
-    // @@protoc_insertion_point(message_implements:monitoring.RawKpi)
-    RawKpi extends com.google.protobuf.GeneratedMessageV3 implements RawKpiOrBuilder {
+    public static final class RawKpi extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.RawKpi)
+    RawKpiOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -4821,9 +4814,8 @@ public final class Monitoring {
          *
          * Protobuf type {@code monitoring.RawKpi}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:monitoring.RawKpi)
-        // @@protoc_insertion_point(builder_implements:monitoring.RawKpi)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.RawKpiOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.RawKpi)
+        monitoring.Monitoring.RawKpiOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_RawKpi_descriptor;
@@ -5269,8 +5261,8 @@ public final class Monitoring {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:monitoring.RawKpiList)
-    RawKpiListOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface RawKpiListOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.RawKpiList)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.monitoring.KpiId kpi_id = 1;</code>
@@ -5322,9 +5314,8 @@ public final class Monitoring {
      *
      * Protobuf type {@code monitoring.RawKpiList}
      */
-    public static final class // @@protoc_insertion_point(message_implements:monitoring.RawKpiList)
-    // @@protoc_insertion_point(message_implements:monitoring.RawKpiList)
-    RawKpiList extends com.google.protobuf.GeneratedMessageV3 implements RawKpiListOrBuilder {
+    public static final class RawKpiList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.RawKpiList)
+    RawKpiListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -5589,9 +5580,8 @@ public final class Monitoring {
          *
          * Protobuf type {@code monitoring.RawKpiList}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:monitoring.RawKpiList)
-        // @@protoc_insertion_point(builder_implements:monitoring.RawKpiList)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.RawKpiListOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.RawKpiList)
+        monitoring.Monitoring.RawKpiListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_RawKpiList_descriptor;
@@ -6194,8 +6184,8 @@ public final class Monitoring {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:monitoring.RawKpiTable)
-    RawKpiTableOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface RawKpiTableOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.RawKpiTable)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .monitoring.RawKpiList raw_kpi_lists = 1;</code>
@@ -6230,9 +6220,8 @@ public final class Monitoring {
      *
      * Protobuf type {@code monitoring.RawKpiTable}
      */
-    public static final class // @@protoc_insertion_point(message_implements:monitoring.RawKpiTable)
-    // @@protoc_insertion_point(message_implements:monitoring.RawKpiTable)
-    RawKpiTable extends com.google.protobuf.GeneratedMessageV3 implements RawKpiTableOrBuilder {
+    public static final class RawKpiTable extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.RawKpiTable)
+    RawKpiTableOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -6451,9 +6440,8 @@ public final class Monitoring {
          *
          * Protobuf type {@code monitoring.RawKpiTable}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:monitoring.RawKpiTable)
-        // @@protoc_insertion_point(builder_implements:monitoring.RawKpiTable)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.RawKpiTableOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.RawKpiTable)
+        monitoring.Monitoring.RawKpiTableOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_RawKpiTable_descriptor;
@@ -6920,8 +6908,8 @@ public final class Monitoring {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:monitoring.KpiId)
-    KpiIdOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface KpiIdOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.KpiId)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Uuid kpi_id = 1;</code>
@@ -6944,9 +6932,8 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.KpiId}
      */
-    public static final class // @@protoc_insertion_point(message_implements:monitoring.KpiId)
-    // @@protoc_insertion_point(message_implements:monitoring.KpiId)
-    KpiId extends com.google.protobuf.GeneratedMessageV3 implements KpiIdOrBuilder {
+    public static final class KpiId extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.KpiId)
+    KpiIdOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -7149,9 +7136,8 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.KpiId}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:monitoring.KpiId)
-        // @@protoc_insertion_point(builder_implements:monitoring.KpiId)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.KpiIdOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.KpiId)
+        monitoring.Monitoring.KpiIdOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_KpiId_descriptor;
@@ -7461,8 +7447,8 @@ public final class Monitoring {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:monitoring.Kpi)
-    KpiOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface KpiOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.Kpi)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.monitoring.KpiId kpi_id = 1;</code>
@@ -7519,9 +7505,8 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.Kpi}
      */
-    public static final class // @@protoc_insertion_point(message_implements:monitoring.Kpi)
-    // @@protoc_insertion_point(message_implements:monitoring.Kpi)
-    Kpi extends com.google.protobuf.GeneratedMessageV3 implements KpiOrBuilder {
+    public static final class Kpi extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.Kpi)
+    KpiOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -7816,9 +7801,8 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.Kpi}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:monitoring.Kpi)
-        // @@protoc_insertion_point(builder_implements:monitoring.Kpi)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.KpiOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.Kpi)
+        monitoring.Monitoring.KpiOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_Kpi_descriptor;
@@ -8400,8 +8384,8 @@ public final class Monitoring {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:monitoring.KpiValueRange)
-    KpiValueRangeOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface KpiValueRangeOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.KpiValueRange)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.monitoring.KpiValue kpiMinValue = 1;</code>
@@ -8471,9 +8455,8 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.KpiValueRange}
      */
-    public static final class // @@protoc_insertion_point(message_implements:monitoring.KpiValueRange)
-    // @@protoc_insertion_point(message_implements:monitoring.KpiValueRange)
-    KpiValueRange extends com.google.protobuf.GeneratedMessageV3 implements KpiValueRangeOrBuilder {
+    public static final class KpiValueRange extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.KpiValueRange)
+    KpiValueRangeOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -8803,9 +8786,8 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.KpiValueRange}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:monitoring.KpiValueRange)
-        // @@protoc_insertion_point(builder_implements:monitoring.KpiValueRange)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.KpiValueRangeOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.KpiValueRange)
+        monitoring.Monitoring.KpiValueRangeOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_KpiValueRange_descriptor;
@@ -9431,8 +9413,8 @@ public final class Monitoring {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:monitoring.KpiValue)
-    KpiValueOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface KpiValueOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.KpiValue)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>int32 int32Val = 1;</code>
@@ -9530,9 +9512,8 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.KpiValue}
      */
-    public static final class // @@protoc_insertion_point(message_implements:monitoring.KpiValue)
-    // @@protoc_insertion_point(message_implements:monitoring.KpiValue)
-    KpiValue extends com.google.protobuf.GeneratedMessageV3 implements KpiValueOrBuilder {
+    public static final class KpiValue extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.KpiValue)
+    KpiValueOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -10050,9 +10031,8 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.KpiValue}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:monitoring.KpiValue)
-        // @@protoc_insertion_point(builder_implements:monitoring.KpiValue)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.KpiValueOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.KpiValue)
+        monitoring.Monitoring.KpiValueOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_KpiValue_descriptor;
@@ -10702,8 +10682,8 @@ public final class Monitoring {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:monitoring.KpiList)
-    KpiListOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface KpiListOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.KpiList)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .monitoring.Kpi kpi = 1;</code>
@@ -10734,9 +10714,8 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.KpiList}
      */
-    public static final class // @@protoc_insertion_point(message_implements:monitoring.KpiList)
-    // @@protoc_insertion_point(message_implements:monitoring.KpiList)
-    KpiList extends com.google.protobuf.GeneratedMessageV3 implements KpiListOrBuilder {
+    public static final class KpiList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.KpiList)
+    KpiListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -10951,9 +10930,8 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.KpiList}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:monitoring.KpiList)
-        // @@protoc_insertion_point(builder_implements:monitoring.KpiList)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.KpiListOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.KpiList)
+        monitoring.Monitoring.KpiListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_KpiList_descriptor;
@@ -11420,8 +11398,8 @@ public final class Monitoring {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:monitoring.KpiDescriptorList)
-    KpiDescriptorListOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface KpiDescriptorListOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.KpiDescriptorList)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .monitoring.KpiDescriptor kpi_descriptor_list = 1;</code>
@@ -11452,9 +11430,8 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.KpiDescriptorList}
      */
-    public static final class // @@protoc_insertion_point(message_implements:monitoring.KpiDescriptorList)
-    // @@protoc_insertion_point(message_implements:monitoring.KpiDescriptorList)
-    KpiDescriptorList extends com.google.protobuf.GeneratedMessageV3 implements KpiDescriptorListOrBuilder {
+    public static final class KpiDescriptorList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.KpiDescriptorList)
+    KpiDescriptorListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -11669,9 +11646,8 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.KpiDescriptorList}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:monitoring.KpiDescriptorList)
-        // @@protoc_insertion_point(builder_implements:monitoring.KpiDescriptorList)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.KpiDescriptorListOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.KpiDescriptorList)
+        monitoring.Monitoring.KpiDescriptorListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_KpiDescriptorList_descriptor;
@@ -12138,8 +12114,8 @@ public final class Monitoring {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:monitoring.SubsDescriptor)
-    SubsDescriptorOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface SubsDescriptorOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.SubsDescriptor)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.monitoring.SubscriptionID subs_id = 1;</code>
@@ -12249,9 +12225,8 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.SubsDescriptor}
      */
-    public static final class // @@protoc_insertion_point(message_implements:monitoring.SubsDescriptor)
-    // @@protoc_insertion_point(message_implements:monitoring.SubsDescriptor)
-    SubsDescriptor extends com.google.protobuf.GeneratedMessageV3 implements SubsDescriptorOrBuilder {
+    public static final class SubsDescriptor extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.SubsDescriptor)
+    SubsDescriptorOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -12662,9 +12637,8 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.SubsDescriptor}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:monitoring.SubsDescriptor)
-        // @@protoc_insertion_point(builder_implements:monitoring.SubsDescriptor)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.SubsDescriptorOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.SubsDescriptor)
+        monitoring.Monitoring.SubsDescriptorOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_SubsDescriptor_descriptor;
@@ -13550,8 +13524,8 @@ public final class Monitoring {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:monitoring.SubscriptionID)
-    SubscriptionIDOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface SubscriptionIDOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.SubscriptionID)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Uuid subs_id = 1;</code>
@@ -13574,9 +13548,8 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.SubscriptionID}
      */
-    public static final class // @@protoc_insertion_point(message_implements:monitoring.SubscriptionID)
-    // @@protoc_insertion_point(message_implements:monitoring.SubscriptionID)
-    SubscriptionID extends com.google.protobuf.GeneratedMessageV3 implements SubscriptionIDOrBuilder {
+    public static final class SubscriptionID extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.SubscriptionID)
+    SubscriptionIDOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -13779,9 +13752,8 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.SubscriptionID}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:monitoring.SubscriptionID)
-        // @@protoc_insertion_point(builder_implements:monitoring.SubscriptionID)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.SubscriptionIDOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.SubscriptionID)
+        monitoring.Monitoring.SubscriptionIDOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_SubscriptionID_descriptor;
@@ -14091,8 +14063,8 @@ public final class Monitoring {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:monitoring.SubsResponse)
-    SubsResponseOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface SubsResponseOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.SubsResponse)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.monitoring.SubscriptionID subs_id = 1;</code>
@@ -14132,9 +14104,8 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.SubsResponse}
      */
-    public static final class // @@protoc_insertion_point(message_implements:monitoring.SubsResponse)
-    // @@protoc_insertion_point(message_implements:monitoring.SubsResponse)
-    SubsResponse extends com.google.protobuf.GeneratedMessageV3 implements SubsResponseOrBuilder {
+    public static final class SubsResponse extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.SubsResponse)
+    SubsResponseOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -14383,9 +14354,8 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.SubsResponse}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:monitoring.SubsResponse)
-        // @@protoc_insertion_point(builder_implements:monitoring.SubsResponse)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.SubsResponseOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.SubsResponse)
+        monitoring.Monitoring.SubsResponseOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_SubsResponse_descriptor;
@@ -14831,8 +14801,8 @@ public final class Monitoring {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:monitoring.SubsList)
-    SubsListOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface SubsListOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.SubsList)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .monitoring.SubsDescriptor subs_descriptor = 1;</code>
@@ -14863,9 +14833,8 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.SubsList}
      */
-    public static final class // @@protoc_insertion_point(message_implements:monitoring.SubsList)
-    // @@protoc_insertion_point(message_implements:monitoring.SubsList)
-    SubsList extends com.google.protobuf.GeneratedMessageV3 implements SubsListOrBuilder {
+    public static final class SubsList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.SubsList)
+    SubsListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -15080,9 +15049,8 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.SubsList}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:monitoring.SubsList)
-        // @@protoc_insertion_point(builder_implements:monitoring.SubsList)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.SubsListOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.SubsList)
+        monitoring.Monitoring.SubsListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_SubsList_descriptor;
@@ -15549,8 +15517,8 @@ public final class Monitoring {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:monitoring.AlarmDescriptor)
-    AlarmDescriptorOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface AlarmDescriptorOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.AlarmDescriptor)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.monitoring.AlarmID alarm_id = 1;</code>
@@ -15648,9 +15616,8 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.AlarmDescriptor}
      */
-    public static final class // @@protoc_insertion_point(message_implements:monitoring.AlarmDescriptor)
-    // @@protoc_insertion_point(message_implements:monitoring.AlarmDescriptor)
-    AlarmDescriptor extends com.google.protobuf.GeneratedMessageV3 implements AlarmDescriptorOrBuilder {
+    public static final class AlarmDescriptor extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.AlarmDescriptor)
+    AlarmDescriptorOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -16089,9 +16056,8 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.AlarmDescriptor}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:monitoring.AlarmDescriptor)
-        // @@protoc_insertion_point(builder_implements:monitoring.AlarmDescriptor)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.AlarmDescriptorOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.AlarmDescriptor)
+        monitoring.Monitoring.AlarmDescriptorOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_AlarmDescriptor_descriptor;
@@ -16991,8 +16957,8 @@ public final class Monitoring {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:monitoring.AlarmID)
-    AlarmIDOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface AlarmIDOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.AlarmID)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Uuid alarm_id = 1;</code>
@@ -17015,9 +16981,8 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.AlarmID}
      */
-    public static final class // @@protoc_insertion_point(message_implements:monitoring.AlarmID)
-    // @@protoc_insertion_point(message_implements:monitoring.AlarmID)
-    AlarmID extends com.google.protobuf.GeneratedMessageV3 implements AlarmIDOrBuilder {
+    public static final class AlarmID extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.AlarmID)
+    AlarmIDOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -17220,9 +17185,8 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.AlarmID}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:monitoring.AlarmID)
-        // @@protoc_insertion_point(builder_implements:monitoring.AlarmID)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.AlarmIDOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.AlarmID)
+        monitoring.Monitoring.AlarmIDOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_AlarmID_descriptor;
@@ -17532,8 +17496,8 @@ public final class Monitoring {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:monitoring.AlarmSubscription)
-    AlarmSubscriptionOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface AlarmSubscriptionOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.AlarmSubscription)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.monitoring.AlarmID alarm_id = 1;</code>
@@ -17568,9 +17532,8 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.AlarmSubscription}
      */
-    public static final class // @@protoc_insertion_point(message_implements:monitoring.AlarmSubscription)
-    // @@protoc_insertion_point(message_implements:monitoring.AlarmSubscription)
-    AlarmSubscription extends com.google.protobuf.GeneratedMessageV3 implements AlarmSubscriptionOrBuilder {
+    public static final class AlarmSubscription extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.AlarmSubscription)
+    AlarmSubscriptionOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -17819,9 +17782,8 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.AlarmSubscription}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:monitoring.AlarmSubscription)
-        // @@protoc_insertion_point(builder_implements:monitoring.AlarmSubscription)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.AlarmSubscriptionOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.AlarmSubscription)
+        monitoring.Monitoring.AlarmSubscriptionOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_AlarmSubscription_descriptor;
@@ -18227,8 +18189,8 @@ public final class Monitoring {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:monitoring.AlarmResponse)
-    AlarmResponseOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface AlarmResponseOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.AlarmResponse)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.monitoring.AlarmID alarm_id = 1;</code>
@@ -18280,9 +18242,8 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.AlarmResponse}
      */
-    public static final class // @@protoc_insertion_point(message_implements:monitoring.AlarmResponse)
-    // @@protoc_insertion_point(message_implements:monitoring.AlarmResponse)
-    AlarmResponse extends com.google.protobuf.GeneratedMessageV3 implements AlarmResponseOrBuilder {
+    public static final class AlarmResponse extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.AlarmResponse)
+    AlarmResponseOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -18580,9 +18541,8 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.AlarmResponse}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:monitoring.AlarmResponse)
-        // @@protoc_insertion_point(builder_implements:monitoring.AlarmResponse)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.AlarmResponseOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.AlarmResponse)
+        monitoring.Monitoring.AlarmResponseOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_AlarmResponse_descriptor;
@@ -19119,8 +19079,8 @@ public final class Monitoring {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:monitoring.AlarmList)
-    AlarmListOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface AlarmListOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.AlarmList)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .monitoring.AlarmDescriptor alarm_descriptor = 1;</code>
@@ -19151,9 +19111,8 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.AlarmList}
      */
-    public static final class // @@protoc_insertion_point(message_implements:monitoring.AlarmList)
-    // @@protoc_insertion_point(message_implements:monitoring.AlarmList)
-    AlarmList extends com.google.protobuf.GeneratedMessageV3 implements AlarmListOrBuilder {
+    public static final class AlarmList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.AlarmList)
+    AlarmListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -19368,9 +19327,8 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.AlarmList}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:monitoring.AlarmList)
-        // @@protoc_insertion_point(builder_implements:monitoring.AlarmList)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.AlarmListOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.AlarmList)
+        monitoring.Monitoring.AlarmListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_AlarmList_descriptor;
@@ -19837,8 +19795,8 @@ public final class Monitoring {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:monitoring.SSEMonitoringSubscriptionConfig)
-    SSEMonitoringSubscriptionConfigOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface SSEMonitoringSubscriptionConfigOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.SSEMonitoringSubscriptionConfig)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.DeviceId device_id = 1;</code>
@@ -19917,9 +19875,8 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.SSEMonitoringSubscriptionConfig}
      */
-    public static final class // @@protoc_insertion_point(message_implements:monitoring.SSEMonitoringSubscriptionConfig)
-    // @@protoc_insertion_point(message_implements:monitoring.SSEMonitoringSubscriptionConfig)
-    SSEMonitoringSubscriptionConfig extends com.google.protobuf.GeneratedMessageV3 implements SSEMonitoringSubscriptionConfigOrBuilder {
+    public static final class SSEMonitoringSubscriptionConfig extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.SSEMonitoringSubscriptionConfig)
+    SSEMonitoringSubscriptionConfigOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -20424,9 +20381,8 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.SSEMonitoringSubscriptionConfig}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:monitoring.SSEMonitoringSubscriptionConfig)
-        // @@protoc_insertion_point(builder_implements:monitoring.SSEMonitoringSubscriptionConfig)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.SSEMonitoringSubscriptionConfigOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.SSEMonitoringSubscriptionConfig)
+        monitoring.Monitoring.SSEMonitoringSubscriptionConfigOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_SSEMonitoringSubscriptionConfig_descriptor;
@@ -21102,8 +21058,8 @@ public final class Monitoring {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:monitoring.SSEMonitoringSubscriptionResponse)
-    SSEMonitoringSubscriptionResponseOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface SSEMonitoringSubscriptionResponseOrBuilder extends // @@protoc_insertion_point(interface_extends:monitoring.SSEMonitoringSubscriptionResponse)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>string identifier = 1;</code>
@@ -21133,9 +21089,8 @@ public final class Monitoring {
     /**
      * Protobuf type {@code monitoring.SSEMonitoringSubscriptionResponse}
      */
-    public static final class // @@protoc_insertion_point(message_implements:monitoring.SSEMonitoringSubscriptionResponse)
-    // @@protoc_insertion_point(message_implements:monitoring.SSEMonitoringSubscriptionResponse)
-    SSEMonitoringSubscriptionResponse extends com.google.protobuf.GeneratedMessageV3 implements SSEMonitoringSubscriptionResponseOrBuilder {
+    public static final class SSEMonitoringSubscriptionResponse extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:monitoring.SSEMonitoringSubscriptionResponse)
+    SSEMonitoringSubscriptionResponseOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -21390,9 +21345,8 @@ public final class Monitoring {
         /**
          * Protobuf type {@code monitoring.SSEMonitoringSubscriptionResponse}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:monitoring.SSEMonitoringSubscriptionResponse)
-        // @@protoc_insertion_point(builder_implements:monitoring.SSEMonitoringSubscriptionResponse)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements monitoring.Monitoring.SSEMonitoringSubscriptionResponseOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:monitoring.SSEMonitoringSubscriptionResponse)
+        monitoring.Monitoring.SSEMonitoringSubscriptionResponseOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return monitoring.Monitoring.internal_static_monitoring_SSEMonitoringSubscriptionResponse_descriptor;
diff --git a/src/ztp/target/generated-sources/grpc/ztp/Ztp.java b/src/ztp/target/generated-sources/grpc/ztp/Ztp.java
index 4e1c6ae37..0812fc8eb 100644
--- a/src/ztp/target/generated-sources/grpc/ztp/Ztp.java
+++ b/src/ztp/target/generated-sources/grpc/ztp/Ztp.java
@@ -262,8 +262,8 @@ public final class Ztp {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:ztp.DeviceRoleId)
-    DeviceRoleIdOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface DeviceRoleIdOrBuilder extends // @@protoc_insertion_point(interface_extends:ztp.DeviceRoleId)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.context.Uuid devRoleId = 1;</code>
@@ -303,9 +303,8 @@ public final class Ztp {
     /**
      * Protobuf type {@code ztp.DeviceRoleId}
      */
-    public static final class // @@protoc_insertion_point(message_implements:ztp.DeviceRoleId)
-    // @@protoc_insertion_point(message_implements:ztp.DeviceRoleId)
-    DeviceRoleId extends com.google.protobuf.GeneratedMessageV3 implements DeviceRoleIdOrBuilder {
+    public static final class DeviceRoleId extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:ztp.DeviceRoleId)
+    DeviceRoleIdOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -554,9 +553,8 @@ public final class Ztp {
         /**
          * Protobuf type {@code ztp.DeviceRoleId}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:ztp.DeviceRoleId)
-        // @@protoc_insertion_point(builder_implements:ztp.DeviceRoleId)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements ztp.Ztp.DeviceRoleIdOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:ztp.DeviceRoleId)
+        ztp.Ztp.DeviceRoleIdOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return ztp.Ztp.internal_static_ztp_DeviceRoleId_descriptor;
@@ -1002,8 +1000,8 @@ public final class Ztp {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:ztp.DeviceRole)
-    DeviceRoleOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface DeviceRoleOrBuilder extends // @@protoc_insertion_point(interface_extends:ztp.DeviceRole)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.ztp.DeviceRoleId devRoleId = 1;</code>
@@ -1038,9 +1036,8 @@ public final class Ztp {
     /**
      * Protobuf type {@code ztp.DeviceRole}
      */
-    public static final class // @@protoc_insertion_point(message_implements:ztp.DeviceRole)
-    // @@protoc_insertion_point(message_implements:ztp.DeviceRole)
-    DeviceRole extends com.google.protobuf.GeneratedMessageV3 implements DeviceRoleOrBuilder {
+    public static final class DeviceRole extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:ztp.DeviceRole)
+    DeviceRoleOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -1277,9 +1274,8 @@ public final class Ztp {
         /**
          * Protobuf type {@code ztp.DeviceRole}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:ztp.DeviceRole)
-        // @@protoc_insertion_point(builder_implements:ztp.DeviceRole)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements ztp.Ztp.DeviceRoleOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:ztp.DeviceRole)
+        ztp.Ztp.DeviceRoleOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return ztp.Ztp.internal_static_ztp_DeviceRole_descriptor;
@@ -1662,8 +1658,8 @@ public final class Ztp {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:ztp.DeviceRoleConfig)
-    DeviceRoleConfigOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface DeviceRoleConfigOrBuilder extends // @@protoc_insertion_point(interface_extends:ztp.DeviceRoleConfig)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.ztp.DeviceRole devRole = 1;</code>
@@ -1703,9 +1699,8 @@ public final class Ztp {
     /**
      * Protobuf type {@code ztp.DeviceRoleConfig}
      */
-    public static final class // @@protoc_insertion_point(message_implements:ztp.DeviceRoleConfig)
-    // @@protoc_insertion_point(message_implements:ztp.DeviceRoleConfig)
-    DeviceRoleConfig extends com.google.protobuf.GeneratedMessageV3 implements DeviceRoleConfigOrBuilder {
+    public static final class DeviceRoleConfig extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:ztp.DeviceRoleConfig)
+    DeviceRoleConfigOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -1954,9 +1949,8 @@ public final class Ztp {
         /**
          * Protobuf type {@code ztp.DeviceRoleConfig}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:ztp.DeviceRoleConfig)
-        // @@protoc_insertion_point(builder_implements:ztp.DeviceRoleConfig)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements ztp.Ztp.DeviceRoleConfigOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:ztp.DeviceRoleConfig)
+        ztp.Ztp.DeviceRoleConfigOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return ztp.Ztp.internal_static_ztp_DeviceRoleConfig_descriptor;
@@ -2402,8 +2396,8 @@ public final class Ztp {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:ztp.DeviceRoleList)
-    DeviceRoleListOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface DeviceRoleListOrBuilder extends // @@protoc_insertion_point(interface_extends:ztp.DeviceRoleList)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated .ztp.DeviceRole devRole = 1;</code>
@@ -2434,9 +2428,8 @@ public final class Ztp {
     /**
      * Protobuf type {@code ztp.DeviceRoleList}
      */
-    public static final class // @@protoc_insertion_point(message_implements:ztp.DeviceRoleList)
-    // @@protoc_insertion_point(message_implements:ztp.DeviceRoleList)
-    DeviceRoleList extends com.google.protobuf.GeneratedMessageV3 implements DeviceRoleListOrBuilder {
+    public static final class DeviceRoleList extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:ztp.DeviceRoleList)
+    DeviceRoleListOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -2651,9 +2644,8 @@ public final class Ztp {
         /**
          * Protobuf type {@code ztp.DeviceRoleList}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:ztp.DeviceRoleList)
-        // @@protoc_insertion_point(builder_implements:ztp.DeviceRoleList)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements ztp.Ztp.DeviceRoleListOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:ztp.DeviceRoleList)
+        ztp.Ztp.DeviceRoleListOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return ztp.Ztp.internal_static_ztp_DeviceRoleList_descriptor;
@@ -3120,8 +3112,8 @@ public final class Ztp {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:ztp.DeviceRoleState)
-    DeviceRoleStateOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface DeviceRoleStateOrBuilder extends // @@protoc_insertion_point(interface_extends:ztp.DeviceRoleState)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>.ztp.DeviceRoleId devRoleId = 1;</code>
@@ -3156,9 +3148,8 @@ public final class Ztp {
     /**
      * Protobuf type {@code ztp.DeviceRoleState}
      */
-    public static final class // @@protoc_insertion_point(message_implements:ztp.DeviceRoleState)
-    // @@protoc_insertion_point(message_implements:ztp.DeviceRoleState)
-    DeviceRoleState extends com.google.protobuf.GeneratedMessageV3 implements DeviceRoleStateOrBuilder {
+    public static final class DeviceRoleState extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:ztp.DeviceRoleState)
+    DeviceRoleStateOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -3395,9 +3386,8 @@ public final class Ztp {
         /**
          * Protobuf type {@code ztp.DeviceRoleState}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:ztp.DeviceRoleState)
-        // @@protoc_insertion_point(builder_implements:ztp.DeviceRoleState)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements ztp.Ztp.DeviceRoleStateOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:ztp.DeviceRoleState)
+        ztp.Ztp.DeviceRoleStateOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return ztp.Ztp.internal_static_ztp_DeviceRoleState_descriptor;
@@ -3780,8 +3770,8 @@ public final class Ztp {
         }
     }
 
-    public interface // @@protoc_insertion_point(interface_extends:ztp.DeviceDeletionResult)
-    DeviceDeletionResultOrBuilder extends com.google.protobuf.MessageOrBuilder {
+    public interface DeviceDeletionResultOrBuilder extends // @@protoc_insertion_point(interface_extends:ztp.DeviceDeletionResult)
+    com.google.protobuf.MessageOrBuilder {
 
         /**
          * <code>repeated string deleted = 1;</code>
@@ -3813,9 +3803,8 @@ public final class Ztp {
     /**
      * Protobuf type {@code ztp.DeviceDeletionResult}
      */
-    public static final class // @@protoc_insertion_point(message_implements:ztp.DeviceDeletionResult)
-    // @@protoc_insertion_point(message_implements:ztp.DeviceDeletionResult)
-    DeviceDeletionResult extends com.google.protobuf.GeneratedMessageV3 implements DeviceDeletionResultOrBuilder {
+    public static final class DeviceDeletionResult extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:ztp.DeviceDeletionResult)
+    DeviceDeletionResultOrBuilder {
 
         private static final long serialVersionUID = 0L;
 
@@ -4029,9 +4018,8 @@ public final class Ztp {
         /**
          * Protobuf type {@code ztp.DeviceDeletionResult}
          */
-        public static final class // @@protoc_insertion_point(builder_implements:ztp.DeviceDeletionResult)
-        // @@protoc_insertion_point(builder_implements:ztp.DeviceDeletionResult)
-        Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements ztp.Ztp.DeviceDeletionResultOrBuilder {
+        public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements // @@protoc_insertion_point(builder_implements:ztp.DeviceDeletionResult)
+        ztp.Ztp.DeviceDeletionResultOrBuilder {
 
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
                 return ztp.Ztp.internal_static_ztp_DeviceDeletionResult_descriptor;
diff --git a/src/ztp/target/kubernetes/kubernetes.yml b/src/ztp/target/kubernetes/kubernetes.yml
index 2d153068e..23494d5c7 100644
--- a/src/ztp/target/kubernetes/kubernetes.yml
+++ b/src/ztp/target/kubernetes/kubernetes.yml
@@ -3,8 +3,8 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
-    app.quarkus.io/commit-id: f6ca78538c88e1affff6dd8908e6f14379f5d9ac
-    app.quarkus.io/build-timestamp: 2025-10-27 - 16:23:04 +0000
+    app.quarkus.io/commit-id: 0539e363a3349889ebd7d3d7b0509744e2a4d0aa
+    app.quarkus.io/build-timestamp: 2025-10-28 - 10:09:20 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8080"
@@ -17,18 +17,18 @@ metadata:
   name: ztpservice
 spec:
   ports:
-    - name: grpc
-      port: 5050
+    - name: https
+      port: 443
       protocol: TCP
-      targetPort: 5050
+      targetPort: 8443
     - name: http
       port: 9192
       protocol: TCP
       targetPort: 8080
-    - name: https
-      port: 443
+    - name: grpc
+      port: 5050
       protocol: TCP
-      targetPort: 8443
+      targetPort: 5050
   selector:
     app.kubernetes.io/name: ztpservice
   type: ClusterIP
@@ -37,8 +37,8 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   annotations:
-    app.quarkus.io/commit-id: f6ca78538c88e1affff6dd8908e6f14379f5d9ac
-    app.quarkus.io/build-timestamp: 2025-10-27 - 16:23:04 +0000
+    app.quarkus.io/commit-id: 0539e363a3349889ebd7d3d7b0509744e2a4d0aa
+    app.quarkus.io/build-timestamp: 2025-10-28 - 10:09:20 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8080"
@@ -46,8 +46,8 @@ metadata:
   labels:
     app: ztpservice
     app.kubernetes.io/managed-by: quarkus
-    app.kubernetes.io/name: ztpservice
     app.kubernetes.io/version: 0.2.0
+    app.kubernetes.io/name: ztpservice
   name: ztpservice
 spec:
   replicas: 1
@@ -57,8 +57,8 @@ spec:
   template:
     metadata:
       annotations:
-        app.quarkus.io/commit-id: f6ca78538c88e1affff6dd8908e6f14379f5d9ac
-        app.quarkus.io/build-timestamp: 2025-10-27 - 16:23:04 +0000
+        app.quarkus.io/commit-id: 0539e363a3349889ebd7d3d7b0509744e2a4d0aa
+        app.quarkus.io/build-timestamp: 2025-10-28 - 10:09:20 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8080"
@@ -66,8 +66,8 @@ spec:
       labels:
         app: ztpservice
         app.kubernetes.io/managed-by: quarkus
-        app.kubernetes.io/name: ztpservice
         app.kubernetes.io/version: 0.2.0
+        app.kubernetes.io/name: ztpservice
     spec:
       containers:
         - env:
@@ -75,10 +75,10 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-            - name: CONTEXT_SERVICE_HOST
-              value: contextservice
             - name: DEVICE_SERVICE_HOST
               value: deviceservice
+            - name: CONTEXT_SERVICE_HOST
+              value: contextservice
           image: labs.etsi.org:5050/tfs/controller/ztp:0.2.0
           imagePullPolicy: Always
           livenessProbe:
@@ -93,14 +93,14 @@ spec:
             timeoutSeconds: 10
           name: ztpservice
           ports:
-            - containerPort: 5050
-              name: grpc
+            - containerPort: 8443
+              name: https
               protocol: TCP
             - containerPort: 8080
               name: http
               protocol: TCP
-            - containerPort: 8443
-              name: https
+            - containerPort: 5050
+              name: grpc
               protocol: TCP
           readinessProbe:
             failureThreshold: 3
-- 
GitLab


From ab2376f083271002e0c2bc439553208c476c5e50 Mon Sep 17 00:00:00 2001
From: gifrerenom <lluis.gifre@cttc.es>
Date: Tue, 28 Oct 2025 10:37:56 +0000
Subject: [PATCH 7/7] Dockerfiles for images based on Python 3.10:

- Fixed versions of pip, setuptools, wheel, pip-tools, as there is an update on pip>25.2 forcing pep_517
---
 src/osm_client/Dockerfile               | 6 +++---
 src/tests/tools/mock_osm_nbi/Dockerfile | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/osm_client/Dockerfile b/src/osm_client/Dockerfile
index 28ffc7001..9c8e7b6f4 100644
--- a/src/osm_client/Dockerfile
+++ b/src/osm_client/Dockerfile
@@ -31,9 +31,9 @@ RUN GRPC_HEALTH_PROBE_VERSION=v0.2.0 && \
     chmod +x /bin/grpc_health_probe
 
 # Get generic Python packages
-RUN python3 -m pip install --upgrade pip
-RUN python3 -m pip install --upgrade setuptools wheel
-RUN python3 -m pip install --upgrade pip-tools
+RUN python3 -m pip install --upgrade 'pip==25.2'
+RUN python3 -m pip install --upgrade 'setuptools==79.0.0' 'wheel==0.45.1'
+RUN python3 -m pip install --upgrade 'pip-tools==7.3.0'
 
 # Get common Python packages
 # Note: this step enables sharing the previous Docker build steps among all the Python components
diff --git a/src/tests/tools/mock_osm_nbi/Dockerfile b/src/tests/tools/mock_osm_nbi/Dockerfile
index 57d097166..4264ab46d 100644
--- a/src/tests/tools/mock_osm_nbi/Dockerfile
+++ b/src/tests/tools/mock_osm_nbi/Dockerfile
@@ -18,9 +18,9 @@ FROM python:3.10.16-slim
 ENV PYTHONUNBUFFERED=0
 
 # Get Python dependencies
-RUN python3 -m pip install --upgrade pip
-RUN python3 -m pip install --upgrade setuptools wheel
-RUN python3 -m pip install --upgrade pip-tools
+RUN python3 -m pip install --upgrade 'pip==25.2'
+RUN python3 -m pip install --upgrade 'setuptools==79.0.0' 'wheel==0.45.1'
+RUN python3 -m pip install --upgrade 'pip-tools==7.3.0'
 
 # Create component sub-folders, and get requirements
 RUN mkdir -p /var/mock_osm_nbi
-- 
GitLab