From d7cad8ea121162dd54722f2c4db72c458dfcf02d Mon Sep 17 00:00:00 2001
From: Viacheslav Hletenko <v.gletenko@vyos.io>
Date: Tue, 7 Jan 2025 23:30:14 +0000
Subject: Add XML CLI for conf and op-mode

---
 interface-definitions/include/version/vpp-version.xml.i | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 interface-definitions/include/version/vpp-version.xml.i

(limited to 'interface-definitions/include/version')

diff --git a/interface-definitions/include/version/vpp-version.xml.i b/interface-definitions/include/version/vpp-version.xml.i
new file mode 100644
index 000000000..96a69c92f
--- /dev/null
+++ b/interface-definitions/include/version/vpp-version.xml.i
@@ -0,0 +1,3 @@
+<!-- include start from include/version/vpp-version.xml.i -->
+<syntaxVersion component='vpp' version='1'></syntaxVersion>
+<!-- include end -->
\ No newline at end of file
-- 
cgit v1.2.3


From cedfce8899cb3dc406922c68afc7e31b8edc01ae Mon Sep 17 00:00:00 2001
From: Viacheslav Hletenko <v.gletenko@vyos.io>
Date: Wed, 8 Jan 2025 15:56:07 +0000
Subject: Move component version to conflict-components or dynamic

---
 conflict-components/version/vpp-version.xml.i           | 3 +++
 conflict-components/xml-component-version.xml.in        | 4 ++++
 interface-definitions/include/version/vpp-version.xml.i | 3 ---
 interface-definitions/xml-component-version.xml.in      | 4 ----
 4 files changed, 7 insertions(+), 7 deletions(-)
 create mode 100644 conflict-components/version/vpp-version.xml.i
 create mode 100644 conflict-components/xml-component-version.xml.in
 delete mode 100644 interface-definitions/include/version/vpp-version.xml.i
 delete mode 100644 interface-definitions/xml-component-version.xml.in

(limited to 'interface-definitions/include/version')

diff --git a/conflict-components/version/vpp-version.xml.i b/conflict-components/version/vpp-version.xml.i
new file mode 100644
index 000000000..96a69c92f
--- /dev/null
+++ b/conflict-components/version/vpp-version.xml.i
@@ -0,0 +1,3 @@
+<!-- include start from include/version/vpp-version.xml.i -->
+<syntaxVersion component='vpp' version='1'></syntaxVersion>
+<!-- include end -->
\ No newline at end of file
diff --git a/conflict-components/xml-component-version.xml.in b/conflict-components/xml-component-version.xml.in
new file mode 100644
index 000000000..ae137d435
--- /dev/null
+++ b/conflict-components/xml-component-version.xml.in
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<interfaceDefinition>
+  #include <include/version/vpp-version.xml.i>
+</interfaceDefinition>
diff --git a/interface-definitions/include/version/vpp-version.xml.i b/interface-definitions/include/version/vpp-version.xml.i
deleted file mode 100644
index 96a69c92f..000000000
--- a/interface-definitions/include/version/vpp-version.xml.i
+++ /dev/null
@@ -1,3 +0,0 @@
-<!-- include start from include/version/vpp-version.xml.i -->
-<syntaxVersion component='vpp' version='1'></syntaxVersion>
-<!-- include end -->
\ No newline at end of file
diff --git a/interface-definitions/xml-component-version.xml.in b/interface-definitions/xml-component-version.xml.in
deleted file mode 100644
index ae137d435..000000000
--- a/interface-definitions/xml-component-version.xml.in
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0"?>
-<interfaceDefinition>
-  #include <include/version/vpp-version.xml.i>
-</interfaceDefinition>
-- 
cgit v1.2.3


From d1d170c20fbec8f10f0eec440edae7655789e923 Mon Sep 17 00:00:00 2001
From: Viacheslav Hletenko <v.gletenko@vyos.io>
Date: Thu, 9 Jan 2025 17:06:19 +0000
Subject: Remove conflict-components

---
 conflict-components/version/vpp-version.xml.i           | 3 ---
 conflict-components/xml-component-version.xml.in        | 4 ----
 interface-definitions/include/version/vpp-version.xml.i | 3 +++
 3 files changed, 3 insertions(+), 7 deletions(-)
 delete mode 100644 conflict-components/version/vpp-version.xml.i
 delete mode 100644 conflict-components/xml-component-version.xml.in
 create mode 100644 interface-definitions/include/version/vpp-version.xml.i

(limited to 'interface-definitions/include/version')

diff --git a/conflict-components/version/vpp-version.xml.i b/conflict-components/version/vpp-version.xml.i
deleted file mode 100644
index 96a69c92f..000000000
--- a/conflict-components/version/vpp-version.xml.i
+++ /dev/null
@@ -1,3 +0,0 @@
-<!-- include start from include/version/vpp-version.xml.i -->
-<syntaxVersion component='vpp' version='1'></syntaxVersion>
-<!-- include end -->
\ No newline at end of file
diff --git a/conflict-components/xml-component-version.xml.in b/conflict-components/xml-component-version.xml.in
deleted file mode 100644
index ae137d435..000000000
--- a/conflict-components/xml-component-version.xml.in
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0"?>
-<interfaceDefinition>
-  #include <include/version/vpp-version.xml.i>
-</interfaceDefinition>
diff --git a/interface-definitions/include/version/vpp-version.xml.i b/interface-definitions/include/version/vpp-version.xml.i
new file mode 100644
index 000000000..96a69c92f
--- /dev/null
+++ b/interface-definitions/include/version/vpp-version.xml.i
@@ -0,0 +1,3 @@
+<!-- include start from include/version/vpp-version.xml.i -->
+<syntaxVersion component='vpp' version='1'></syntaxVersion>
+<!-- include end -->
\ No newline at end of file
-- 
cgit v1.2.3