Skip to content

Commit 621b18a

Browse files
author
Adisorn Ermongkonchai
committed
update YDK playbooks to reflect new YDK path
1 parent 0c8392a commit 621b18a

17 files changed

+215
-16
lines changed

changes.diff

Lines changed: 198 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,198 @@
1+
diff --git a/local/ansible_env b/local/ansible_env
2+
index 7f916b9..55e79d7 100644
3+
--- a/local/ansible_env
4+
+++ b/local/ansible_env
5+
@@ -3,5 +3,6 @@ export IOSXRDIR=$BASEDIR/ansible/iosxr/iosxr-ansible
6+
export ANSIBLE_INVENTORY=$IOSXRDIR/local/ansible_hosts
7+
export ANSIBLE_LIBRARY=$IOSXRDIR/local/library
8+
export ANSIBLE_CONFIG=$IOSXRDIR/local/ansible_cfg
9+
-export YDK_DIR=$BASEDIR/ydk/ydk-py
10+
-export PYTHONPATH=$YDK_DIR:$IOSXRDIR/local/common
11+
+export YDK_DIR=$BASEDIR/ydk-py/cisco-ios-xr
12+
+export YDK_CORE_DIR=$BASEDIR/ydk-py/core
13+
+export PYTHONPATH=$YDK_DIR:$YDK_CORE_DIR:$IOSXRDIR/local/common
14+
diff --git a/local/common/iosxr_common.pyc b/local/common/iosxr_common.pyc
15+
index a98efb5..6890d11 100644
16+
Binary files a/local/common/iosxr_common.pyc and b/local/common/iosxr_common.pyc differ
17+
diff --git a/local/library/iosxr_show_install_active b/local/library/iosxr_show_install_active
18+
index 11feabb..eaf7a98 100644
19+
--- a/local/library/iosxr_show_install_active
20+
+++ b/local/library/iosxr_show_install_active
21+
@@ -21,7 +21,7 @@
22+
from ansible.module_utils.basic import *
23+
from ydk.providers import NetconfServiceProvider
24+
from ydk.services import CRUDService
25+
-from ydk.models.spirit.Cisco_IOS_XR_spirit_install_instmgr_oper import SoftwareInstall
26+
+from ydk.models.cisco_ios_xr.Cisco_IOS_XR_spirit_install_instmgr_oper import SoftwareInstall
27+
28+
def main():
29+
module = AnsibleModule(
30+
diff --git a/local/library/iosxr_show_install_committed b/local/library/iosxr_show_install_committed
31+
index 795d67b..5eea3a8 100644
32+
--- a/local/library/iosxr_show_install_committed
33+
+++ b/local/library/iosxr_show_install_committed
34+
@@ -21,7 +21,7 @@
35+
from ansible.module_utils.basic import *
36+
from ydk.providers import NetconfServiceProvider
37+
from ydk.services import CRUDService
38+
-from ydk.models.spirit.Cisco_IOS_XR_spirit_install_instmgr_oper import SoftwareInstall
39+
+from ydk.models.cisco_ios_xr.Cisco_IOS_XR_spirit_install_instmgr_oper import SoftwareInstall
40+
41+
def main():
42+
module = AnsibleModule(
43+
diff --git a/local/library/iosxr_show_install_inactive b/local/library/iosxr_show_install_inactive
44+
index ef0238f..9ce0367 100644
45+
--- a/local/library/iosxr_show_install_inactive
46+
+++ b/local/library/iosxr_show_install_inactive
47+
@@ -21,7 +21,7 @@
48+
from ansible.module_utils.basic import *
49+
from ydk.providers import NetconfServiceProvider
50+
from ydk.services import CRUDService
51+
-from ydk.models.spirit.Cisco_IOS_XR_spirit_install_instmgr_oper import SoftwareInstall
52+
+from ydk.models.cisco_ios_xr.Cisco_IOS_XR_spirit_install_instmgr_oper import SoftwareInstall
53+
54+
def main():
55+
module = AnsibleModule(
56+
diff --git a/local/library/iosxr_show_install_last_log b/local/library/iosxr_show_install_last_log
57+
index 4f90e1a..7438ee9 100644
58+
--- a/local/library/iosxr_show_install_last_log
59+
+++ b/local/library/iosxr_show_install_last_log
60+
@@ -21,7 +21,7 @@
61+
from ansible.module_utils.basic import *
62+
from ydk.providers import NetconfServiceProvider
63+
from ydk.services import CRUDService
64+
-from ydk.models.spirit.Cisco_IOS_XR_spirit_install_instmgr_oper import SoftwareInstall
65+
+from ydk.models.cisco_ios_xr.Cisco_IOS_XR_spirit_install_instmgr_oper import SoftwareInstall
66+
67+
def main():
68+
module = AnsibleModule(
69+
diff --git a/local/library/iosxr_show_install_log b/local/library/iosxr_show_install_log
70+
index b558fe4..5a6c578 100644
71+
--- a/local/library/iosxr_show_install_log
72+
+++ b/local/library/iosxr_show_install_log
73+
@@ -21,7 +21,7 @@
74+
from ansible.module_utils.basic import *
75+
from ydk.providers import NetconfServiceProvider
76+
from ydk.services import CRUDService
77+
-from ydk.models.spirit.Cisco_IOS_XR_spirit_install_instmgr_oper import SoftwareInstall
78+
+from ydk.models.cisco_ios_xr.Cisco_IOS_XR_spirit_install_instmgr_oper import SoftwareInstall
79+
80+
def main():
81+
module = AnsibleModule(
82+
diff --git a/local/library/iosxr_show_install_request b/local/library/iosxr_show_install_request
83+
index b234401..9bb357e 100644
84+
--- a/local/library/iosxr_show_install_request
85+
+++ b/local/library/iosxr_show_install_request
86+
@@ -21,7 +21,7 @@
87+
from ansible.module_utils.basic import *
88+
from ydk.providers import NetconfServiceProvider
89+
from ydk.services import CRUDService
90+
-from ydk.models.spirit.Cisco_IOS_XR_spirit_install_instmgr_oper import SoftwareInstall
91+
+from ydk.models.cisco_ios_xr.Cisco_IOS_XR_spirit_install_instmgr_oper import SoftwareInstall
92+
93+
def main():
94+
module = AnsibleModule(
95+
diff --git a/local/library/iosxr_show_install_version b/local/library/iosxr_show_install_version
96+
index f370ef6..635df11 100644
97+
--- a/local/library/iosxr_show_install_version
98+
+++ b/local/library/iosxr_show_install_version
99+
@@ -21,7 +21,7 @@
100+
from ansible.module_utils.basic import *
101+
from ydk.providers import NetconfServiceProvider
102+
from ydk.services import CRUDService
103+
-from ydk.models.spirit.Cisco_IOS_XR_spirit_install_instmgr_oper import SoftwareInstall
104+
+from ydk.models.cisco_ios_xr.Cisco_IOS_XR_spirit_install_instmgr_oper import SoftwareInstall
105+
import sys
106+
import logging
107+
108+
diff --git a/local/samples/ydk/ydk_show_install_active.yml b/local/samples/ydk/ydk_show_install_active.yml
109+
index e317a21..889d4d3 100644
110+
--- a/local/samples/ydk/ydk_show_install_active.yml
111+
+++ b/local/samples/ydk/ydk_show_install_active.yml
112+
@@ -4,7 +4,7 @@
113+
gather_facts: no
114+
115+
vars:
116+
- - ansible_ssh_pass: 'lab'
117+
+ - ansible_ssh_pass: 'cisco'
118+
119+
tasks:
120+
- iosxr_show_install_active:
121+
diff --git a/local/samples/ydk/ydk_show_install_committed.yml b/local/samples/ydk/ydk_show_install_committed.yml
122+
index 0d1dd98..c79702f 100644
123+
--- a/local/samples/ydk/ydk_show_install_committed.yml
124+
+++ b/local/samples/ydk/ydk_show_install_committed.yml
125+
@@ -4,7 +4,7 @@
126+
gather_facts: no
127+
128+
vars:
129+
- - ansible_ssh_pass: 'lab'
130+
+ - ansible_ssh_pass: 'cisco'
131+
132+
tasks:
133+
- iosxr_show_install_committed:
134+
diff --git a/local/samples/ydk/ydk_show_install_inactive.yml b/local/samples/ydk/ydk_show_install_inactive.yml
135+
index 3c47b2a..276daa0 100644
136+
--- a/local/samples/ydk/ydk_show_install_inactive.yml
137+
+++ b/local/samples/ydk/ydk_show_install_inactive.yml
138+
@@ -4,7 +4,7 @@
139+
gather_facts: no
140+
141+
vars:
142+
- - ansible_ssh_pass: 'lab'
143+
+ - ansible_ssh_pass: 'cisco'
144+
145+
tasks:
146+
- iosxr_show_install_inactive:
147+
diff --git a/local/samples/ydk/ydk_show_install_last_log.yml b/local/samples/ydk/ydk_show_install_last_log.yml
148+
index fc7cf9a..1b288ff 100644
149+
--- a/local/samples/ydk/ydk_show_install_last_log.yml
150+
+++ b/local/samples/ydk/ydk_show_install_last_log.yml
151+
@@ -4,7 +4,7 @@
152+
gather_facts: no
153+
154+
vars:
155+
- - ansible_ssh_pass: 'lab'
156+
+ - ansible_ssh_pass: 'cisco'
157+
158+
tasks:
159+
- iosxr_show_install_last_log:
160+
diff --git a/local/samples/ydk/ydk_show_install_log.yml b/local/samples/ydk/ydk_show_install_log.yml
161+
index 172586e..704acea 100644
162+
--- a/local/samples/ydk/ydk_show_install_log.yml
163+
+++ b/local/samples/ydk/ydk_show_install_log.yml
164+
@@ -4,7 +4,7 @@
165+
gather_facts: no
166+
167+
vars:
168+
- - ansible_ssh_pass: 'lab'
169+
+ - ansible_ssh_pass: 'cisco'
170+
171+
tasks:
172+
- iosxr_show_install_log:
173+
diff --git a/local/samples/ydk/ydk_show_install_request.yml b/local/samples/ydk/ydk_show_install_request.yml
174+
index a8ff199..7282c0a 100644
175+
--- a/local/samples/ydk/ydk_show_install_request.yml
176+
+++ b/local/samples/ydk/ydk_show_install_request.yml
177+
@@ -4,7 +4,7 @@
178+
gather_facts: no
179+
180+
vars:
181+
- - ansible_ssh_pass: 'lab'
182+
+ - ansible_ssh_pass: 'cisco'
183+
184+
tasks:
185+
- iosxr_show_install_request:
186+
diff --git a/local/samples/ydk/ydk_show_install_version.yml b/local/samples/ydk/ydk_show_install_version.yml
187+
index 2077c72..df7801e 100644
188+
--- a/local/samples/ydk/ydk_show_install_version.yml
189+
+++ b/local/samples/ydk/ydk_show_install_version.yml
190+
@@ -4,7 +4,7 @@
191+
gather_facts: no
192+
193+
vars:
194+
- - ansible_ssh_pass: 'lab'
195+
+ - ansible_ssh_pass: 'cisco'
196+
197+
tasks:
198+
- iosxr_show_install_version:

local/ansible_env

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@ export IOSXRDIR=$BASEDIR/ansible/iosxr/iosxr-ansible
33
export ANSIBLE_INVENTORY=$IOSXRDIR/local/ansible_hosts
44
export ANSIBLE_LIBRARY=$IOSXRDIR/local/library
55
export ANSIBLE_CONFIG=$IOSXRDIR/local/ansible_cfg
6-
export YDK_DIR=$BASEDIR/ydk/ydk-py
7-
export PYTHONPATH=$YDK_DIR:$IOSXRDIR/local/common
6+
export YDK_DIR=$BASEDIR/ydk-py/cisco-ios-xr
7+
export YDK_CORE_DIR=$BASEDIR/ydk-py/core
8+
export PYTHONPATH=$YDK_DIR:$YDK_CORE_DIR:$IOSXRDIR/local/common

local/common/iosxr_common.pyc

0 Bytes
Binary file not shown.

local/library/iosxr_show_install_active

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
from ansible.module_utils.basic import *
2222
from ydk.providers import NetconfServiceProvider
2323
from ydk.services import CRUDService
24-
from ydk.models.spirit.Cisco_IOS_XR_spirit_install_instmgr_oper import SoftwareInstall
24+
from ydk.models.cisco_ios_xr.Cisco_IOS_XR_spirit_install_instmgr_oper import SoftwareInstall
2525

2626
def main():
2727
module = AnsibleModule(

local/library/iosxr_show_install_committed

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
from ansible.module_utils.basic import *
2222
from ydk.providers import NetconfServiceProvider
2323
from ydk.services import CRUDService
24-
from ydk.models.spirit.Cisco_IOS_XR_spirit_install_instmgr_oper import SoftwareInstall
24+
from ydk.models.cisco_ios_xr.Cisco_IOS_XR_spirit_install_instmgr_oper import SoftwareInstall
2525

2626
def main():
2727
module = AnsibleModule(

local/library/iosxr_show_install_inactive

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
from ansible.module_utils.basic import *
2222
from ydk.providers import NetconfServiceProvider
2323
from ydk.services import CRUDService
24-
from ydk.models.spirit.Cisco_IOS_XR_spirit_install_instmgr_oper import SoftwareInstall
24+
from ydk.models.cisco_ios_xr.Cisco_IOS_XR_spirit_install_instmgr_oper import SoftwareInstall
2525

2626
def main():
2727
module = AnsibleModule(

local/library/iosxr_show_install_last_log

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
from ansible.module_utils.basic import *
2222
from ydk.providers import NetconfServiceProvider
2323
from ydk.services import CRUDService
24-
from ydk.models.spirit.Cisco_IOS_XR_spirit_install_instmgr_oper import SoftwareInstall
24+
from ydk.models.cisco_ios_xr.Cisco_IOS_XR_spirit_install_instmgr_oper import SoftwareInstall
2525

2626
def main():
2727
module = AnsibleModule(

local/library/iosxr_show_install_log

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
from ansible.module_utils.basic import *
2222
from ydk.providers import NetconfServiceProvider
2323
from ydk.services import CRUDService
24-
from ydk.models.spirit.Cisco_IOS_XR_spirit_install_instmgr_oper import SoftwareInstall
24+
from ydk.models.cisco_ios_xr.Cisco_IOS_XR_spirit_install_instmgr_oper import SoftwareInstall
2525

2626
def main():
2727
module = AnsibleModule(

local/library/iosxr_show_install_request

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
from ansible.module_utils.basic import *
2222
from ydk.providers import NetconfServiceProvider
2323
from ydk.services import CRUDService
24-
from ydk.models.spirit.Cisco_IOS_XR_spirit_install_instmgr_oper import SoftwareInstall
24+
from ydk.models.cisco_ios_xr.Cisco_IOS_XR_spirit_install_instmgr_oper import SoftwareInstall
2525

2626
def main():
2727
module = AnsibleModule(

local/library/iosxr_show_install_version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
from ansible.module_utils.basic import *
2222
from ydk.providers import NetconfServiceProvider
2323
from ydk.services import CRUDService
24-
from ydk.models.spirit.Cisco_IOS_XR_spirit_install_instmgr_oper import SoftwareInstall
24+
from ydk.models.cisco_ios_xr.Cisco_IOS_XR_spirit_install_instmgr_oper import SoftwareInstall
2525
import sys
2626
import logging
2727

local/samples/ydk/ydk_show_install_active.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
gather_facts: no
55

66
vars:
7-
- ansible_ssh_pass: 'lab'
7+
- ansible_ssh_pass: 'cisco'
88

99
tasks:
1010
- iosxr_show_install_active:

local/samples/ydk/ydk_show_install_committed.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
gather_facts: no
55

66
vars:
7-
- ansible_ssh_pass: 'lab'
7+
- ansible_ssh_pass: 'cisco'
88

99
tasks:
1010
- iosxr_show_install_committed:

local/samples/ydk/ydk_show_install_inactive.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
gather_facts: no
55

66
vars:
7-
- ansible_ssh_pass: 'lab'
7+
- ansible_ssh_pass: 'cisco'
88

99
tasks:
1010
- iosxr_show_install_inactive:

local/samples/ydk/ydk_show_install_last_log.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
gather_facts: no
55

66
vars:
7-
- ansible_ssh_pass: 'lab'
7+
- ansible_ssh_pass: 'cisco'
88

99
tasks:
1010
- iosxr_show_install_last_log:

local/samples/ydk/ydk_show_install_log.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
gather_facts: no
55

66
vars:
7-
- ansible_ssh_pass: 'lab'
7+
- ansible_ssh_pass: 'cisco'
88

99
tasks:
1010
- iosxr_show_install_log:

local/samples/ydk/ydk_show_install_request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
gather_facts: no
55

66
vars:
7-
- ansible_ssh_pass: 'lab'
7+
- ansible_ssh_pass: 'cisco'
88

99
tasks:
1010
- iosxr_show_install_request:

local/samples/ydk/ydk_show_install_version.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
gather_facts: no
55

66
vars:
7-
- ansible_ssh_pass: 'lab'
7+
- ansible_ssh_pass: 'cisco'
88

99
tasks:
1010
- iosxr_show_install_version:

0 commit comments

Comments
 (0)