From cb73e6225d483fbfa193327c27628b87fbd16bd3 Mon Sep 17 00:00:00 2001 From: Rod A Santiago Date: Mon, 1 Aug 2016 17:25:07 -0700 Subject: [PATCH] updated Node message class with new fields --- daemon/core/api/core_pb2.py | 166 +++++++++++++++++++++++++++++++++--- 1 file changed, 156 insertions(+), 10 deletions(-) diff --git a/daemon/core/api/core_pb2.py b/daemon/core/api/core_pb2.py index 7dbc6051..d44723c3 100644 --- a/daemon/core/api/core_pb2.py +++ b/daemon/core/api/core_pb2.py @@ -13,7 +13,7 @@ from google.protobuf import descriptor_pb2 DESCRIPTOR = _descriptor.FileDescriptor( name='core.proto', package='core_proto', - serialized_pb='\n\ncore.proto\x12\ncore_proto\"\xb7\x03\n\x05\x45vent\x12\x32\n\x08msg_type\x18\x01 \x01(\x0e\x32\x19.core_proto.Event.MsgType:\x05STATE\x12\x33\n\x08mod_type\x18\x02 \x01(\x0e\x32\x19.core_proto.Event.ModType:\x06MODIFY\x12\x10\n\x08node_idx\x18\x03 \x01(\x05\x12\x0f\n\x07\x64\x65v_idx\x18\x04 \x01(\x05\x12\x0f\n\x07net_idx\x18\x05 \x01(\x05\x12\x13\n\x0b\x63hannel_idx\x18\x06 \x01(\x05\x12\x10\n\x08oldstate\x18\x07 \x01(\x05\x12\x10\n\x08newstate\x18\x08 \x01(\x05\"7\n\x07MsgType\x12\x08\n\x04NODE\x10\x00\x12\n\n\x06\x44\x45VICE\x10\x01\x12\x0b\n\x07\x43HANNEL\x10\x02\x12\t\n\x05STATE\x10\x03\"4\n\x07ModType\x12\x07\n\x03\x41\x44\x44\x10\x00\x12\n\n\x06\x44\x45LETE\x10\x01\x12\n\n\x06MODIFY\x10\x02\x12\x08\n\x04MOVE\x10\x03\"i\n\x05State\x12\x0e\n\nDEFINITION\x10\x00\x12\x11\n\rCONFIGURATION\x10\x01\x12\x11\n\rINSTANTIATION\x10\x02\x12\x0b\n\x07RUNTIME\x10\x03\x12\x0f\n\x0b\x44\x41TACOLLECT\x10\x04\x12\x0c\n\x08SHUTDOWN\x10\x05\"-\n\x08\x45ndpoint\x12\x0f\n\x07\x64\x65v_idx\x18\x01 \x02(\x05\x12\x10\n\x08intf_idx\x18\x02 \x02(\x05\"\xdd\x02\n\x07\x43hannel\x12\x0b\n\x03idx\x18\x01 \x02(\x05\x12\'\n\tendpoints\x18\x02 \x03(\x0b\x32\x14.core_proto.Endpoint\x12\x10\n\x05\x64\x65lay\x18\x03 \x01(\x03:\x01\x30\x12\x14\n\tbandwidth\x18\x04 \x01(\x03:\x01\x30\x12\x0e\n\x03per\x18\x05 \x01(\x01:\x01\x30\x12\x0f\n\x04\x64ups\x18\x06 \x01(\x01:\x01\x30\x12\x11\n\x06jitter\x18\x07 \x01(\x01:\x01\x30\x12\x0e\n\x03mer\x18\x08 \x01(\x01:\x01\x30\x12\x10\n\x05\x62urst\x18\t \x01(\x01:\x01\x30\x12\x36\n\tlink_type\x18\n \x01(\x0e\x32\x1c.core_proto.Channel.LinkType:\x05WIRED\x12\x16\n\x0eunidirectional\x18\x0b \x01(\x08\x12\x15\n\rdisplay_props\x18\x0c \x01(\t\x12\x12\n\ntunnel_key\x18\r \x01(\x05\"#\n\x08LinkType\x12\x0c\n\x08WIRELESS\x10\x01\x12\t\n\x05WIRED\x10\x02\"K\n\x07Network\x12\x0b\n\x03idx\x18\x01 \x02(\x05\x12\x0c\n\x04name\x18\x02 \x01(\t\x12%\n\x08\x63hannels\x18\x03 \x03(\x0b\x32\x13.core_proto.Channel\"\x8d\x01\n\x07Service\x12\x0b\n\x03idx\x18\x01 \x02(\x05\x12\x10\n\x08standard\x18\x02 \x01(\t\x12\x0c\n\x04name\x18\x03 \x01(\t\x12\x14\n\x0cstart_script\x18\x04 \x01(\t\x12\x13\n\x0bstop_script\x18\x05 \x01(\t\x12\x15\n\rconfiguration\x18\x06 \x01(\t\x12\x13\n\x0b\x64irectories\x18\x07 \x01(\t\"\x80\x01\n\tInterface\x12\x0b\n\x03idx\x18\x01 \x02(\x05\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x10\n\x08mac_addr\x18\x03 \x01(\t\x12\x10\n\x08ip4_addr\x18\x04 \x01(\t\x12\x10\n\x08ip4_mask\x18\x05 \x01(\t\x12\x10\n\x08ip6_addr\x18\x06 \x01(\t\x12\x10\n\x08ip6_mask\x18\x07 \x01(\t\"`\n\x06\x44\x65vice\x12\x0b\n\x03idx\x18\x01 \x02(\x05\x12\x0c\n\x04name\x18\x02 \x01(\t\x12)\n\ninterfaces\x18\x03 \x03(\x0b\x32\x15.core_proto.Interface\x12\x10\n\x08location\x18\x04 \x01(\t\"\x85\x01\n\x04Node\x12\x0b\n\x03idx\x18\x01 \x02(\x05\x12\x0c\n\x04name\x18\x02 \x01(\t\x12)\n\ninterfaces\x18\x03 \x03(\x0b\x32\x15.core_proto.Interface\x12%\n\x08services\x18\x04 \x03(\x0b\x32\x13.core_proto.Service\x12\x10\n\x08location\x18\x05 \x01(\t\"\x9d\x01\n\nExperiment\x12\x14\n\x0c\x65xperimentId\x18\x01 \x01(\t\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x1f\n\x05nodes\x18\x03 \x03(\x0b\x32\x10.core_proto.Node\x12#\n\x07\x64\x65vices\x18\x04 \x03(\x0b\x32\x12.core_proto.Device\x12%\n\x08networks\x18\x05 \x03(\x0b\x32\x13.core_proto.Network\"\x83\x01\n\x07Session\x12\x10\n\x08\x63lientId\x18\x01 \x02(\t\x12\x10\n\x08port_num\x18\x02 \x01(\x05\x12*\n\nexperiment\x18\x03 \x01(\x0b\x32\x16.core_proto.Experiment\x12(\n\x08\x61ll_exps\x18\x04 \x03(\x0b\x32\x16.core_proto.Experiment\")\n\x0c\x45rrorMessage\x12\x0c\n\x04\x63ode\x18\x01 \x02(\x05\x12\x0b\n\x03msg\x18\x02 \x01(\t\"\xee\x01\n\x0b\x43oreMessage\x12$\n\x07session\x18\x01 \x01(\x0b\x32\x13.core_proto.Session\x12*\n\nexperiment\x18\x02 \x01(\x0b\x32\x16.core_proto.Experiment\x12\x1e\n\x04node\x18\x03 \x01(\x0b\x32\x10.core_proto.Node\x12\"\n\x06\x64\x65vice\x18\x04 \x01(\x0b\x32\x12.core_proto.Device\x12 \n\x05\x65vent\x18\x05 \x01(\x0b\x32\x11.core_proto.Event\x12\'\n\x05\x65rror\x18\x06 \x01(\x0b\x32\x18.core_proto.ErrorMessage') + serialized_pb='\n\ncore.proto\x12\ncore_proto\"\xb7\x03\n\x05\x45vent\x12\x32\n\x08msg_type\x18\x01 \x01(\x0e\x32\x19.core_proto.Event.MsgType:\x05STATE\x12\x33\n\x08mod_type\x18\x02 \x01(\x0e\x32\x19.core_proto.Event.ModType:\x06MODIFY\x12\x10\n\x08node_idx\x18\x03 \x01(\x05\x12\x0f\n\x07\x64\x65v_idx\x18\x04 \x01(\x05\x12\x0f\n\x07net_idx\x18\x05 \x01(\x05\x12\x13\n\x0b\x63hannel_idx\x18\x06 \x01(\x05\x12\x10\n\x08oldstate\x18\x07 \x01(\x05\x12\x10\n\x08newstate\x18\x08 \x01(\x05\"7\n\x07MsgType\x12\x08\n\x04NODE\x10\x00\x12\n\n\x06\x44\x45VICE\x10\x01\x12\x0b\n\x07\x43HANNEL\x10\x02\x12\t\n\x05STATE\x10\x03\"4\n\x07ModType\x12\x07\n\x03\x41\x44\x44\x10\x00\x12\n\n\x06\x44\x45LETE\x10\x01\x12\n\n\x06MODIFY\x10\x02\x12\x08\n\x04MOVE\x10\x03\"i\n\x05State\x12\x0e\n\nDEFINITION\x10\x00\x12\x11\n\rCONFIGURATION\x10\x01\x12\x11\n\rINSTANTIATION\x10\x02\x12\x0b\n\x07RUNTIME\x10\x03\x12\x0f\n\x0b\x44\x41TACOLLECT\x10\x04\x12\x0c\n\x08SHUTDOWN\x10\x05\"-\n\x08\x45ndpoint\x12\x0f\n\x07\x64\x65v_idx\x18\x01 \x02(\x05\x12\x10\n\x08intf_idx\x18\x02 \x02(\x05\"\xdd\x02\n\x07\x43hannel\x12\x0b\n\x03idx\x18\x01 \x02(\x05\x12\'\n\tendpoints\x18\x02 \x03(\x0b\x32\x14.core_proto.Endpoint\x12\x10\n\x05\x64\x65lay\x18\x03 \x01(\x03:\x01\x30\x12\x14\n\tbandwidth\x18\x04 \x01(\x03:\x01\x30\x12\x0e\n\x03per\x18\x05 \x01(\x01:\x01\x30\x12\x0f\n\x04\x64ups\x18\x06 \x01(\x01:\x01\x30\x12\x11\n\x06jitter\x18\x07 \x01(\x01:\x01\x30\x12\x0e\n\x03mer\x18\x08 \x01(\x01:\x01\x30\x12\x10\n\x05\x62urst\x18\t \x01(\x01:\x01\x30\x12\x36\n\tlink_type\x18\n \x01(\x0e\x32\x1c.core_proto.Channel.LinkType:\x05WIRED\x12\x16\n\x0eunidirectional\x18\x0b \x01(\x08\x12\x15\n\rdisplay_props\x18\x0c \x01(\t\x12\x12\n\ntunnel_key\x18\r \x01(\x05\"#\n\x08LinkType\x12\x0c\n\x08WIRELESS\x10\x01\x12\t\n\x05WIRED\x10\x02\"K\n\x07Network\x12\x0b\n\x03idx\x18\x01 \x02(\x05\x12\x0c\n\x04name\x18\x02 \x01(\t\x12%\n\x08\x63hannels\x18\x03 \x03(\x0b\x32\x13.core_proto.Channel\"\x8d\x01\n\x07Service\x12\x0b\n\x03idx\x18\x01 \x02(\x05\x12\x10\n\x08standard\x18\x02 \x01(\t\x12\x0c\n\x04name\x18\x03 \x01(\t\x12\x14\n\x0cstart_script\x18\x04 \x01(\t\x12\x13\n\x0bstop_script\x18\x05 \x01(\t\x12\x15\n\rconfiguration\x18\x06 \x01(\t\x12\x13\n\x0b\x64irectories\x18\x07 \x01(\t\"\x80\x01\n\tInterface\x12\x0b\n\x03idx\x18\x01 \x02(\x05\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x10\n\x08mac_addr\x18\x03 \x01(\t\x12\x10\n\x08ip4_addr\x18\x04 \x01(\t\x12\x10\n\x08ip4_mask\x18\x05 \x01(\t\x12\x10\n\x08ip6_addr\x18\x06 \x01(\t\x12\x10\n\x08ip6_mask\x18\x07 \x01(\t\"`\n\x06\x44\x65vice\x12\x0b\n\x03idx\x18\x01 \x02(\x05\x12\x0c\n\x04name\x18\x02 \x01(\t\x12)\n\ninterfaces\x18\x03 \x03(\x0b\x32\x15.core_proto.Interface\x12\x10\n\x08location\x18\x04 \x01(\t\"\xde\x03\n\x04Node\x12\x0b\n\x03idx\x18\x01 \x02(\x05\x12\x0c\n\x04name\x18\x02 \x01(\t\x12)\n\ninterfaces\x18\x03 \x03(\x0b\x32\x15.core_proto.Interface\x12%\n\x08services\x18\x04 \x03(\x0b\x32\x13.core_proto.Service\x12\x10\n\x08location\x18\x05 \x01(\t\x12\x12\n\nmodel_type\x18\x06 \x01(\t\x12\x12\n\nemu_server\x18\x07 \x01(\t\x12\x13\n\x0bsession_ids\x18\x08 \x01(\t\x12\r\n\x05x_pos\x18\t \x01(\x05\x12\r\n\x05y_pos\x18\n \x01(\x05\x12\x0e\n\x06\x63\x61nvas\x18\x0b \x01(\x05\x12\x0e\n\x06\x65mu_id\x18\x0c \x01(\x05\x12\x0e\n\x06net_id\x18\r \x01(\x05\x12\x10\n\x08latitude\x18\x0e \x01(\t\x12\x11\n\tlongitude\x18\x0f \x01(\t\x12\x10\n\x08\x61ltitude\x18\x10 \x01(\t\x12\x0c\n\x04icon\x18\x11 \x01(\t\x12\x0e\n\x06opaque\x18\x12 \x01(\t\"w\n\x04type\x12\x0b\n\x07\x64\x65\x66\x61ult\x10\x00\x12\x0c\n\x08physical\x10\x01\x12\x07\n\x03xen\x10\x02\x12\n\n\x06switch\x10\x03\x12\x07\n\x03hub\x10\x04\x12\x08\n\x04wlan\x10\x05\x12\x08\n\x04rj45\x10\x06\x12\n\n\x06tunnel\x10\x07\x12\x0b\n\x07ktunnel\x10\x08\x12\t\n\x05\x65mane\x10\t\"\x9d\x01\n\nExperiment\x12\x14\n\x0c\x65xperimentId\x18\x01 \x01(\t\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x1f\n\x05nodes\x18\x03 \x03(\x0b\x32\x10.core_proto.Node\x12#\n\x07\x64\x65vices\x18\x04 \x03(\x0b\x32\x12.core_proto.Device\x12%\n\x08networks\x18\x05 \x03(\x0b\x32\x13.core_proto.Network\"\x83\x01\n\x07Session\x12\x10\n\x08\x63lientId\x18\x01 \x02(\t\x12\x10\n\x08port_num\x18\x02 \x01(\x05\x12*\n\nexperiment\x18\x03 \x01(\x0b\x32\x16.core_proto.Experiment\x12(\n\x08\x61ll_exps\x18\x04 \x03(\x0b\x32\x16.core_proto.Experiment\")\n\x0c\x45rrorMessage\x12\x0c\n\x04\x63ode\x18\x01 \x02(\x05\x12\x0b\n\x03msg\x18\x02 \x01(\t\"\xee\x01\n\x0b\x43oreMessage\x12$\n\x07session\x18\x01 \x01(\x0b\x32\x13.core_proto.Session\x12*\n\nexperiment\x18\x02 \x01(\x0b\x32\x16.core_proto.Experiment\x12\x1e\n\x04node\x18\x03 \x01(\x0b\x32\x10.core_proto.Node\x12\"\n\x06\x64\x65vice\x18\x04 \x01(\x0b\x32\x12.core_proto.Device\x12 \n\x05\x65vent\x18\x05 \x01(\x0b\x32\x11.core_proto.Event\x12\'\n\x05\x65rror\x18\x06 \x01(\x0b\x32\x18.core_proto.ErrorMessage') @@ -133,6 +133,59 @@ _CHANNEL_LINKTYPE = _descriptor.EnumDescriptor( serialized_end=865, ) +_NODE_TYPE = _descriptor.EnumDescriptor( + name='type', + full_name='core_proto.Node.type', + filename=None, + file=DESCRIPTOR, + values=[ + _descriptor.EnumValueDescriptor( + name='default', index=0, number=0, + options=None, + type=None), + _descriptor.EnumValueDescriptor( + name='physical', index=1, number=1, + options=None, + type=None), + _descriptor.EnumValueDescriptor( + name='xen', index=2, number=2, + options=None, + type=None), + _descriptor.EnumValueDescriptor( + name='switch', index=3, number=3, + options=None, + type=None), + _descriptor.EnumValueDescriptor( + name='hub', index=4, number=4, + options=None, + type=None), + _descriptor.EnumValueDescriptor( + name='wlan', index=5, number=5, + options=None, + type=None), + _descriptor.EnumValueDescriptor( + name='rj45', index=6, number=6, + options=None, + type=None), + _descriptor.EnumValueDescriptor( + name='tunnel', index=7, number=7, + options=None, + type=None), + _descriptor.EnumValueDescriptor( + name='ktunnel', index=8, number=8, + options=None, + type=None), + _descriptor.EnumValueDescriptor( + name='emane', index=9, number=9, + options=None, + type=None), + ], + containing_type=None, + options=None, + serialized_start=1677, + serialized_end=1796, +) + _EVENT = _descriptor.Descriptor( name='Event', @@ -635,17 +688,109 @@ _NODE = _descriptor.Descriptor( message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), + _descriptor.FieldDescriptor( + name='model_type', full_name='core_proto.Node.model_type', index=5, + number=6, type=9, cpp_type=9, label=1, + has_default_value=False, default_value=unicode("", "utf-8"), + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + options=None), + _descriptor.FieldDescriptor( + name='emu_server', full_name='core_proto.Node.emu_server', index=6, + number=7, type=9, cpp_type=9, label=1, + has_default_value=False, default_value=unicode("", "utf-8"), + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + options=None), + _descriptor.FieldDescriptor( + name='session_ids', full_name='core_proto.Node.session_ids', index=7, + number=8, type=9, cpp_type=9, label=1, + has_default_value=False, default_value=unicode("", "utf-8"), + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + options=None), + _descriptor.FieldDescriptor( + name='x_pos', full_name='core_proto.Node.x_pos', index=8, + number=9, type=5, cpp_type=1, label=1, + has_default_value=False, default_value=0, + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + options=None), + _descriptor.FieldDescriptor( + name='y_pos', full_name='core_proto.Node.y_pos', index=9, + number=10, type=5, cpp_type=1, label=1, + has_default_value=False, default_value=0, + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + options=None), + _descriptor.FieldDescriptor( + name='canvas', full_name='core_proto.Node.canvas', index=10, + number=11, type=5, cpp_type=1, label=1, + has_default_value=False, default_value=0, + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + options=None), + _descriptor.FieldDescriptor( + name='emu_id', full_name='core_proto.Node.emu_id', index=11, + number=12, type=5, cpp_type=1, label=1, + has_default_value=False, default_value=0, + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + options=None), + _descriptor.FieldDescriptor( + name='net_id', full_name='core_proto.Node.net_id', index=12, + number=13, type=5, cpp_type=1, label=1, + has_default_value=False, default_value=0, + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + options=None), + _descriptor.FieldDescriptor( + name='latitude', full_name='core_proto.Node.latitude', index=13, + number=14, type=9, cpp_type=9, label=1, + has_default_value=False, default_value=unicode("", "utf-8"), + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + options=None), + _descriptor.FieldDescriptor( + name='longitude', full_name='core_proto.Node.longitude', index=14, + number=15, type=9, cpp_type=9, label=1, + has_default_value=False, default_value=unicode("", "utf-8"), + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + options=None), + _descriptor.FieldDescriptor( + name='altitude', full_name='core_proto.Node.altitude', index=15, + number=16, type=9, cpp_type=9, label=1, + has_default_value=False, default_value=unicode("", "utf-8"), + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + options=None), + _descriptor.FieldDescriptor( + name='icon', full_name='core_proto.Node.icon', index=16, + number=17, type=9, cpp_type=9, label=1, + has_default_value=False, default_value=unicode("", "utf-8"), + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + options=None), + _descriptor.FieldDescriptor( + name='opaque', full_name='core_proto.Node.opaque', index=17, + number=18, type=9, cpp_type=9, label=1, + has_default_value=False, default_value=unicode("", "utf-8"), + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + options=None), ], extensions=[ ], nested_types=[], enum_types=[ + _NODE_TYPE, ], options=None, is_extendable=False, extension_ranges=[], serialized_start=1318, - serialized_end=1451, + serialized_end=1796, ) @@ -700,8 +845,8 @@ _EXPERIMENT = _descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], - serialized_start=1454, - serialized_end=1611, + serialized_start=1799, + serialized_end=1956, ) @@ -749,8 +894,8 @@ _SESSION = _descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], - serialized_start=1614, - serialized_end=1745, + serialized_start=1959, + serialized_end=2090, ) @@ -784,8 +929,8 @@ _ERRORMESSAGE = _descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], - serialized_start=1747, - serialized_end=1788, + serialized_start=2092, + serialized_end=2133, ) @@ -847,8 +992,8 @@ _COREMESSAGE = _descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], - serialized_start=1791, - serialized_end=2029, + serialized_start=2136, + serialized_end=2374, ) _EVENT.fields_by_name['msg_type'].enum_type = _EVENT_MSGTYPE @@ -863,6 +1008,7 @@ _NETWORK.fields_by_name['channels'].message_type = _CHANNEL _DEVICE.fields_by_name['interfaces'].message_type = _INTERFACE _NODE.fields_by_name['interfaces'].message_type = _INTERFACE _NODE.fields_by_name['services'].message_type = _SERVICE +_NODE_TYPE.containing_type = _NODE; _EXPERIMENT.fields_by_name['nodes'].message_type = _NODE _EXPERIMENT.fields_by_name['devices'].message_type = _DEVICE _EXPERIMENT.fields_by_name['networks'].message_type = _NETWORK