removing unused code and moving so params

Issue-ID: TEST-171
Change-Id: Id93c60923a2830c4054108f898057d7258b9b4c2
Signed-off-by: DR695H <dr695h@att.com>

4 files changed, 25 insertions, 94 deletions

diff --git a/robotframework-onap/ONAPLibrary/TemplatingKeywords.py b/robotframework-onap/ONAPLibrary/TemplatingKeywords.py
index 0e2a597..62d2b55 100644
--- a/robotframework-onap/ONAPLibrary/TemplatingKeywords.py
+++ b/robotframework-onap/ONAPLibrary/TemplatingKeywords.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from jinja2 import Environment, FileSystemLoader, select_autoescape
+from jinja2 import Environment, FileSystemLoader
 from robot import utils
 from robot.api.deco import keyword
 from string import Template
@@ -30,8 +30,7 @@ class TemplatingKeywords(object):
     def create_environment(self, alias, templates_folder):
         """create an environment under an alias for tempalte location"""
         jinja_env = Environment(
-            loader=FileSystemLoader(templates_folder),
-            autoescape=select_autoescape(['html', 'xml'])
+            loader=FileSystemLoader(templates_folder)
         )
         self._cache.register(jinja_env, alias=alias)
 
diff --git a/robotframework-onap/setup.py b/robotframework-onap/setup.py
index e48f57e..192e171 100644
--- a/robotframework-onap/setup.py
+++ b/robotframework-onap/setup.py
@@ -33,8 +33,6 @@ setup(
         'robotframework',
         'deepdiff',
         'Jinja2',
-        # 'urllib3', # requests gets upset if this is specified since they only work with a very
-        # narrow range of urlib3. if for some reason we remove requests, readd this back in
         'six',
         'requests',
         'future',
diff --git a/robotframework-onap/vcpeutils/SoUtils.py b/robotframework-onap/vcpeutils/SoUtils.py
index 02b34e5..529859d 100755
--- a/robotframework-onap/vcpeutils/SoUtils.py
+++ b/robotframework-onap/vcpeutils/SoUtils.py
@@ -15,8 +15,20 @@ class SoUtils:
         self.tenant_id = None  # set later
         self.logger = logger
         self.vcpecommon = VcpeCommon()
-        self.api_version = 'v4'
-        self.service_req_api_url = self.vcpecommon.so_req_api_url[self.api_version]
+
+        # SO urls, note: do NOT add a '/' at the end of the url
+        self.so_nbi_port = '8080'
+        self.so_host = 'so.onap'
+        self.so_si_path = '/onap/so/infra/serviceInstantiation/v7/serviceInstances'
+        self.so_orch_path = '/onap/so/infra/orchestrationRequests/v6'
+        self.service_req_api_url = 'http://' + self.so_host + ':' + self.so_nbi_port + self.so_si_path
+        self.so_check_progress_api_url = 'http://' + self.so_host + ':' + self.so_nbi_port + self.so_orch_path
+        self.so_userpass = 'InfraPortalClient', 'password1$'
+        self.so_headers = {'Content-Type': 'application/json', 'Accept': 'application/json'}
+        self.so_db_name = 'catalogdb'
+        self.so_db_user = 'root'
+        self.so_db_pass = 'password'
+        self.so_db_port = '30252'
 
     def submit_create_req(self, req_json, req_type, service_instance_id=None, vnf_instance_id=None):
         """
@@ -43,7 +55,7 @@ class SoUtils:
             return None, None
 
         self.logger.info(url)
-        r = requests.post(url, headers=self.vcpecommon.so_headers, auth=self.vcpecommon.so_userpass, json=req_json)
+        r = requests.post(url, headers=self.so_headers, auth=self.so_userpass, json=req_json)
         self.logger.debug(r)
         response = r.json()
 
@@ -61,11 +73,11 @@ class SoUtils:
             self.logger.error('Error when checking SO request progress, invalid request ID: ' + req_id)
             return False
         duration = 0.0
-        url = self.vcpecommon.so_check_progress_api_url + '/' + req_id
+        url = self.so_check_progress_api_url + '/' + req_id
 
         while True:
             time.sleep(interval)
-            r = requests.get(url, headers=self.vcpecommon.so_headers, auth=self.vcpecommon.so_userpass)
+            r = requests.get(url, headers=self.so_headers, auth=self.so_userpass)
             response = r.json()
 
             duration += interval
@@ -337,4 +349,4 @@ class SoUtils:
                 self.logger.error('Failed to create VF Module {0}.'.format(vfmodule_instance_name))
                 return None
 
-        return svc_instance_id
\ No newline at end of file
+        return svc_instance_id
diff --git a/robotframework-onap/vcpeutils/vcpecommon.py b/robotframework-onap/vcpeutils/vcpecommon.py
index c629b40..87a3562 100755
--- a/robotframework-onap/vcpeutils/vcpecommon.py
+++ b/robotframework-onap/vcpeutils/vcpecommon.py
@@ -1,11 +1,7 @@
 import json
 import logging
 import os
-import pickle
-import re
 import sys
-
-import ipaddress
 import requests
 
 
@@ -16,23 +12,22 @@ class VcpeCommon:
     external_net_prefix_len = 16
     #############################################################################################
     # set the openstack cloud access credentials here
-    oom_mode = True
 
     cloud = {
         '--os-auth-url': 'http://10.12.25.2:5000',
         '--os-username': 'kxi',
         '--os-user-domain-id': 'default',
         '--os-project-domain-id': 'default',
-        '--os-tenant-id': '09d8566ea45e43aa974cf447ed591d77' if oom_mode else '1e097c6713e74fd7ac8e4295e605ee1e',
+        '--os-tenant-id': '09d8566ea45e43aa974cf447ed591d77',
         '--os-region-name': 'RegionOne',
         '--os-password': 'n3JhGMGuDzD8',
-        '--os-project-domain-name': 'Integration-SB-03' if oom_mode else 'Integration-SB-07',
+        '--os-project-domain-name': 'Integration-SB-03',
         '--os-identity-api-version': '3'
     }
 
     common_preload_config = {
-        'oam_onap_net': 'oam_network_2No2' if oom_mode else 'oam_onap_lAky',
-        'oam_onap_subnet': 'oam_network_2No2' if oom_mode else 'oam_onap_lAky',
+        'oam_onap_net': 'oam_network_2No2',
+        'oam_onap_subnet': 'oam_network_2No2',
         'public_net': 'external',
         'public_net_id': '971040b2-7059-49dc-b220-4fab50cb2ad4'
     }
@@ -90,7 +85,7 @@ class VcpeCommon:
         #self.mr_ip_port = '30227'
         self.mr_ip_port = '3904'
         #self.so_nbi_port = '30277' if self.oom_mode else '8080'
-        self.so_nbi_port = '8080' 
+
         #self.sdnc_preloading_port = '30202' if self.oom_mode else '8282'
         self.sdnc_preloading_port = '8282'
         #self.aai_query_port = '30233' if self.oom_mode else '8443'
@@ -151,18 +146,6 @@ class VcpeCommon:
         self.sdnc_ar_cleanup_url = 'http://' + self.hosts['sdnc'] + ':' + self.sdnc_preloading_port + \
                                    '/restconf/config/GENERIC-RESOURCE-API:'
 
-        #############################################################################################
-        # SO urls, note: do NOT add a '/' at the end of the url
-        self.so_req_api_url = {'v4': 'http://' + self.hosts['so'] + ':' + self.so_nbi_port + '/onap/so/infra/serviceInstantiation/v7/serviceInstances',
-                           'v5': 'http://' + self.hosts['so'] + ':' + self.so_nbi_port + '/onap/so/infra/serviceInstantiation/v7/serviceInstances'}
-        self.so_check_progress_api_url = 'http://' + self.hosts['so'] + ':' + self.so_nbi_port + '/onap/so/infra/orchestrationRequests/v6'
-        self.so_userpass = 'InfraPortalClient', 'password1$'
-        self.so_headers = {'Content-Type': 'application/json', 'Accept': 'application/json'}
-        self.so_db_name = 'catalogdb'
-        self.so_db_user = 'root'
-        self.so_db_pass = 'password'
-        self.so_db_port = '30252' if self.oom_mode else '32769'
-
         self.vpp_inf_url = 'http://{0}:8183/restconf/config/ietf-interfaces:interfaces'
         self.vpp_api_headers = {'Content-Type': 'application/json', 'Accept': 'application/json'}
         self.vpp_api_userpass = ('admin', 'admin')
@@ -259,64 +242,3 @@ class VcpeCommon:
         self.logger.debug('aai query: ' + url)
         self.logger.debug('aai response:\n' + json.dumps(response, indent=4, sort_keys=True))
         return 'result-data' in response
-
-    @staticmethod
-    def extract_ip_from_str(net_addr, net_addr_len, sz):
-        """
-        :param net_addr:  e.g. 10.5.12.0
-        :param net_addr_len: e.g. 24
-        :param sz: a string
-        :return: the first IP address matching the network, e.g. 10.5.12.3
-        """
-        network = ipaddress.ip_network(str('{0}/{1}'.format(net_addr, net_addr_len)), strict=False)
-        ip_list = re.findall(r'[0-9]+(?:\.[0-9]+){3}', sz)
-        for ip in ip_list:
-            this_net = ipaddress.ip_network(str('{0}/{1}'.format(ip, net_addr_len)), strict=False)
-            if this_net == network:
-                return str(ip)
-        return None
-
-
-
-    @staticmethod
-    def save_object(obj, filepathname):
-        with open(filepathname, 'wb') as fout:
-            pickle.dump(obj, fout)
-
-    @staticmethod
-    def load_object(filepathname):
-        with open(filepathname, 'rb') as fin:
-            return pickle.load(fin)
-
-    @staticmethod
-    def increase_ip_address_or_vni_in_template(vnf_template_file, vnf_parameter_name_list):
-        with open(vnf_template_file) as json_input:
-            json_data = json.load(json_input)
-            param_list = json_data['VNF-API:input']['VNF-API:vnf-topology-information']['VNF-API:vnf-parameters']
-            for param in param_list:
-                if param['vnf-parameter-name'] in vnf_parameter_name_list:
-                    ipaddr_or_vni = param['vnf-parameter-value'].split('.')
-                    number = int(ipaddr_or_vni[-1])
-                    if 254 == number:
-                        number = 10
-                    else:
-                        number = number + 1
-                    ipaddr_or_vni[-1] = str(number)
-                    param['vnf-parameter-value'] = '.'.join(ipaddr_or_vni)
-
-        assert json_data is not None
-        with open(vnf_template_file, 'w') as json_output:
-            json.dump(json_data, json_output, indent=4, sort_keys=True)
-
-    def save_preload_data(self, preload_data):
-        self.save_object(preload_data, self.preload_dict_file)
-
-    def load_preload_data(self):
-        return self.load_object(self.preload_dict_file)
-
-    def save_vgmux_vnf_name(self, vgmux_vnf_name):
-        self.save_object(vgmux_vnf_name, self.vgmux_vnf_name_file)
-
-    def load_vgmux_vnf_name(self):
-        return self.load_object(self.vgmux_vnf_name_file)
-