Removed toString overrides for port-related classes in Java
diff --git a/java_gen/java_model.py b/java_gen/java_model.py
index 4d84e11..ee76a64 100644
--- a/java_gen/java_model.py
+++ b/java_gen/java_model.py
@@ -150,26 +150,6 @@
return "PortSpeed.SPEED_{}".format(splits[1])
return "PortSpeed.SPEED_NONE";
-
- port_features_to_string_map = {
- "PF_10MB_HD": "10mb-hd",
- "PF_10MB_FD": "10mb-fd",
- "PF_100MB_HD": "100mb-hd",
- "PF_100MB_FD": "100mb-fd",
- "PF_1GB_HD": "1gb-hd",
- "PF_1GB_FD": "1gb-fd",
- "PF_10GB_FD": "10gb-fd",
- "PF_40GB_FD": "40gb-fd",
- "PF_100GB_FD": "100gb-fd",
- "PF_1TB_FD": "1tb-fd",
- "PF_COPPER": "copper",
- "PF_FIBER": "fiber",
- "PF_AUTONEG": "autoneg",
- "PF_PAUSE": "pause",
- "PF_PAUSE_ASYM": "pause-asym",
- "PF_OTHER": "other",
- }
-
def gen_stp_state(enum_entry):
splits = enum_entry.name.split("_")
if len(splits)>=1:
@@ -177,30 +157,9 @@
return "true"
return "false"
- port_state_to_string_map = {
- "STP_LISTEN": "listen",
- "LINK_DOWN": "link-down",
- "STP_LEARN": "learn-no-relay",
- "STP_FORWARD": "forward",
- "STP_BLOCK": "block-broadcast",
- "BLOCKED": "blocked",
- "LIVE": "live"
- }
-
- port_config_to_string_map = {
- "PORT_DOWN": "port-down",
- "NO_STP": "no-stp",
- "NO_RECV": "no-recv",
- "NO_RECV_STP": "no-recv-stp",
- "NO_FLOOD": "no-flood",
- "NO_FWD": "no-fwd",
- "NO_PACKET_IN": "no-pkt-in",
- }
-
enum_metadata_map = defaultdict(lambda: JavaModel.OFEnumMetadata((), None),
- OFPortFeatures = OFEnumMetadata((OFEnumPropertyMetadata("PortSpeed", java_type.port_speed, gen_port_speed),), lambda e: JavaModel.port_features_to_string_map.get(e.name)),
- OFPortState = OFEnumMetadata((OFEnumPropertyMetadata("StpState", java_type.boolean, gen_stp_state),), lambda e: JavaModel.port_state_to_string_map.get(e.name)),
- OFPortConfig = OFEnumMetadata((), lambda e: JavaModel.port_config_to_string_map.get(e.name))
+ OFPortFeatures = OFEnumMetadata((OFEnumPropertyMetadata("PortSpeed", java_type.port_speed, gen_port_speed),), None),
+ OFPortState = OFEnumMetadata((OFEnumPropertyMetadata("StpState", java_type.boolean, gen_stp_state),), None),
)
@property