Permalink
Browse files

Merge pull request #20 from wmatyskiewicz/master

	 remove asset_parent_id
  • Loading branch information...
2 parents b032fe1 + ceae959 commit e997bc2b82600ee4d6697f80b51823512f3738a9 @deshipu deshipu committed May 23, 2013
Showing with 0 additions and 2 deletions.
  1. +0 −1 src/ralph_assets/api_pricing.py
  2. +0 −1 src/ralph_assets/tests/unit/tests_models.py
@@ -30,7 +30,6 @@ def get_asset_parts():
device_info = asset.device_info
yield {
'asset_id': part.id,
- 'asset_parent_id':asset.id,
'barcode': asset.barcode,
'is_deprecated': part.is_deprecated(),
'model': part.model.name if part.model else None,
@@ -110,6 +110,5 @@ def tests_api_asset_part(self):
model = AssetModel.objects.get(name="Model1")
self.assertEqual(item['model'], model.name)
self.assertEqual(item['asset_id'], self.asset2.id)
- self.assertEqual(item['asset_parent_id'], self.asset.id)
self.assertEqual(item['sn'], self.asset.sn)
self.assertEqual(item['barcode'], self.asset.barcode)

0 comments on commit e997bc2

Please sign in to comment.