@@ -373,162 +373,3 @@ class SPECS(object):

         self.specData = SpecObjectsUtils(constants.logPath)

         self.specData.readSpecsAndConvertToSerializableObjects(constants.specPath)

-

-class SpecDependencyGenerator(object):

-

-    def __init__(self, logPath, logLevel):

-        self.logger = Logger.getLogger("Serializable Spec objects", logPath, logLevel)

-

-    def findTotalRequires(self, mapDependencies, depQue, parent):

-        while not depQue.empty():

-            specPkg = depQue.get()

-            try:

-                listRequiredPackages = SPECS.getData().getRequiresForPkg(specPkg)

-            except Exception as e:

-                self.logger.info("Caught Exception:"+str(e))

-                self.logger.info(specPkg + " is missing")

-                raise e

-

-            for depPkg in listRequiredPackages:

-                if depPkg in mapDependencies:

-                    if mapDependencies[depPkg] < mapDependencies[specPkg] + 1:

-                        mapDependencies[depPkg] = mapDependencies[specPkg] + 1

-                        parent[depPkg] = specPkg

-                        self.updateLevels(mapDependencies, depPkg, parent, mapDependencies[depPkg])

-                else:

-                    mapDependencies[depPkg] = mapDependencies[specPkg] + 1

-                    parent[depPkg] = specPkg

-                    depQue.put(depPkg)

-

-    def getBasePackagesRequired(self, pkg):

-        listBasePackagesRequired=[]

-        listPackagesRequired = SPECS.getData().getBuildRequiresForPkg(pkg)

-        listPackagesRequired.extend(SPECS.getData().getRequiresAllForPkg(pkg))

-        for p in listPackagesRequired:

-            basePkg = SPECS.getData().getBasePkg(p)

-            if basePkg not in listBasePackagesRequired:

-                listBasePackagesRequired.append(basePkg)

-        return listBasePackagesRequired

-

-

-    def findTotalWhoNeeds(self, depList, whoNeeds):

-        while depList:

-            pkg = depList.pop(0)

-            for depPackage in SPECS.getData().getListPackages():

-                for version in SPECS.getData().getVersions(depPackage):

-                    depBasePkg = depPackage+"-"+version

-                    if depBasePkg in whoNeeds:

-                        continue

-                    if pkg in self.getBasePackagesRequired(depBasePkg):

-                        whoNeeds.append(depBasePkg)

-                        if depBasePkg not in depList:

-                            depList.append(depBasePkg)

-

-    def printTree(self, children, curParent, depth):

-        if curParent in children:

-            for child in children[curParent]:

-                self.logger.info("\t" * depth + child)

-                self.printTree(children, child, depth + 1)

-

-    def getAllPackageNames(self, jsonFilePath):

-        with open(jsonFilePath) as jsonData:

-            option_list_json = json.load(jsonData)

-            packages = option_list_json["packages"]

-            return packages

-

-    def updateLevels(self, mapDependencies, inPkg, parent, level):

-        listPackages = SPECS.getData().getPackagesForPkg(inPkg)

-        for depPkg in SPECS.getData().getRequiresForPkg(inPkg):

-            if depPkg in listPackages:

-                continue

-            if depPkg in mapDependencies and mapDependencies[depPkg] < level + 1:

-                mapDependencies[depPkg] = level + 1

-                parent[depPkg] = inPkg

-                self.updateLevels(mapDependencies, depPkg, parent, mapDependencies[depPkg])

-

-    def calculateSpecDependency(self, inputPackages, mapDependencies, parent):

-        depQue = queue.Queue()

-        for package in inputPackages:

-            if SPECS.getData().isRPMPackage(package):

-                for version in SPECS.getData().getVersions(package):

-                    pkg = package+"-"+version

-                    if pkg not in mapDependencies:

-                        mapDependencies[pkg] = 0

-                        parent[pkg] = ""

-                        depQue.put(pkg)

-                        self.findTotalRequires(mapDependencies, depQue, parent)

-            else:

-                self.logger.info("Could not find spec for " + package)

-

-    def displayDependencies(self, displayOption, inputType, inputValue, allDeps, parent):

-        children = {}

-        sortedList = []

-        for elem in sorted(allDeps.items(), key=operator.itemgetter(1), reverse=True):

-            sortedList.append(elem[0])

-        # construct all children nodes

-        if displayOption == "tree":

-            for k, v in parent.iteritems():

-                children.setdefault(v, []).append(k)

-            if inputType == "json":

-                self.logger.info("Dependency Mappings for {}".format(inputValue) + " :")

-                self.logger.info("-" * 52 + " {}".format(children))

-                self.logger.info("-" * 52)

-            if "" in children:

-                for child in children[""]:

-                    self.logger.info(child)

-                    self.printTree(children, child, 1)

-                self.logger.info("*" * 18 + " {} ".format(len(sortedList)) +

-                      "packages in total " + "*" * 18)

-            else:

-                if inputType == "pkg" and len(children) > 0:

-                    self.logger.info("cyclic dependency detected, mappings: \n", children)

-

-        # To display a flat list of all packages

-        elif displayOption == "list":

-            self.logger.info(sortedList)

-

-        # To generate a new JSON file based on given input json file

-        elif displayOption == "json" and inputType == "json":

-            d = {'packages': sortedList}

-            with open(inputValue, 'w') as outfile:

-                json.dump(d, outfile)

-

-        return sortedList

-

-    def process(self, inputType, inputValue, displayOption, outputFile=None):

-        whoNeedsList = []

-        inputPackages = []

-        whatNeedsBuild = []

-        mapDependencies = {}

-        parent = {}

-        if inputType == "pkg" or inputType == "json":

-            if inputType == "pkg":

-                inputPackages.append(inputValue)

-            else:

-                inputPackages = self.getAllPackageNames(inputValue)

-

-            self.calculateSpecDependency(inputPackages, mapDependencies, parent)

-            if outputFile is not None:

-                return self.displayDependencies(displayOption, inputType, outputFile, mapDependencies, parent)

-            else:

-                return self.displayDependencies(displayOption, inputType, inputValue, mapDependencies, parent)

-        elif inputType == "get-upward-deps":

-            depList = []

-            for specFile in inputValue.split(":"):

-                if specFile in SPECS.getData().mapSpecFileNameToSpecObj:

-                    specObj = SPECS.getData().mapSpecFileNameToSpecObj[specFile]

-                    whoNeedsList.append(specObj.name+"-"+specObj.version)

-                    depList.append(specObj.name+"-"+specObj.version)

-            self.findTotalWhoNeeds(depList, whoNeedsList)

-            return whoNeedsList

-

-        elif inputType == "who-needs":

-            for depPackage in SPECS.getData().mapPackageToSpec:

-                pkg=inputValue+"-"+SPECS.getData().getHighestVersion(inputValue)

-                for version in SPECS.getData().getVersions(depPackage):

-                    depPkg = depPackage+"-"+version

-                    self.logger.info(depPkg)

-                    if pkg in SPECS.getData().getRequiresForPkg(depPkg):

-                        whoNeedsList.append(depPkg)

-            self.logger.info(whoNeedsList)

-            return whoNeedsList

@@ -5,10 +5,13 @@

 #    Author: Harish Udaiya Kumar <hudaiyakumar@vmware.com>

 import sys

 import os

+import json

+import queue

+import operator

 from argparse import ArgumentParser

 import shutil

 import traceback

-from SpecData import SpecDependencyGenerator, SPECS

+from SpecData import SPECS

 from jsonwrapper import JsonWrapper

 from constants import constants

 from CommandUtils import CommandUtils

@@ -21,6 +24,166 @@ SPEC_FILE_DIR = "../../SPECS"

 LOG_FILE_DIR = "../../stage/LOGS"

+class SpecDependencyGenerator(object):

+

+    def __init__(self, logPath, logLevel):

+        self.logger = Logger.getLogger("Serializable Spec objects", logPath, logLevel)

+

+    def findTotalRequires(self, mapDependencies, depQue, parent):

+        while not depQue.empty():

+            specPkg = depQue.get()

+            try:

+                listRequiredPackages = SPECS.getData().getRequiresForPkg(specPkg)

+            except Exception as e:

+                self.logger.info("Caught Exception:"+str(e))

+                self.logger.info(specPkg + " is missing")

+                raise e

+

+            for depPkg in listRequiredPackages:

+                if depPkg in mapDependencies:

+                    if mapDependencies[depPkg] < mapDependencies[specPkg] + 1:

+                        mapDependencies[depPkg] = mapDependencies[specPkg] + 1

+                        parent[depPkg] = specPkg

+                        self.updateLevels(mapDependencies, depPkg, parent, mapDependencies[depPkg])

+                else:

+                    mapDependencies[depPkg] = mapDependencies[specPkg] + 1

+                    parent[depPkg] = specPkg

+                    depQue.put(depPkg)

+

+    def getBasePackagesRequired(self, pkg):

+        listBasePackagesRequired=[]

+        listPackagesRequired = SPECS.getData().getBuildRequiresForPkg(pkg)

+        listPackagesRequired.extend(SPECS.getData().getRequiresAllForPkg(pkg))

+        for p in listPackagesRequired:

+            basePkg = SPECS.getData().getBasePkg(p)

+            if basePkg not in listBasePackagesRequired:

+                listBasePackagesRequired.append(basePkg)

+        return listBasePackagesRequired

+

+

+    def findTotalWhoNeeds(self, depList, whoNeeds):

+        while depList:

+            pkg = depList.pop(0)

+            for depPackage in SPECS.getData().getListPackages():

+                for version in SPECS.getData().getVersions(depPackage):

+                    depBasePkg = depPackage+"-"+version

+                    if depBasePkg in whoNeeds:

+                        continue

+                    if pkg in self.getBasePackagesRequired(depBasePkg):

+                        whoNeeds.append(depBasePkg)

+                        if depBasePkg not in depList:

+                            depList.append(depBasePkg)

+

+    def printTree(self, children, curParent, depth):

+        if curParent in children:

+            for child in children[curParent]:

+                self.logger.info("\t" * depth + child)

+                self.printTree(children, child, depth + 1)

+

+    def getAllPackageNames(self, jsonFilePath):

+        with open(jsonFilePath) as jsonData:

+            option_list_json = json.load(jsonData)

+            packages = option_list_json["packages"]

+            return packages

+

+    def updateLevels(self, mapDependencies, inPkg, parent, level):

+        listPackages = SPECS.getData().getPackagesForPkg(inPkg)

+        for depPkg in SPECS.getData().getRequiresForPkg(inPkg):

+            if depPkg in listPackages:

+                continue

+            if depPkg in mapDependencies and mapDependencies[depPkg] < level + 1:

+                mapDependencies[depPkg] = level + 1

+                parent[depPkg] = inPkg

+                self.updateLevels(mapDependencies, depPkg, parent, mapDependencies[depPkg])

+

+    def calculateSpecDependency(self, inputPackages, mapDependencies, parent):

+        depQue = queue.Queue()

+        for package in inputPackages:

+            if SPECS.getData().isRPMPackage(package):

+                for version in SPECS.getData().getVersions(package):

+                    pkg = package+"-"+version

+                    if pkg not in mapDependencies:

+                        mapDependencies[pkg] = 0

+                        parent[pkg] = ""

+                        depQue.put(pkg)

+                        self.findTotalRequires(mapDependencies, depQue, parent)

+            else:

+                self.logger.info("Could not find spec for " + package)

+

+    def displayDependencies(self, displayOption, inputType, inputValue, allDeps, parent):

+        children = {}

+        sortedList = []

+        for elem in sorted(allDeps.items(), key=operator.itemgetter(1), reverse=True):

+            sortedList.append(elem[0])

+        # construct all children nodes

+        if displayOption == "tree":

+            for k, v in parent.iteritems():

+                children.setdefault(v, []).append(k)

+            if inputType == "json":

+                self.logger.info("Dependency Mappings for {}".format(inputValue) + " :")

+                self.logger.info("-" * 52 + " {}".format(children))

+                self.logger.info("-" * 52)

+            if "" in children:

+                for child in children[""]:

+                    self.logger.info(child)

+                    self.printTree(children, child, 1)

+                self.logger.info("*" * 18 + " {} ".format(len(sortedList)) +

+                      "packages in total " + "*" * 18)

+            else:

+                if inputType == "pkg" and len(children) > 0:

+                    self.logger.info("cyclic dependency detected, mappings: \n", children)

+

+        # To display a flat list of all packages

+        elif displayOption == "list":

+            self.logger.info(sortedList)

+

+        # To generate a new JSON file based on given input json file

+        elif displayOption == "json" and inputType == "json":

+            d = {'packages': sortedList}

+            with open(inputValue, 'w') as outfile:

+                json.dump(d, outfile)

+

+        return sortedList

+

+    def process(self, inputType, inputValue, displayOption, outputFile=None):

+        whoNeedsList = []

+        inputPackages = []

+        whatNeedsBuild = []

+        mapDependencies = {}

+        parent = {}

+        if inputType == "pkg" or inputType == "json":

+            if inputType == "pkg":

+                inputPackages.append(inputValue)

+            else:

+                inputPackages = self.getAllPackageNames(inputValue)

+

+            self.calculateSpecDependency(inputPackages, mapDependencies, parent)

+            if outputFile is not None:

+                return self.displayDependencies(displayOption, inputType, outputFile, mapDependencies, parent)

+            else:

+                return self.displayDependencies(displayOption, inputType, inputValue, mapDependencies, parent)

+        elif inputType == "get-upward-deps":

+            depList = []

+            for specFile in inputValue.split(":"):

+                if specFile in SPECS.getData().mapSpecFileNameToSpecObj:

+                    specObj = SPECS.getData().mapSpecFileNameToSpecObj[specFile]

+                    whoNeedsList.append(specObj.name+"-"+specObj.version)

+                    depList.append(specObj.name+"-"+specObj.version)

+            self.findTotalWhoNeeds(depList, whoNeedsList)

+            return whoNeedsList

+

+        elif inputType == "who-needs":

+            for depPackage in SPECS.getData().mapPackageToSpec:

+                pkg=inputValue+"-"+SPECS.getData().getHighestVersion(inputValue)

+                for version in SPECS.getData().getVersions(depPackage):

+                    depPkg = depPackage+"-"+version

+                    self.logger.info(depPkg)

+                    if pkg in SPECS.getData().getRequiresForPkg(depPkg):

+                        whoNeedsList.append(depPkg)

+            self.logger.info(whoNeedsList)

+            return whoNeedsList

+

+

 def main():

     usage = "Usage: %prog [options]"

     parser = ArgumentParser(usage)