projects
/
osm
/
RO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug 2316: Fix for Unable to do vertical scaling when VM is in Shutdown state
[osm/RO.git]
/
RO-SDN-ietfl2vpn
/
osm_rosdn_ietfl2vpn
/
wimconn_ietfl2vpn.py
diff --git
a/RO-SDN-ietfl2vpn/osm_rosdn_ietfl2vpn/wimconn_ietfl2vpn.py
b/RO-SDN-ietfl2vpn/osm_rosdn_ietfl2vpn/wimconn_ietfl2vpn.py
index
1a581bc
..
2052bf1
100644
(file)
--- a/
RO-SDN-ietfl2vpn/osm_rosdn_ietfl2vpn/wimconn_ietfl2vpn.py
+++ b/
RO-SDN-ietfl2vpn/osm_rosdn_ietfl2vpn/wimconn_ietfl2vpn.py
@@
-30,12
+30,12
@@
This SDN/WIM connector implements the standard IETF RFC 8466 "A YANG Data
It receives the endpoints and the necessary details to request
the Layer 2 service.
"""
It receives the endpoints and the necessary details to request
the Layer 2 service.
"""
-import requests
-import uuid
+
import logging
import logging
-from osm_ro_plugin.sdnconn import SdnConnectorBase, SdnConnectorError
+import uuid
-"""Check layer where we move it"""
+from osm_ro_plugin.sdnconn import SdnConnectorBase, SdnConnectorError
+import requests
class WimconnectorIETFL2VPN(SdnConnectorBase):
class WimconnectorIETFL2VPN(SdnConnectorBase):
@@
-48,12
+48,16
@@
class WimconnectorIETFL2VPN(SdnConnectorBase):
"""
self.logger = logging.getLogger("ro.sdn.ietfl2vpn")
super().__init__(wim, wim_account, config, logger)
"""
self.logger = logging.getLogger("ro.sdn.ietfl2vpn")
super().__init__(wim, wim_account, config, logger)
+ if len(self.service_endpoint_mapping) == 0 and self.config.get(
+ "wim_port_mapping"
+ ):
+ self.service_endpoint_mapping = self.config.get("wim_port_mapping", [])
self.headers = {"Content-Type": "application/json"}
self.mappings = {
m["service_endpoint_id"]: m for m in self.service_endpoint_mapping
}
self.user = wim_account.get("user")
self.headers = {"Content-Type": "application/json"}
self.mappings = {
m["service_endpoint_id"]: m for m in self.service_endpoint_mapping
}
self.user = wim_account.get("user")
- self.passwd = wim_account.get("password
d
")
+ self.passwd = wim_account.get("password")
if self.user and self.passwd is not None:
self.auth = (self.user, self.passwd)
if self.user and self.passwd is not None:
self.auth = (self.user, self.passwd)
@@
-176,7
+180,7
@@
class WimconnectorIETFL2VPN(SdnConnectorBase):
uuid_l2vpn = str(uuid.uuid4())
vpn_service = {}
vpn_service["vpn-id"] = uuid_l2vpn
uuid_l2vpn = str(uuid.uuid4())
vpn_service = {}
vpn_service["vpn-id"] = uuid_l2vpn
- vpn_service["vpn-s
cv
-type"] = "vpws"
+ vpn_service["vpn-s
vc
-type"] = "vpws"
vpn_service["svc-topo"] = "any-to-any"
vpn_service["customer-name"] = "osm"
vpn_service_list = []
vpn_service["svc-topo"] = "any-to-any"
vpn_service["customer-name"] = "osm"
vpn_service_list = []
@@
-259,9
+263,9
@@
class WimconnectorIETFL2VPN(SdnConnectorBase):
site_network_accesses = {}
site_network_access_list = []
site_network_access_list.append(site_network_access)
site_network_accesses = {}
site_network_access_list = []
site_network_access_list.append(site_network_access)
- site_network_accesses[
- "ietf-l2vpn-svc:site-network-access"
- ] = site_network_access_list
+ site_network_accesses[
"ietf-l2vpn-svc:site-network-access"] = (
+ site_network_access_list
+ )
conn_info_d = {}
conn_info_d["site"] = connection_point_wan_info["service_mapping_info"][
"site-id"
conn_info_d = {}
conn_info_d["site"] = connection_point_wan_info["service_mapping_info"][
"site-id"
@@
-415,9
+419,9
@@
class WimconnectorIETFL2VPN(SdnConnectorBase):
site_network_accesses = {}
site_network_access_list = []
site_network_access_list.append(site_network_access)
site_network_accesses = {}
site_network_access_list = []
site_network_access_list.append(site_network_access)
- site_network_accesses[
- "ietf-l2vpn-svc:site-network-access"
- ] = site_network_access_list
+ site_network_accesses[
"ietf-l2vpn-svc:site-network-access"] = (
+ site_network_access_list
+ )
try:
endpoint_site_network_access_edit = (
try:
endpoint_site_network_access_edit = (