Regenerate constants

Author: seveas

NetworkManager.py

@@ -718,6 +718,7 @@ def cert_to_dbus(cert):
 del xml_cache
 
 # Constants below are generated with makeconstants.py. Do not edit manually.
+NM_CAPABILITY_TEAM = 1
 NM_STATE_UNKNOWN = 0
 NM_STATE_ASLEEP = 10
 NM_STATE_DISCONNECTED = 20
@@ -752,10 +753,17 @@ def cert_to_dbus(cert):
 NM_DEVICE_TYPE_MACVLAN = 18
 NM_DEVICE_TYPE_VXLAN = 19
 NM_DEVICE_TYPE_VETH = 20
+NM_DEVICE_TYPE_MACSEC = 21
+NM_DEVICE_TYPE_DUMMY = 22
+NM_DEVICE_TYPE_PPP = 23
+NM_DEVICE_TYPE_OVS_INTERFACE = 24
+NM_DEVICE_TYPE_OVS_PORT = 25
+NM_DEVICE_TYPE_OVS_BRIDGE = 26
 NM_DEVICE_CAP_NONE = 0
 NM_DEVICE_CAP_NM_SUPPORTED = 1
 NM_DEVICE_CAP_CARRIER_DETECT = 2
 NM_DEVICE_CAP_IS_SOFTWARE = 4
+NM_DEVICE_CAP_SRIOV = 8
 NM_WIFI_DEVICE_CAP_NONE = 0
 NM_WIFI_DEVICE_CAP_CIPHER_WEP40 = 1
 NM_WIFI_DEVICE_CAP_CIPHER_WEP104 = 2
@@ -768,9 +776,11 @@ def cert_to_dbus(cert):
 NM_WIFI_DEVICE_CAP_FREQ_VALID = 256
 NM_WIFI_DEVICE_CAP_FREQ_2GHZ = 512
 NM_WIFI_DEVICE_CAP_FREQ_5GHZ = 1024
-NM_WIFI_DEVICE_CAP_IBSS_RSN = 2048
 NM_802_11_AP_FLAGS_NONE = 0
 NM_802_11_AP_FLAGS_PRIVACY = 1
+NM_802_11_AP_FLAGS_WPS = 2
+NM_802_11_AP_FLAGS_WPS_PBC = 4
+NM_802_11_AP_FLAGS_WPS_PIN = 8
 NM_802_11_AP_SEC_NONE = 0
 NM_802_11_AP_SEC_PAIR_WEP40 = 1
 NM_802_11_AP_SEC_PAIR_WEP104 = 2
@@ -794,6 +804,10 @@ def cert_to_dbus(cert):
 NM_DEVICE_MODEM_CAPABILITY_CDMA_EVDO = 2
 NM_DEVICE_MODEM_CAPABILITY_GSM_UMTS = 4
 NM_DEVICE_MODEM_CAPABILITY_LTE = 8
+NM_WIMAX_NSP_NETWORK_TYPE_UNKNOWN = 0
+NM_WIMAX_NSP_NETWORK_TYPE_HOME = 1
+NM_WIMAX_NSP_NETWORK_TYPE_PARTNER = 2
+NM_WIMAX_NSP_NETWORK_TYPE_ROAMING_PARTNER = 3
 NM_DEVICE_STATE_UNKNOWN = 0
 NM_DEVICE_STATE_UNMANAGED = 10
 NM_DEVICE_STATE_UNAVAILABLE = 20
@@ -870,12 +884,73 @@ def cert_to_dbus(cert):
 NM_DEVICE_STATE_REASON_NEW_ACTIVATION = 60
 NM_DEVICE_STATE_REASON_PARENT_CHANGED = 61
 NM_DEVICE_STATE_REASON_PARENT_MANAGED_CHANGED = 62
-NM_DEVICE_STATE_REASON_LAST = 65535
+NM_DEVICE_STATE_REASON_OVSDB_FAILED = 63
+NM_DEVICE_STATE_REASON_IP_ADDRESS_DUPLICATE = 64
+NM_DEVICE_STATE_REASON_IP_METHOD_UNSUPPORTED = 65
+NM_METERED_UNKNOWN = 0
+NM_METERED_YES = 1
+NM_METERED_NO = 2
+NM_METERED_GUESS_YES = 3
+NM_METERED_GUESS_NO = 4
 NM_ACTIVE_CONNECTION_STATE_UNKNOWN = 0
 NM_ACTIVE_CONNECTION_STATE_ACTIVATING = 1
 NM_ACTIVE_CONNECTION_STATE_ACTIVATED = 2
 NM_ACTIVE_CONNECTION_STATE_DEACTIVATING = 3
 NM_ACTIVE_CONNECTION_STATE_DEACTIVATED = 4
+NM_ACTIVE_CONNECTION_STATE_REASON_UNKNOWN = 0
+NM_ACTIVE_CONNECTION_STATE_REASON_NONE = 1
+NM_ACTIVE_CONNECTION_STATE_REASON_USER_DISCONNECTED = 2
+NM_ACTIVE_CONNECTION_STATE_REASON_DEVICE_DISCONNECTED = 3
+NM_ACTIVE_CONNECTION_STATE_REASON_SERVICE_STOPPED = 4
+NM_ACTIVE_CONNECTION_STATE_REASON_IP_CONFIG_INVALID = 5
+NM_ACTIVE_CONNECTION_STATE_REASON_CONNECT_TIMEOUT = 6
+NM_ACTIVE_CONNECTION_STATE_REASON_SERVICE_START_TIMEOUT = 7
+NM_ACTIVE_CONNECTION_STATE_REASON_SERVICE_START_FAILED = 8
+NM_ACTIVE_CONNECTION_STATE_REASON_NO_SECRETS = 9
+NM_ACTIVE_CONNECTION_STATE_REASON_LOGIN_FAILED = 10
+NM_ACTIVE_CONNECTION_STATE_REASON_CONNECTION_REMOVED = 11
+NM_ACTIVE_CONNECTION_STATE_REASON_DEPENDENCY_FAILED = 12
+NM_ACTIVE_CONNECTION_STATE_REASON_DEVICE_REALIZE_FAILED = 13
+NM_ACTIVE_CONNECTION_STATE_REASON_DEVICE_REMOVED = 14
+NM_SECRET_AGENT_GET_SECRETS_FLAG_NONE = 0
+NM_SECRET_AGENT_GET_SECRETS_FLAG_ALLOW_INTERACTION = 1
+NM_SECRET_AGENT_GET_SECRETS_FLAG_REQUEST_NEW = 2
+NM_SECRET_AGENT_GET_SECRETS_FLAG_USER_REQUESTED = 4
+NM_SECRET_AGENT_GET_SECRETS_FLAG_WPS_PBC_ACTIVE = 8
+NM_SECRET_AGENT_GET_SECRETS_FLAG_ONLY_SYSTEM = 2147483648
+NM_SECRET_AGENT_GET_SECRETS_FLAG_NO_ERRORS = 1073741824
+NM_IP_TUNNEL_MODE_UNKNOWN = 0
+NM_IP_TUNNEL_MODE_IPIP = 1
+NM_IP_TUNNEL_MODE_GRE = 2
+NM_IP_TUNNEL_MODE_SIT = 3
+NM_IP_TUNNEL_MODE_ISATAP = 4
+NM_IP_TUNNEL_MODE_VTI = 5
+NM_IP_TUNNEL_MODE_IP6IP6 = 6
+NM_IP_TUNNEL_MODE_IPIP6 = 7
+NM_IP_TUNNEL_MODE_IP6GRE = 8
+NM_IP_TUNNEL_MODE_VTI6 = 9
+NM_CHECKPOINT_CREATE_FLAG_NONE = 0
+NM_CHECKPOINT_CREATE_FLAG_DESTROY_ALL = 1
+NM_CHECKPOINT_CREATE_FLAG_DELETE_NEW_CONNECTIONS = 2
+NM_CHECKPOINT_CREATE_FLAG_DISCONNECT_NEW_DEVICES = 4
+NM_ROLLBACK_RESULT_OK = 0
+NM_ROLLBACK_RESULT_ERR_NO_DEVICE = 1
+NM_ROLLBACK_RESULT_ERR_DEVICE_UNMANAGED = 2
+NM_ROLLBACK_RESULT_ERR_FAILED = 3
+NM_ACTIVATION_STATE_FLAG_NONE = 0
+NM_ACTIVATION_STATE_FLAG_IS_MASTER = 1
+NM_ACTIVATION_STATE_FLAG_IS_SLAVE = 2
+NM_ACTIVATION_STATE_FLAG_LAYER2_READY = 4
+NM_ACTIVATION_STATE_FLAG_IP4_READY = 8
+NM_ACTIVATION_STATE_FLAG_IP6_READY = 16
+NM_ACTIVATION_STATE_FLAG_MASTER_HAS_SLAVES = 32
+NM_SETTINGS_UPDATE2_FLAG_NONE = 0
+NM_SETTINGS_UPDATE2_FLAG_TO_DISK = 1
+NM_SETTINGS_UPDATE2_FLAG_IN_MEMORY = 2
+NM_SETTINGS_UPDATE2_FLAG_IN_MEMORY_DETACHED = 4
+NM_SETTINGS_UPDATE2_FLAG_IN_MEMORY_ONLY = 8
+NM_SETTINGS_UPDATE2_FLAG_VOLATILE = 16
+NM_SETTINGS_UPDATE2_FLAG_BLOCK_AUTOCONNECT = 32
 NM_VPN_SERVICE_STATE_UNKNOWN = 0
 NM_VPN_SERVICE_STATE_INIT = 1
 NM_VPN_SERVICE_STATE_SHUTDOWN = 2

makeconstants.py

@@ -5,9 +5,10 @@
 
 enum_regex = re.compile(r'typedef enum(?:\s+[a-zA-Z]+)?\s*\{(.*?)\}', re.DOTALL)
 comment_regex = re.compile(r'/\*.*?\*/', re.DOTALL)
-headers = ['/usr/include/NetworkManager/NetworkManager.h',
+headers = [ '/usr/include/libnm/nm-dbus-interface.h',
            '/usr/include/NetworkManager/NetworkManagerVPN.h',
            '/usr/include/libnm-glib/nm-secret-agent.h']
+
 for h in headers:
     for enum in enum_regex.findall(open(h).read()):
         enum = comment_regex.sub('', enum)
@@ -17,7 +18,7 @@
                 continue
             if '=' in key:
                 key, val = key.split('=')
-                val = eval(val)
+                val = eval(val.replace('LL',''))
             else:
                 val = last + 1
             key = key.strip()