projects
/
osm
/
SO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update from RIFT as of 696b75d2fe9fb046261b08c616f1bcf6c0b54a9b second try
[osm/SO.git]
/
rwlaunchpad
/
test
/
utest_nsr_handler.py
diff --git
a/rwlaunchpad/test/utest_nsr_handler.py
b/rwlaunchpad/test/utest_nsr_handler.py
index
ffab929
..
40049b3
100755
(executable)
--- a/
rwlaunchpad/test/utest_nsr_handler.py
+++ b/
rwlaunchpad/test/utest_nsr_handler.py
@@
-18,13
+18,13
@@
import argparse
import asyncio
import argparse
import asyncio
+import gi
import logging
import os
import sys
import time
import unittest
import uuid
import logging
import os
import sys
import time
import unittest
import uuid
-
import xmlrunner
import gi.repository.RwDts as rwdts
import xmlrunner
import gi.repository.RwDts as rwdts
@@
-38,6
+38,9
@@
import gi.repository.RwLaunchpadYang as launchpadyang
import rift.tasklets
import rift.test.dts
import rift.tasklets
import rift.test.dts
+gi.require_version('RwKeyspec', '1.0')
+from gi.repository.RwKeyspec import quoted_key
+
import mano_ut
import mano_ut
@@
-47,8
+50,8
@@
if sys.version_info < (3, 4, 4):
class NsrDtsHandler(object):
""" The network service DTS handler """
class NsrDtsHandler(object):
""" The network service DTS handler """
- NSR_XPATH = "C,/nsr:ns-instance-config/nsr:nsr"
- SCALE_INSTANCE_XPATH = "C,/nsr:ns-instance-config/nsr:nsr/nsr:scaling-group/nsr:instance"
+ NSR_XPATH = "C,/
rw-project:project/
nsr:ns-instance-config/nsr:nsr"
+ SCALE_INSTANCE_XPATH = "C,/
rw-project:project/
nsr:ns-instance-config/nsr:nsr/nsr:scaling-group/nsr:instance"
def __init__(self, dts, log, loop, nsm):
self._dts = dts
def __init__(self, dts, log, loop, nsm):
self._dts = dts
@@
-66,12
+69,12
@@
class NsrDtsHandler(object):
def get_scale_group_instances(self, nsr_id, group_name):
def nsr_id_from_keyspec(ks):
def get_scale_group_instances(self, nsr_id, group_name):
def nsr_id_from_keyspec(ks):
- nsr_path_entry = NsrYang.YangData_
Nsr
_NsInstanceConfig_Nsr.schema().keyspec_to_entry(ks)
+ nsr_path_entry = NsrYang.YangData_
RwProject_Project
_NsInstanceConfig_Nsr.schema().keyspec_to_entry(ks)
nsr_id = nsr_path_entry.key00.id
return nsr_id
def group_name_from_keyspec(ks):
nsr_id = nsr_path_entry.key00.id
return nsr_id
def group_name_from_keyspec(ks):
- group_path_entry = NsrYang.YangData_
Nsr
_NsInstanceConfig_Nsr_ScalingGroup.schema().keyspec_to_entry(ks)
+ group_path_entry = NsrYang.YangData_
RwProject_Project
_NsInstanceConfig_Nsr_ScalingGroup.schema().keyspec_to_entry(ks)
group_name = group_path_entry.key00.scaling_group_name_ref
return group_name
group_name = group_path_entry.key00.scaling_group_name_ref
return group_name
@@
-95,12
+98,12
@@
class NsrDtsHandler(object):
""" Register for Nsr create/update/delete/read requests from dts """
def nsr_id_from_keyspec(ks):
""" Register for Nsr create/update/delete/read requests from dts """
def nsr_id_from_keyspec(ks):
- nsr_path_entry = NsrYang.YangData_
Nsr
_NsInstanceConfig_Nsr.schema().keyspec_to_entry(ks)
+ nsr_path_entry = NsrYang.YangData_
RwProject_Project
_NsInstanceConfig_Nsr.schema().keyspec_to_entry(ks)
nsr_id = nsr_path_entry.key00.id
return nsr_id
def group_name_from_keyspec(ks):
nsr_id = nsr_path_entry.key00.id
return nsr_id
def group_name_from_keyspec(ks):
- group_path_entry = NsrYang.YangData_
Nsr
_NsInstanceConfig_Nsr_ScalingGroup.schema().keyspec_to_entry(ks)
+ group_path_entry = NsrYang.YangData_
RwProject_Project
_NsInstanceConfig_Nsr_ScalingGroup.schema().keyspec_to_entry(ks)
group_name = group_path_entry.key00.scaling_group_name_ref
return group_name
group_name = group_path_entry.key00.scaling_group_name_ref
return group_name
@@
-327,16
+330,16
@@
class NsrDtsHandler(object):
class XPaths(object):
@staticmethod
def nsr_config(nsr_id=None):
class XPaths(object):
@staticmethod
def nsr_config(nsr_id=None):
- return ("C,/nsr:ns-instance-config/nsr:nsr" +
- ("[nsr:id=
'{}']".format(nsr_id
) if nsr_id is not None else ""))
+ return ("C,/
rw-project:project/
nsr:ns-instance-config/nsr:nsr" +
+ ("[nsr:id=
{}]".format(quoted_key(nsr_id)
) if nsr_id is not None else ""))
def scaling_group_instance(nsr_id, group_name, instance_id):
def scaling_group_instance(nsr_id, group_name, instance_id):
- return ("C,/nsr:ns-instance-config/nsr:nsr" +
- "[nsr:id=
'{}']".format(nsr_id
) +
+ return ("C,/
rw-project:project/
nsr:ns-instance-config/nsr:nsr" +
+ "[nsr:id=
{}]".format(quoted_key(nsr_id)
) +
"/nsr:scaling-group" +
"/nsr:scaling-group" +
- "[nsr:scaling-group-name-ref=
'{}']".format(group_name
) +
+ "[nsr:scaling-group-name-ref=
{}]".format(quoted_key(group_name)
) +
"/nsr:instance" +
"/nsr:instance" +
- "[nsr:id=
'{}']".format(instance_id
)
+ "[nsr:id=
{}]".format(quoted_key(instance_id)
)
)
)
@@
-377,7
+380,7
@@
class NsrHandlerTestCase(rift.test.dts.AbstractDTSTest):
block = xact.block_create()
block.add_query_update(
XPaths.nsr_config(nsr1_uuid),
block = xact.block_create()
block.add_query_update(
XPaths.nsr_config(nsr1_uuid),
- NsrYang.YangData_
Nsr
_NsInstanceConfig_Nsr(id=nsr1_uuid, name="fu"),
+ NsrYang.YangData_
RwProject_Project
_NsInstanceConfig_Nsr(id=nsr1_uuid, name="fu"),
flags=rwdts.XactFlag.ADVISE | rwdts.XactFlag.TRACE,
)
yield from block.execute(now=True)
flags=rwdts.XactFlag.ADVISE | rwdts.XactFlag.TRACE,
)
yield from block.execute(now=True)
@@
-388,7
+391,7
@@
class NsrHandlerTestCase(rift.test.dts.AbstractDTSTest):
block = xact.block_create()
block.add_query_update(
XPaths.scaling_group_instance(nsr1_uuid, "group", 1234),
block = xact.block_create()
block.add_query_update(
XPaths.scaling_group_instance(nsr1_uuid, "group", 1234),
- NsrYang.YangData_
Nsr
_NsInstanceConfig_Nsr_ScalingGroup_Instance(id=1234),
+ NsrYang.YangData_
RwProject_Project
_NsInstanceConfig_Nsr_ScalingGroup_Instance(id=1234),
flags=rwdts.XactFlag.ADVISE | rwdts.XactFlag.TRACE,
)
yield from block.execute(now=True)
flags=rwdts.XactFlag.ADVISE | rwdts.XactFlag.TRACE,
)
yield from block.execute(now=True)
@@
-409,7
+412,7
@@
class NsrHandlerTestCase(rift.test.dts.AbstractDTSTest):
block = xact.block_create()
block.add_query_create(
XPaths.scaling_group_instance(nsr1_uuid, "group", 12345),
block = xact.block_create()
block.add_query_create(
XPaths.scaling_group_instance(nsr1_uuid, "group", 12345),
- NsrYang.YangData_
Nsr
_NsInstanceConfig_Nsr_ScalingGroup_Instance(id=12345),
+ NsrYang.YangData_
RwProject_Project
_NsInstanceConfig_Nsr_ScalingGroup_Instance(id=12345),
flags=rwdts.XactFlag.ADVISE | rwdts.XactFlag.TRACE,
)
yield from block.execute(now=True)
flags=rwdts.XactFlag.ADVISE | rwdts.XactFlag.TRACE,
)
yield from block.execute(now=True)
@@
-427,7
+430,7
@@
class NsrHandlerTestCase(rift.test.dts.AbstractDTSTest):
block = xact.block_create()
block.add_query_update(
XPaths.nsr_config(nsr2_uuid),
block = xact.block_create()
block.add_query_update(
XPaths.nsr_config(nsr2_uuid),
- NsrYang.YangData_
Nsr
_NsInstanceConfig_Nsr(id=nsr2_uuid, name="fu2"),
+ NsrYang.YangData_
RwProject_Project
_NsInstanceConfig_Nsr(id=nsr2_uuid, name="fu2"),
flags=rwdts.XactFlag.ADVISE | rwdts.XactFlag.TRACE,
)
yield from block.execute(now=True)
flags=rwdts.XactFlag.ADVISE | rwdts.XactFlag.TRACE,
)
yield from block.execute(now=True)