Commit c15796b8 authored by Felix Seibert's avatar Felix Seibert
Browse files

fix imports

parent c2e36810
...@@ -6,7 +6,7 @@ import shutil ...@@ -6,7 +6,7 @@ import shutil
import OSDManager import OSDManager
import div_util import div_util
import verify import verify
import dir_status_page_parser import dirstatuspageparser
import dataDistribution import dataDistribution
import folder import folder
...@@ -66,7 +66,7 @@ class TestDataDistribution(unittest.TestCase): ...@@ -66,7 +66,7 @@ class TestDataDistribution(unittest.TestCase):
class TestDirStatusPageParser(unittest.TestCase): class TestDirStatusPageParser(unittest.TestCase):
def test_feed(self): def test_feed(self):
parser = dir_status_page_parser.dir_status_page_parser() parser = dirstatuspageparser.DIRStatusPageParser()
html_data = open('../test_data/dir_status_page.html', 'r').read() html_data = open('../test_data/dir_status_page.html', 'r').read()
......
...@@ -8,10 +8,10 @@ import time ...@@ -8,10 +8,10 @@ import time
import datetime import datetime
import random import random
import dataDistribution from xtreemfs_client import dataDistribution
import div_util from xtreemfs_client import div_util
import folder from xtreemfs_client import folder
import dir_status_page_parser from xtreemfs_client import dirstatuspageparser
''' '''
xOSDManager - a python module to manage OSD selection in XtreemFS xOSDManager - a python module to manage OSD selection in XtreemFS
...@@ -73,7 +73,7 @@ class OSDManager(object): ...@@ -73,7 +73,7 @@ class OSDManager(object):
answer = request.urlopen(div_util.get_http_address(self.volume_address)) answer = request.urlopen(div_util.get_http_address(self.volume_address))
html_data = answer.read().decode('UTF-8') html_data = answer.read().decode('UTF-8')
parser = dir_status_page_parser.dir_status_page_parser() parser = dirstatuspageparser.DIRStatusPageParser()
parser.feed(html_data) parser.feed(html_data)
# filter out data sets without last update time or wrong service type # filter out data sets without last update time or wrong service type
......
...@@ -6,9 +6,9 @@ import sys ...@@ -6,9 +6,9 @@ import sys
#import .xtreemfs_client.verify as verify #import .xtreemfs_client.verify as verify
#from .OSDManager import OSDManager #from .OSDManager import OSDManager
import OSDManager from xtreemfs_client import OSDManager
#from .xtreemfs_client import verify #from .xtreemfs_client import verify
import verify from xtreemfs_client import verify
""" """
das - data add script. basically a command line wrapper for OSDManager. das - data add script. basically a command line wrapper for OSDManager.
......
import random import random
import osd from xtreemfs_client import osd
class DataDistribution(object): class DataDistribution(object):
......
from html.parser import HTMLParser from html.parser import HTMLParser
class dir_status_page_parser(HTMLParser): class DIRStatusPageParser(HTMLParser):
def error(self, message):
pass
def __init__(self): def __init__(self):
super().__init__() super().__init__()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment