[MERGED] osmo-gsm-tester[master]: Create Pcu abstract class and make OsmoPcu inherit from it

[Pau Espin Pedrol]

Pau Espin Pedrol has submitted this change and it was merged.

Change subject: Create Pcu abstract class and make OsmoPcu inherit from it
..


Create Pcu abstract class and make OsmoPcu inherit from it

This base class will be used to describe the required accessors for all
PCU objects.

It is introduced in this commit and will be further used in the future
when adding a Dummy PCU object which will be used by NanoBts object.

Change-Id: Ia3fd4551d1f2932362f99f7d44d65f8ae4fd1979
---
A src/osmo_gsm_tester/pcu.py
M src/osmo_gsm_tester/pcu_osmo.py
2 files changed, 52 insertions(+), 7 deletions(-)

Approvals:
  Neels Hofmeyr: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/osmo_gsm_tester/pcu.py b/src/osmo_gsm_tester/pcu.py
new file mode 100644
index 000..0eddb06
--- /dev/null
+++ b/src/osmo_gsm_tester/pcu.py
@@ -0,0 +1,49 @@
+# osmo_gsm_tester: specifics pcu base abstract class
+#
+# Copyright (C) 2018 by sysmocom - s.f.m.c. GmbH
+#
+# Author: Pau Espin Pedrol 
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+from abc import ABCMeta, abstractmethod
+from . import log
+
+class Pcu(log.Origin, metaclass=ABCMeta):
+"""PCU Abstract Base Class."""
+suite_run = None
+run_dir = None
+bts = None
+
+##
+# PROTECTED
+##
+
+def __init__(self, suite_run, bts, conf, name):
+"""Base constructor. Must be called by subclass."""
+super().__init__(log.C_RUN, name)
+self.suite_run = suite_run
+self.bts = bts
+self.conf = conf
+
+###
+# PUBLIC (test API included)
+###
+
+@abstractmethod
+def start(self):
+"""Start the PCU. Must be implemented by subclass."""
+pass
+
+# vim: expandtab tabstop=4 shiftwidth=4
diff --git a/src/osmo_gsm_tester/pcu_osmo.py b/src/osmo_gsm_tester/pcu_osmo.py
index 23c93eb..deaeb80 100644
--- a/src/osmo_gsm_tester/pcu_osmo.py
+++ b/src/osmo_gsm_tester/pcu_osmo.py
@@ -20,11 +20,9 @@
 import os
 import pprint
 import tempfile
-from . import log, config, util, template, process, event_loop
+from . import log, config, util, template, process, event_loop, pcu
 
-class OsmoPcu(log.Origin):
-suite_run = None
-run_dir = None
+class OsmoPcu(pcu.Pcu):
 inst = None
 env = None
 
@@ -32,9 +30,7 @@
 PCU_OSMO_CFG = 'osmo-pcu.cfg'
 
 def __init__(self, suite_run, bts, conf):
-super().__init__(log.C_RUN, OsmoPcu.BIN_PCU)
-self.suite_run = suite_run
-self.bts = bts
+super().__init__(suite_run, bts, conf, OsmoPcu.BIN_PCU)
 self.conf = conf
 self.env = {}
 

-- 
To view, visit https://gerrit.osmocom.org/7158
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia3fd4551d1f2932362f99f7d44d65f8ae4fd1979
Gerrit-PatchSet: 5
Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-Reviewer: Pau Espin Pedrol 

osmo-gsm-tester[master]: Create Pcu abstract class and make OsmoPcu inherit from it

[Neels Hofmeyr]

Patch Set 5: Code-Review+2

-- 
To view, visit https://gerrit.osmocom.org/7158
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia3fd4551d1f2932362f99f7d44d65f8ae4fd1979
Gerrit-PatchSet: 5
Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-HasComments: No

[PATCH] osmo-gsm-tester[master]: Create Pcu abstract class and make OsmoPcu inherit from it

[Pau Espin Pedrol]

Hello Neels Hofmeyr, Harald Welte, Jenkins Builder,

I'd like you to reexamine a change.  Please visit

https://gerrit.osmocom.org/7158

to look at the new patch set (#4).

Create Pcu abstract class and make OsmoPcu inherit from it

This base class will be used to describe the required accessors for all
PCU objects.

It is introduced in this commit and will be further used in the future
when adding a Dummy PCU object which will be used by NanoBts object.

Change-Id: Ia3fd4551d1f2932362f99f7d44d65f8ae4fd1979
---
A src/osmo_gsm_tester/pcu.py
M src/osmo_gsm_tester/pcu_osmo.py
2 files changed, 52 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/58/7158/4

diff --git a/src/osmo_gsm_tester/pcu.py b/src/osmo_gsm_tester/pcu.py
new file mode 100644
index 000..0eddb06
--- /dev/null
+++ b/src/osmo_gsm_tester/pcu.py
@@ -0,0 +1,49 @@
+# osmo_gsm_tester: specifics pcu base abstract class
+#
+# Copyright (C) 2018 by sysmocom - s.f.m.c. GmbH
+#
+# Author: Pau Espin Pedrol 
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+from abc import ABCMeta, abstractmethod
+from . import log
+
+class Pcu(log.Origin, metaclass=ABCMeta):
+"""PCU Abstract Base Class."""
+suite_run = None
+run_dir = None
+bts = None
+
+##
+# PROTECTED
+##
+
+def __init__(self, suite_run, bts, conf, name):
+"""Base constructor. Must be called by subclass."""
+super().__init__(log.C_RUN, name)
+self.suite_run = suite_run
+self.bts = bts
+self.conf = conf
+
+###
+# PUBLIC (test API included)
+###
+
+@abstractmethod
+def start(self):
+"""Start the PCU. Must be implemented by subclass."""
+pass
+
+# vim: expandtab tabstop=4 shiftwidth=4
diff --git a/src/osmo_gsm_tester/pcu_osmo.py b/src/osmo_gsm_tester/pcu_osmo.py
index 23c93eb..deaeb80 100644
--- a/src/osmo_gsm_tester/pcu_osmo.py
+++ b/src/osmo_gsm_tester/pcu_osmo.py
@@ -20,11 +20,9 @@
 import os
 import pprint
 import tempfile
-from . import log, config, util, template, process, event_loop
+from . import log, config, util, template, process, event_loop, pcu
 
-class OsmoPcu(log.Origin):
-suite_run = None
-run_dir = None
+class OsmoPcu(pcu.Pcu):
 inst = None
 env = None
 
@@ -32,9 +30,7 @@
 PCU_OSMO_CFG = 'osmo-pcu.cfg'
 
 def __init__(self, suite_run, bts, conf):
-super().__init__(log.C_RUN, OsmoPcu.BIN_PCU)
-self.suite_run = suite_run
-self.bts = bts
+super().__init__(suite_run, bts, conf, OsmoPcu.BIN_PCU)
 self.conf = conf
 self.env = {}
 

-- 
To view, visit https://gerrit.osmocom.org/7158
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Ia3fd4551d1f2932362f99f7d44d65f8ae4fd1979
Gerrit-PatchSet: 4
Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-Reviewer: Pau Espin Pedrol 

osmo-gsm-tester[master]: Create Pcu abstract class and make OsmoPcu inherit from it

[Pau Espin Pedrol]

Patch Set 3:

(1 comment)

https://gerrit.osmocom.org/#/c/7158/3/src/osmo_gsm_tester/pcu.py
File src/osmo_gsm_tester/pcu.py:

Line 30: ##
> don't see why this comment. I'm allowed to instantiate a Pcu class and use 
You cannot do it because this is an abstract class (as specified byinheriting 
from metaclass=ABCMeta, so you are not expected to use it publically (as it 
instantiating a Pcu class directly). Only subclasses can call it, that's why 
it's in the protected section.

I'll add doc to it.


-- 
To view, visit https://gerrit.osmocom.org/7158
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia3fd4551d1f2932362f99f7d44d65f8ae4fd1979
Gerrit-PatchSet: 3
Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-HasComments: Yes

osmo-gsm-tester[master]: Create Pcu abstract class and make OsmoPcu inherit from it

[Neels Hofmeyr]

Patch Set 3: Code-Review+1

(1 comment)

same cosmetic difference in opinion...

https://gerrit.osmocom.org/#/c/7158/3/src/osmo_gsm_tester/pcu.py
File src/osmo_gsm_tester/pcu.py:

Line 30: ##
don't see why this comment. I'm allowed to instantiate a Pcu class and use it 
as I might, am I not? There are no implications, it's not a singleton. The fact 
that __init__ is usually not called directly is already indicated by the double 
underscores, and it's intrinsic to python == everyone knows it. What do you 
mean by "protected" here? (and if there is a point, --> doc string)


-- 
To view, visit https://gerrit.osmocom.org/7158
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia3fd4551d1f2932362f99f7d44d65f8ae4fd1979
Gerrit-PatchSet: 3
Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-HasComments: Yes

osmo-gsm-tester[master]: Create Pcu abstract class and make OsmoPcu inherit from it

[Harald Welte]

Patch Set 2: Code-Review+1

-- 
To view, visit https://gerrit.osmocom.org/7158
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia3fd4551d1f2932362f99f7d44d65f8ae4fd1979
Gerrit-PatchSet: 2
Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-HasComments: No

[PATCH] osmo-gsm-tester[master]: Create Pcu abstract class and make OsmoPcu inherit from it

[Pau Espin Pedrol]

Hello Harald Welte, Jenkins Builder,

I'd like you to reexamine a change.  Please visit

https://gerrit.osmocom.org/7158

to look at the new patch set (#2).

Create Pcu abstract class and make OsmoPcu inherit from it

This base class will be used to describe the required accessors for all
PCU objects.

It is introduced in this commit and will be further used in the future
when adding a Dummy PCU object which will be used by NanoBts object.

Change-Id: Ia3fd4551d1f2932362f99f7d44d65f8ae4fd1979
---
A src/osmo_gsm_tester/pcu.py
M src/osmo_gsm_tester/pcu_osmo.py
2 files changed, 50 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/58/7158/2

diff --git a/src/osmo_gsm_tester/pcu.py b/src/osmo_gsm_tester/pcu.py
new file mode 100644
index 000..c43ee16
--- /dev/null
+++ b/src/osmo_gsm_tester/pcu.py
@@ -0,0 +1,47 @@
+# osmo_gsm_tester: specifics pcu base abstract class
+#
+# Copyright (C) 2018 by sysmocom - s.f.m.c. GmbH
+#
+# Author: Pau Espin Pedrol 
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+from abc import ABCMeta, abstractmethod
+from . import log
+
+class Pcu(log.Origin, metaclass=ABCMeta):
+suite_run = None
+run_dir = None
+bts = None
+
+##
+# PROTECTED
+##
+
+def __init__(self, suite_run, bts, conf, name):
+super().__init__(log.C_RUN, name)
+self.suite_run = suite_run
+self.bts = bts
+self.conf = conf
+
+###
+# PUBLIC (test API included)
+###
+
+@abstractmethod
+def start(self):
+'Start the PCU'
+pass
+
+# vim: expandtab tabstop=4 shiftwidth=4
diff --git a/src/osmo_gsm_tester/pcu_osmo.py b/src/osmo_gsm_tester/pcu_osmo.py
index 23c93eb..deaeb80 100644
--- a/src/osmo_gsm_tester/pcu_osmo.py
+++ b/src/osmo_gsm_tester/pcu_osmo.py
@@ -20,11 +20,9 @@
 import os
 import pprint
 import tempfile
-from . import log, config, util, template, process, event_loop
+from . import log, config, util, template, process, event_loop, pcu
 
-class OsmoPcu(log.Origin):
-suite_run = None
-run_dir = None
+class OsmoPcu(pcu.Pcu):
 inst = None
 env = None
 
@@ -32,9 +30,7 @@
 PCU_OSMO_CFG = 'osmo-pcu.cfg'
 
 def __init__(self, suite_run, bts, conf):
-super().__init__(log.C_RUN, OsmoPcu.BIN_PCU)
-self.suite_run = suite_run
-self.bts = bts
+super().__init__(suite_run, bts, conf, OsmoPcu.BIN_PCU)
 self.conf = conf
 self.env = {}
 

-- 
To view, visit https://gerrit.osmocom.org/7158
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Ia3fd4551d1f2932362f99f7d44d65f8ae4fd1979
Gerrit-PatchSet: 2
Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder

osmo-gsm-tester[master]: Create Pcu abstract class and make OsmoPcu inherit from it

[Harald Welte]

Patch Set 1: Code-Review+1

(1 comment)

https://gerrit.osmocom.org/#/c/7158/1/src/osmo_gsm_tester/pcu.py
File src/osmo_gsm_tester/pcu.py:

Line 3: # Copyright (C) 2016-2017 by sysmocom - s.f.m.c. GmbH
2018 only? the file didn't exist in 2016/2017, I presume? or is this code moved?


-- 
To view, visit https://gerrit.osmocom.org/7158
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia3fd4551d1f2932362f99f7d44d65f8ae4fd1979
Gerrit-PatchSet: 1
Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-HasComments: Yes

[PATCH] osmo-gsm-tester[master]: Create Pcu abstract class and make OsmoPcu inherit from it

[Pau Espin Pedrol]

Review at  https://gerrit.osmocom.org/7158

Create Pcu abstract class and make OsmoPcu inherit from it

This base class will be used to describe the required accessors for all
PCU objects.

It is introduced in this commit and will be further used in the future
when adding a Dummy PCU object which will be used by NanoBts object.

Change-Id: Ia3fd4551d1f2932362f99f7d44d65f8ae4fd1979
---
A src/osmo_gsm_tester/pcu.py
M src/osmo_gsm_tester/pcu_osmo.py
2 files changed, 50 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/58/7158/1

diff --git a/src/osmo_gsm_tester/pcu.py b/src/osmo_gsm_tester/pcu.py
new file mode 100644
index 000..9a0121e
--- /dev/null
+++ b/src/osmo_gsm_tester/pcu.py
@@ -0,0 +1,47 @@
+# osmo_gsm_tester: specifics pcu base abstract class
+#
+# Copyright (C) 2016-2017 by sysmocom - s.f.m.c. GmbH
+#
+# Author: Pau Espin Pedrol 
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+from abc import ABCMeta, abstractmethod
+from . import log
+
+class Pcu(log.Origin, metaclass=ABCMeta):
+suite_run = None
+run_dir = None
+bts = None
+
+##
+# PROTECTED
+##
+
+def __init__(self, suite_run, bts, conf, name):
+super().__init__(log.C_RUN, name)
+self.suite_run = suite_run
+self.bts = bts
+self.conf = conf
+
+###
+# PUBLIC (test API included)
+###
+
+@abstractmethod
+def start(self):
+'Start the PCU'
+pass
+
+# vim: expandtab tabstop=4 shiftwidth=4
diff --git a/src/osmo_gsm_tester/pcu_osmo.py b/src/osmo_gsm_tester/pcu_osmo.py
index 23c93eb..deaeb80 100644
--- a/src/osmo_gsm_tester/pcu_osmo.py
+++ b/src/osmo_gsm_tester/pcu_osmo.py
@@ -20,11 +20,9 @@
 import os
 import pprint
 import tempfile
-from . import log, config, util, template, process, event_loop
+from . import log, config, util, template, process, event_loop, pcu
 
-class OsmoPcu(log.Origin):
-suite_run = None
-run_dir = None
+class OsmoPcu(pcu.Pcu):
 inst = None
 env = None
 
@@ -32,9 +30,7 @@
 PCU_OSMO_CFG = 'osmo-pcu.cfg'
 
 def __init__(self, suite_run, bts, conf):
-super().__init__(log.C_RUN, OsmoPcu.BIN_PCU)
-self.suite_run = suite_run
-self.bts = bts
+super().__init__(suite_run, bts, conf, OsmoPcu.BIN_PCU)
 self.conf = conf
 self.env = {}
 

-- 
To view, visit https://gerrit.osmocom.org/7158
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia3fd4551d1f2932362f99f7d44d65f8ae4fd1979
Gerrit-PatchSet: 1
Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol