Merge pull request #219 from sbs2001/remove-impacted_package

Refactor ImpactedPackage and ResolvedPackage

Author: pombredanne

vulnerabilities/admin.py

@@ -24,10 +24,9 @@
 from django.contrib import admin
 
 from vulnerabilities.models import (
-    ImpactedPackage,
+    PackageRelatedVulnerability,
     Importer,
     Package,
-    ResolvedPackage,
     Vulnerability,
     VulnerabilityReference,
 )
@@ -48,13 +47,8 @@ class PackageAdmin(admin.ModelAdmin):
     pass
 
 
-@admin.register(ImpactedPackage)
-class ImpactedPackageAdmin(admin.ModelAdmin):
-    pass
-
-
-@admin.register(ResolvedPackage)
-class ResolvedPackageAdmin(admin.ModelAdmin):
+@admin.register(PackageRelatedVulnerability)
+class PackageRelatedVulnerabilityAdmin(admin.ModelAdmin):
     pass
 
 

vulnerabilities/fixtures/debian.json

@@ -63,43 +63,48 @@
   }
 },
 {
-  "model": "vulnerabilities.impactedpackage",
+  "model": "vulnerabilities.packagerelatedvulnerability",
   "pk": 1,
   "fields": {
     "vulnerability": 1,
-    "package": 1
+    "package": 1,
+    "is_vulnerable": true
   }
 },
 {
-  "model": "vulnerabilities.resolvedpackage",
+  "model": "vulnerabilities.packagerelatedvulnerability",
   "pk": 1,
   "fields": {
     "vulnerability": 2,
-    "package": 2
+    "package": 2,
+    "is_vulnerable": false
   }
 },
 {
-  "model": "vulnerabilities.resolvedpackage",
+  "model": "vulnerabilities.packagerelatedvulnerability",
   "pk": 2,
   "fields": {
     "vulnerability": 2,
-    "package": 3
+    "package": 3,
+    "is_vulnerable": false
   }
 },
 {
-  "model": "vulnerabilities.resolvedpackage",
+  "model": "vulnerabilities.packagerelatedvulnerability",
   "pk": 3,
   "fields": {
     "vulnerability": 3,
-    "package": 2
+    "package": 2,
+    "is_vulnerable": false
   }
 },
 {
-  "model": "vulnerabilities.resolvedpackage",
+  "model": "vulnerabilities.packagerelatedvulnerability",
   "pk": 4,
   "fields": {
     "vulnerability": 3,
-    "package": 3
+    "package": 3,
+    "is_vulnerable": false
   }
 }
 ]