From: beierlm <mark.beierl@canonical.com>
Date: Fri, 23 Oct 2020 18:54:56 +0000 (-0400)
Subject: Merge branch 'v8.0'
X-Git-Tag: release-v9.0-start~50
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=b1a1c46a60aa4981c7b01e9d6ff95958db7749a5;p=osm%2Fdevops.git

Merge branch 'v8.0'

Change-Id: I96d3bae3abca7b2a5f66bca591b4358d6c921f3d
Signed-off-by: beierlm <mark.beierl@canonical.com>
---

b1a1c46a60aa4981c7b01e9d6ff95958db7749a5
diff --cc installers/charm/lcm-k8s/reactive/lcm.py
index 313ed63a,3ada8cb2..1cb46610
--- a/installers/charm/lcm-k8s/reactive/lcm.py
+++ b/installers/charm/lcm-k8s/reactive/lcm.py
@@@ -11,21 -11,17 +11,23 @@@
  #     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  #     See the License for the specific language governing permissions and
  #     limitations under the License.
--from charms.layer.caas_base import pod_spec_set
--from charms.reactive import endpoint_from_flag
--from charms.reactive import when, when_not, hook
--from charms.reactive.flags import set_flag, clear_flag
++import logging
++import yaml
++
  from charmhelpers.core.hookenv import (
      log,
      metadata,
      config,
  )
  from charms import layer
--import yaml
- import logging
++from charms.layer.caas_base import pod_spec_set
++from charms.reactive import endpoint_from_flag
++from charms.reactive import when, when_not, hook
++from charms.reactive.flags import set_flag, clear_flag
++
 +
 +logger = logging.getLogger(__name__)
 +
  
  @hook("upgrade-charm")
  @when("leadership.is_leader")
diff --cc installers/charm/ng-ui/src/charm.py
index 8e21bcd2,ce48927a..d9ad8f2a
--- a/installers/charm/ng-ui/src/charm.py
+++ b/installers/charm/ng-ui/src/charm.py
@@@ -13,11 -13,11 +13,12 @@@
  #   See the License for the specific language governing permissions and
  #   limitations under the License.
  
--import sys
--import logging
  import base64
--
--sys.path.append("lib")
++from glob import glob
++import logging
++from pathlib import Path
++from string import Template
++import sys
  
  from ops.charm import CharmBase
  from ops.framework import StoredState, Object
@@@ -30,9 -30,9 +31,9 @@@ from ops.model import 
      WaitingStatus,
  )
  
--from glob import glob
--from pathlib import Path
--from string import Template
++
++sys.path.append("lib")
++
  
  logger = logging.getLogger(__name__)
  
@@@ -157,7 -157,7 +158,9 @@@ class NGUICharm(CharmBase)
                      },
                  }
              )
 +
+         logger.debug(files)
++
          spec = {
              "version": 2,
              "containers": [
diff --cc installers/charm/pla/src/charm.py
index e137394e,1fc6386f..785766de
--- a/installers/charm/pla/src/charm.py
+++ b/installers/charm/pla/src/charm.py
@@@ -13,10 -13,10 +13,11 @@@
  #   See the License for the specific language governing permissions and
  #   limitations under the License.
  
--import sys
++from glob import glob
  import logging
--
--sys.path.append("lib")
++from pathlib import Path
++from string import Template
++import sys
  
  from ops.charm import CharmBase
  from ops.framework import StoredState, Object
@@@ -27,9 -27,9 +28,9 @@@ from ops.model import 
      WaitingStatus,
  )
  
--from glob import glob
--from pathlib import Path
--from string import Template
++
++sys.path.append("lib")
++
  
  logger = logging.getLogger(__name__)