Merge branch 'develop' of https://labs.etsi.org/rep/tfs/controller into fix/ofc22-tests (8053fb61) · Commits · TFS / controller

proto/context.proto

+1 −0

Original line number	Diff line number	Diff line
		@@ -171,6 +171,7 @@ enum DeviceDriverEnum {
		DEVICEDRIVER_P4 = 3;
		DEVICEDRIVER_IETF_NETWORK_TOPOLOGY = 4;
		DEVICEDRIVER_ONF_TR_352 = 5;
		DEVICEDRIVER_XR = 6;
		}

		enum DeviceOperationalStatusEnum {

src/automation/src/main/java/eu/teraflow/automation/Serializer.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -851,6 +851,8 @@ public class Serializer {
		return ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_IETF_NETWORK_TOPOLOGY;
		case ONF_TR_352:
		return ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_ONF_TR_352;
		case XR:
		return ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_XR;
		case UNDEFINED:
		default:
		return ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_UNDEFINED;
		@@ -870,6 +872,8 @@ public class Serializer {
		return DeviceDriverEnum.IETF_NETWORK_TOPOLOGY;
		case DEVICEDRIVER_ONF_TR_352:
		return DeviceDriverEnum.ONF_TR_352;
		case DEVICEDRIVER_XR:
		return DeviceDriverEnum.XR;
		case DEVICEDRIVER_UNDEFINED:
		case UNRECOGNIZED:
		default:

src/automation/src/main/java/eu/teraflow/automation/context/model/DeviceDriverEnum.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -22,5 +22,6 @@ public enum DeviceDriverEnum {
		TRANSPORT_API,
		P4,
		IETF_NETWORK_TOPOLOGY,
		ONF_TR_352
		ONF_TR_352,
		XR
		}

src/automation/src/test/java/eu/teraflow/automation/SerializerTest.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -1214,6 +1214,7 @@ class SerializerTest {
		Arguments.of(
		DeviceDriverEnum.ONF_TR_352,
		ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_ONF_TR_352),
		Arguments.of(DeviceDriverEnum.XR, ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_XR),
		Arguments.of(
		DeviceDriverEnum.UNDEFINED, ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_UNDEFINED));
		}

src/automation/target/generated-sources/grpc/context/ContextOuterClass.java

+99 −90

Original line number	Diff line number	Diff line
		@@ -173,6 +173,10 @@ public final class ContextOuterClass {
		* <code>DEVICEDRIVER_ONF_TR_352 = 5;</code>
		*/
		DEVICEDRIVER_ONF_TR_352(5),
		/**
		* <code>DEVICEDRIVER_XR = 6;</code>
		*/
		DEVICEDRIVER_XR(6),
		UNRECOGNIZED(-1),
		;

		@@ -204,6 +208,10 @@ public final class ContextOuterClass {
		* <code>DEVICEDRIVER_ONF_TR_352 = 5;</code>
		*/
		public static final int DEVICEDRIVER_ONF_TR_352_VALUE = 5;
		/**
		* <code>DEVICEDRIVER_XR = 6;</code>
		*/
		public static final int DEVICEDRIVER_XR_VALUE = 6;


		public final int getNumber() {
		@@ -236,6 +244,7 @@ public final class ContextOuterClass {
		case 3: return DEVICEDRIVER_P4;
		case 4: return DEVICEDRIVER_IETF_NETWORK_TOPOLOGY;
		case 5: return DEVICEDRIVER_ONF_TR_352;
		case 6: return DEVICEDRIVER_XR;
		default: return null;
		}
		}
		@@ -62318,100 +62327,100 @@ public final class ContextOuterClass {
		"ntext.ContextId\022\025\n\rauthenticated\030\002 \001(\010*j" +
		"\n\rEventTypeEnum\022\027\n\023EVENTTYPE_UNDEFINED\020\000" +
		"\022\024\n\020EVENTTYPE_CREATE\020\001\022\024\n\020EVENTTYPE_UPDA" +
		"TE\020\002\022\024\n\020EVENTTYPE_REMOVE\020\003*\305\001\n\020DeviceDri" +
		"TE\020\002\022\024\n\020EVENTTYPE_REMOVE\020\003*\332\001\n\020DeviceDri" +
		"verEnum\022\032\n\026DEVICEDRIVER_UNDEFINED\020\000\022\033\n\027D" +
		"EVICEDRIVER_OPENCONFIG\020\001\022\036\n\032DEVICEDRIVER" +
		"_TRANSPORT_API\020\002\022\023\n\017DEVICEDRIVER_P4\020\003\022&\n" +
		"\"DEVICEDRIVER_IETF_NETWORK_TOPOLOGY\020\004\022\033\n" +
		"\027DEVICEDRIVER_ONF_TR_352\020\005*\217\001\n\033DeviceOpe" +
		"rationalStatusEnum\022%\n!DEVICEOPERATIONALS" +
		"TATUS_UNDEFINED\020\000\022$\n DEVICEOPERATIONALST" +
		"ATUS_DISABLED\020\001\022#\n\037DEVICEOPERATIONALSTAT" +
		"US_ENABLED\020\002*\201\001\n\017ServiceTypeEnum\022\027\n\023SERV" +
		"ICETYPE_UNKNOWN\020\000\022\024\n\020SERVICETYPE_L3NM\020\001\022" +
		"\024\n\020SERVICETYPE_L2NM\020\002\022)\n%SERVICETYPE_TAP" +
		"I_CONNECTIVITY_SERVICE\020\003*\250\001\n\021ServiceStat" +
		"usEnum\022\033\n\027SERVICESTATUS_UNDEFINED\020\000\022\031\n\025S" +
		"ERVICESTATUS_PLANNED\020\001\022\030\n\024SERVICESTATUS_" +
		"ACTIVE\020\002\022!\n\035SERVICESTATUS_PENDING_REMOVA" +
		"L\020\003\022\036\n\032SERVICESTATUS_SLA_VIOLATED\020\004*\251\001\n\017" +
		"SliceStatusEnum\022\031\n\025SLICESTATUS_UNDEFINED" +
		"\020\000\022\027\n\023SLICESTATUS_PLANNED\020\001\022\024\n\020SLICESTAT" +
		"US_INIT\020\002\022\026\n\022SLICESTATUS_ACTIVE\020\003\022\026\n\022SLI" +
		"CESTATUS_DEINIT\020\004\022\034\n\030SLICESTATUS_SLA_VIO" +
		"LATED\020\005*]\n\020ConfigActionEnum\022\032\n\026CONFIGACT" +
		"ION_UNDEFINED\020\000\022\024\n\020CONFIGACTION_SET\020\001\022\027\n" +
		"\023CONFIGACTION_DELETE\020\002*\203\002\n\022IsolationLeve" +
		"lEnum\022\020\n\014NO_ISOLATION\020\000\022\026\n\022PHYSICAL_ISOL" +
		"ATION\020\001\022\025\n\021LOGICAL_ISOLATION\020\002\022\025\n\021PROCES" +
		"S_ISOLATION\020\003\022\035\n\031PHYSICAL_MEMORY_ISOLATI" +
		"ON\020\004\022\036\n\032PHYSICAL_NETWORK_ISOLATION\020\005\022\036\n\032" +
		"VIRTUAL_RESOURCE_ISOLATION\020\006\022\037\n\033NETWORK_" +
		"FUNCTIONS_ISOLATION\020\007\022\025\n\021SERVICE_ISOLATI" +
		"ON\020\0102\331\023\n\016ContextService\022:\n\016ListContextId" +
		"s\022\016.context.Empty\032\026.context.ContextIdLis" +
		"t\"\000\0226\n\014ListContexts\022\016.context.Empty\032\024.co" +
		"ntext.ContextList\"\000\0224\n\nGetContext\022\022.cont" +
		"ext.ContextId\032\020.context.Context\"\000\0224\n\nSet" +
		"Context\022\020.context.Context\032\022.context.Cont" +
		"extId\"\000\0225\n\rRemoveContext\022\022.context.Conte" +
		"xtId\032\016.context.Empty\"\000\022=\n\020GetContextEven" +
		"ts\022\016.context.Empty\032\025.context.ContextEven" +
		"t\"\0000\001\022@\n\017ListTopologyIds\022\022.context.Conte" +
		"xtId\032\027.context.TopologyIdList\"\000\022=\n\016ListT" +
		"opologies\022\022.context.ContextId\032\025.context." +
		"TopologyList\"\000\0227\n\013GetTopology\022\023.context." +
		"TopologyId\032\021.context.Topology\"\000\0227\n\013SetTo" +
		"pology\022\021.context.Topology\032\023.context.Topo" +
		"logyId\"\000\0227\n\016RemoveTopology\022\023.context.Top" +
		"ologyId\032\016.context.Empty\"\000\022?\n\021GetTopology" +
		"Events\022\016.context.Empty\032\026.context.Topolog" +
		"yEvent\"\0000\001\0228\n\rListDeviceIds\022\016.context.Em" +
		"pty\032\025.context.DeviceIdList\"\000\0224\n\013ListDevi" +
		"ces\022\016.context.Empty\032\023.context.DeviceList" +
		"\"\000\0221\n\tGetDevice\022\021.context.DeviceId\032\017.con" +
		"text.Device\"\000\0221\n\tSetDevice\022\017.context.Dev" +
		"ice\032\021.context.DeviceId\"\000\0223\n\014RemoveDevice" +
		"\022\021.context.DeviceId\032\016.context.Empty\"\000\022;\n" +
		"\017GetDeviceEvents\022\016.context.Empty\032\024.conte" +
		"xt.DeviceEvent\"\0000\001\0224\n\013ListLinkIds\022\016.cont" +
		"ext.Empty\032\023.context.LinkIdList\"\000\0220\n\tList" +
		"Links\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.Link\032\017.cont" +
		"ext.LinkId\"\000\022/\n\nRemoveLink\022\017.context.Lin" +
		"kId\032\016.context.Empty\"\000\0227\n\rGetLinkEvents\022\016" +
		".context.Empty\032\022.context.LinkEvent\"\0000\001\022>" +
		"\n\016ListServiceIds\022\022.context.ContextId\032\026.c" +
		"ontext.ServiceIdList\"\000\022:\n\014ListServices\022\022" +
		".context.ContextId\032\024.context.ServiceList" +
		"\"\000\0224\n\nGetService\022\022.context.ServiceId\032\020.c" +
		"ontext.Service\"\000\0224\n\nSetService\022\020.context" +
		".Service\032\022.context.ServiceId\"\000\0226\n\014UnsetS" +
		"ervice\022\020.context.Service\032\022.context.Servi" +
		"ceId\"\000\0225\n\rRemoveService\022\022.context.Servic" +
		"eId\032\016.context.Empty\"\000\022=\n\020GetServiceEvent" +
		"s\022\016.context.Empty\032\025.context.ServiceEvent" +
		"\"\0000\001\022:\n\014ListSliceIds\022\022.context.ContextId" +
		"\032\024.context.SliceIdList\"\000\0226\n\nListSlices\022\022" +
		".context.ContextId\032\022.context.SliceList\"\000" +
		"\022.\n\010GetSlice\022\020.context.SliceId\032\016.context" +
		".Slice\"\000\022.\n\010SetSlice\022\016.context.Slice\032\020.c" +
		"ontext.SliceId\"\000\0220\n\nUnsetSlice\022\016.context" +
		".Slice\032\020.context.SliceId\"\000\0221\n\013RemoveSlic" +
		"e\022\020.context.SliceId\032\016.context.Empty\"\000\0229\n" +
		"\016GetSliceEvents\022\016.context.Empty\032\023.contex" +
		"t.SliceEvent\"\0000\001\022D\n\021ListConnectionIds\022\022." +
		"context.ServiceId\032\031.context.ConnectionId" +
		"List\"\000\022@\n\017ListConnections\022\022.context.Serv" +
		"iceId\032\027.context.ConnectionList\"\000\022=\n\rGetC" +
		"onnection\022\025.context.ConnectionId\032\023.conte" +
		"xt.Connection\"\000\022=\n\rSetConnection\022\023.conte" +
		"xt.Connection\032\025.context.ConnectionId\"\000\022;" +
		"\n\020RemoveConnection\022\025.context.ConnectionI" +
		"d\032\016.context.Empty\"\000\022C\n\023GetConnectionEven" +
		"ts\022\016.context.Empty\032\030.context.ConnectionE" +
		"vent\"\0000\001b\006proto3"
		"\027DEVICEDRIVER_ONF_TR_352\020\005\022\023\n\017DEVICEDRIV" +
		"ER_XR\020\006*\217\001\n\033DeviceOperationalStatusEnum\022" +
		"%\n!DEVICEOPERATIONALSTATUS_UNDEFINED\020\000\022$" +
		"\n DEVICEOPERATIONALSTATUS_DISABLED\020\001\022#\n\037" +
		"DEVICEOPERATIONALSTATUS_ENABLED\020\002*\201\001\n\017Se" +
		"rviceTypeEnum\022\027\n\023SERVICETYPE_UNKNOWN\020\000\022\024" +
		"\n\020SERVICETYPE_L3NM\020\001\022\024\n\020SERVICETYPE_L2NM" +
		"\020\002\022)\n%SERVICETYPE_TAPI_CONNECTIVITY_SERV" +
		"ICE\020\003*\250\001\n\021ServiceStatusEnum\022\033\n\027SERVICEST" +
		"ATUS_UNDEFINED\020\000\022\031\n\025SERVICESTATUS_PLANNE" +
		"D\020\001\022\030\n\024SERVICESTATUS_ACTIVE\020\002\022!\n\035SERVICE" +
		"STATUS_PENDING_REMOVAL\020\003\022\036\n\032SERVICESTATU" +
		"S_SLA_VIOLATED\020\004*\251\001\n\017SliceStatusEnum\022\031\n\025" +
		"SLICESTATUS_UNDEFINED\020\000\022\027\n\023SLICESTATUS_P" +
		"LANNED\020\001\022\024\n\020SLICESTATUS_INIT\020\002\022\026\n\022SLICES" +
		"TATUS_ACTIVE\020\003\022\026\n\022SLICESTATUS_DEINIT\020\004\022\034" +
		"\n\030SLICESTATUS_SLA_VIOLATED\020\005*]\n\020ConfigAc" +
		"tionEnum\022\032\n\026CONFIGACTION_UNDEFINED\020\000\022\024\n\020" +
		"CONFIGACTION_SET\020\001\022\027\n\023CONFIGACTION_DELET" +
		"E\020\002*\203\002\n\022IsolationLevelEnum\022\020\n\014NO_ISOLATI" +
		"ON\020\000\022\026\n\022PHYSICAL_ISOLATION\020\001\022\025\n\021LOGICAL_" +
		"ISOLATION\020\002\022\025\n\021PROCESS_ISOLATION\020\003\022\035\n\031PH" +
		"YSICAL_MEMORY_ISOLATION\020\004\022\036\n\032PHYSICAL_NE" +
		"TWORK_ISOLATION\020\005\022\036\n\032VIRTUAL_RESOURCE_IS" +
		"OLATION\020\006\022\037\n\033NETWORK_FUNCTIONS_ISOLATION" +
		"\020\007\022\025\n\021SERVICE_ISOLATION\020\0102\331\023\n\016ContextSer" +
		"vice\022:\n\016ListContextIds\022\016.context.Empty\032\026" +
		".context.ContextIdList\"\000\0226\n\014ListContexts" +
		"\022\016.context.Empty\032\024.context.ContextList\"\000" +
		"\0224\n\nGetContext\022\022.context.ContextId\032\020.con" +
		"text.Context\"\000\0224\n\nSetContext\022\020.context.C" +
		"ontext\032\022.context.ContextId\"\000\0225\n\rRemoveCo" +
		"ntext\022\022.context.ContextId\032\016.context.Empt" +
		"y\"\000\022=\n\020GetContextEvents\022\016.context.Empty\032" +
		"\025.context.ContextEvent\"\0000\001\022@\n\017ListTopolo" +
		"gyIds\022\022.context.ContextId\032\027.context.Topo" +
		"logyIdList\"\000\022=\n\016ListTopologies\022\022.context" +
		".ContextId\032\025.context.TopologyList\"\000\0227\n\013G" +
		"etTopology\022\023.context.TopologyId\032\021.contex" +
		"t.Topology\"\000\0227\n\013SetTopology\022\021.context.To" +
		"pology\032\023.context.TopologyId\"\000\0227\n\016RemoveT" +
		"opology\022\023.context.TopologyId\032\016.context.E" +
		"mpty\"\000\022?\n\021GetTopologyEvents\022\016.context.Em" +
		"pty\032\026.context.TopologyEvent\"\0000\001\0228\n\rListD" +
		"eviceIds\022\016.context.Empty\032\025.context.Devic" +
		"eIdList\"\000\0224\n\013ListDevices\022\016.context.Empty" +
		"\032\023.context.DeviceList\"\000\0221\n\tGetDevice\022\021.c" +
		"ontext.DeviceId\032\017.context.Device\"\000\0221\n\tSe" +
		"tDevice\022\017.context.Device\032\021.context.Devic" +
		"eId\"\000\0223\n\014RemoveDevice\022\021.context.DeviceId" +
		"\032\016.context.Empty\"\000\022;\n\017GetDeviceEvents\022\016." +
		"context.Empty\032\024.context.DeviceEvent\"\0000\001\022" +
		"4\n\013ListLinkIds\022\016.context.Empty\032\023.context" +
		".LinkIdList\"\000\0220\n\tListLinks\022\016.context.Emp" +
		"ty\032\021.context.LinkList\"\000\022+\n\007GetLink\022\017.con" +
		"text.LinkId\032\r.context.Link\"\000\022+\n\007SetLink\022" +
		"\r.context.Link\032\017.context.LinkId\"\000\022/\n\nRem" +
		"oveLink\022\017.context.LinkId\032\016.context.Empty" +
		"\"\000\0227\n\rGetLinkEvents\022\016.context.Empty\032\022.co" +
		"ntext.LinkEvent\"\0000\001\022>\n\016ListServiceIds\022\022." +
		"context.ContextId\032\026.context.ServiceIdLis" +
		"t\"\000\022:\n\014ListServices\022\022.context.ContextId\032" +
		"\024.context.ServiceList\"\000\0224\n\nGetService\022\022." +
		"context.ServiceId\032\020.context.Service\"\000\0224\n" +
		"\nSetService\022\020.context.Service\032\022.context." +
		"ServiceId\"\000\0226\n\014UnsetService\022\020.context.Se" +
		"rvice\032\022.context.ServiceId\"\000\0225\n\rRemoveSer" +
		"vice\022\022.context.ServiceId\032\016.context.Empty" +
		"\"\000\022=\n\020GetServiceEvents\022\016.context.Empty\032\025" +
		".context.ServiceEvent\"\0000\001\022:\n\014ListSliceId" +
		"s\022\022.context.ContextId\032\024.context.SliceIdL" +
		"ist\"\000\0226\n\nListSlices\022\022.context.ContextId\032" +
		"\022.context.SliceList\"\000\022.\n\010GetSlice\022\020.cont" +
		"ext.SliceId\032\016.context.Slice\"\000\022.\n\010SetSlic" +
		"e\022\016.context.Slice\032\020.context.SliceId\"\000\0220\n" +
		"\nUnsetSlice\022\016.context.Slice\032\020.context.Sl" +
		"iceId\"\000\0221\n\013RemoveSlice\022\020.context.SliceId" +
		"\032\016.context.Empty\"\000\0229\n\016GetSliceEvents\022\016.c" +
		"ontext.Empty\032\023.context.SliceEvent\"\0000\001\022D\n" +
		"\021ListConnectionIds\022\022.context.ServiceId\032\031" +
		".context.ConnectionIdList\"\000\022@\n\017ListConne" +
		"ctions\022\022.context.ServiceId\032\027.context.Con" +
		"nectionList\"\000\022=\n\rGetConnection\022\025.context" +
		".ConnectionId\032\023.context.Connection\"\000\022=\n\r" +
		"SetConnection\022\023.context.Connection\032\025.con" +
		"text.ConnectionId\"\000\022;\n\020RemoveConnection\022" +
		"\025.context.ConnectionId\032\016.context.Empty\"\000" +
		"\022C\n\023GetConnectionEvents\022\016.context.Empty\032" +
		"\030.context.ConnectionEvent\"\0000\001b\006proto3"
		};
		descriptor = com.google.protobuf.Descriptors.FileDescriptor
		.internalBuildGeneratedFileFrom(descriptorData,