Merge pull request #97 from bondurantdt/fixAssetCreation

Fix asset creation

Author: snipe

jamf2snipe

@@ -790,7 +790,16 @@ for jamf_type in jamf_types:
                     try:
                         jamf_asset_tag = jamf['{}'.format(tag_split[0])]['{}'.format(tag_split[1])]
                     except:
-                        raise SystemError('No such attribute {} in the jamf payload. Please check your settings.conf file'.format(tag_split))
+                        if jamf_type == 'mobile_devices':
+                            jamf_asset_tag = 'jamfid-m-{}'.format(jamf['general']['id'])
+                        elif jamf_type == 'computers':
+                            jamf_asset_tag = 'jamfid-{}'.format(jamf['general']['id'])
+                        else:
+                            logging.error("Could not generate an asset tag for this device. Skipping")
+                            # Dump the object for debugging. 
+                            logging.verbose(jamf)
+                            continue
+                        #raise SystemError('No such attribute {} in the jamf payload. Please check your settings.conf file'.format(tag_split))
                 if jamf_asset_tag == None or jamf_asset_tag == '':
                     logging.debug('No custom configuration found in settings.conf for asset tag name upon asset creation.')
                     if jamf_type == 'mobile_devices':
@@ -804,9 +813,12 @@ for jamf_type in jamf_types:
             if jamf_type == 'mobile_devices':
                 logging.debug("Payload is being made for a mobile device")
                 newasset = {'asset_tag': jamf_asset_tag, 'model_id': modelnumbers['{}'.format(jamf['general']['model_identifier'])], 'name': jamf['general']['name'], 'status_id': defaultStatus,'serial': jamf['general']['serial_number']}
+                logging.debug(newasset)
+                new_snipe_asset = create_snipe_asset(newasset)
             elif jamf_type == 'computers':
                 logging.debug("Payload is being made for a computer")
                 newasset = {'asset_tag': jamf_asset_tag,'model_id': modelnumbers['{}'.format(jamf['hardware']['model_identifier'])], 'name': jamf['general']['name'], 'status_id': defaultStatus,'serial': jamf['general']['serial_number']}
+                new_snipe_asset = create_snipe_asset(newasset)
             else:
                 for snipekey in config['{}-api-mapping'.format(jamf_type)]:
                     jamfsplit = config['{}-api-mapping'.format(jamf_type)][snipekey].split()
@@ -829,12 +841,13 @@ for jamf_type in jamf_types:
                     except KeyError:
                         continue
                 # Reset the payload without the asset_tag if auto_incrementing flag is set.
-                if user_args.auto_incrementing:
-                    newasset.pop('asset_tag', None)
+            if user_args.auto_incrementing:
+                newasset.pop('asset_tag', None)
                 new_snipe_asset = create_snipe_asset(newasset)
+                logging.debug(new_snipe_asset)
                 if new_snipe_asset[0] != "AssetCreated":
                     continue
-                if user_args.users or user_args.users_force or user_args.users_inverse:
+            if user_args.users or user_args.users_force or user_args.users_inverse:
                     jamfsplit = config['user-mapping']['jamf_api_field'].split()
                     if jamfsplit[1] not in jamf[jamfsplit[0]]:
                         logging.info("Couldn't find {} for this device in {}, not checking it out.".format(jamfsplit[1], jamfsplit[0]))
@@ -935,4 +948,4 @@ for jamf_type in jamf_types:
                       update_jamf_mobiledevice_asset_tag("{}".format(jamf['general']['id']), '{}'.format(snipe['rows'][0]['asset_tag']))
                       logging.info("Device is a mobile device, updating the mobile device record")
 
-logging.debug('Total amount of API calls made: {}'.format(api_count))
+logging.debug('Total amount of API calls made: {}'.format(api_count))