Update LoaderS with SetRateProfileRates support + update ansible scri…

…pt for debian
htrendev · Jul 1, 2020 · f135d87 · f135d87
1 parent a61b759
commit f135d87
Show file tree

Hide file tree

Showing 6 changed files with 209 additions and 166 deletions.
diff --git a/config/libconfig_json.go b/config/libconfig_json.go
@@ -470,6 +470,7 @@ type RouteSJsonCfg struct {
 type LoaderJsonDataType struct {
 	Type      *string
 	File_name *string
+	Flags     *[]string
 	Fields    *[]*FcTemplateJsonCfg
 }
 

diff --git a/config/loaderscfg.go b/config/loaderscfg.go
@@ -71,6 +71,7 @@ func NewDfltLoaderDataTypeConfig() *LoaderDataType {
 type LoaderDataType struct { //rename to LoaderDataType
 	Type     string
 	Filename string
+	Flags    utils.FlagsWithParams
 	Fields   []*FCTemplate
 }
 
@@ -84,6 +85,11 @@ func (self *LoaderDataType) loadFromJsonCfg(jsnCfg *LoaderJsonDataType, separato
 	if jsnCfg.File_name != nil {
 		self.Filename = *jsnCfg.File_name
 	}
+	if jsnCfg.Flags != nil {
+		if self.Flags, err = utils.FlagsWithParamsFromSlice(*jsnCfg.Flags); err != nil {
+			return
+		}
+	}
 	if jsnCfg.Fields != nil {
 		if self.Fields, err = FCTemplatesFromFCTemplatesJsonCfg(*jsnCfg.Fields, separator); err != nil {
 			return

diff --git a/data/ansible/deb_packages/main.yaml b/data/ansible/deb_packages/main.yaml
@@ -229,7 +229,7 @@
     # Move the file to PKG server
     - name: Copy the file to PKG server
       become: yes
-      shell: 'scp /var/packages/debian/incoming/{{ item }} {{ {{ pkgAddr }} }}:/tmp/'
+      shell: 'scp /var/packages/debian/incoming/{{ item }} {{ pkgAddr }}:/tmp/'
       args:
         chdir: /var/packages/debian/incoming/
       with_items: '{{ debFileName.stdout_lines }}'

diff --git a/data/ansible/rpm_packages/main.yaml b/data/ansible/rpm_packages/main.yaml
@@ -269,7 +269,7 @@
 
     # Move the file to PKG server
     - name: Copy the file to PKG server
-      shell: 'scp cgr_build/RPMS/x86_64/{{ item }} {{ pkgAddr }}:/tmp/'
+      shell: 'scp cgr_build/RPMS/x86_64/{{ item }} {{ pkgAddr }}:/tmp/' 
       with_items: '{{ rmpFileName.stdout_lines }}'
 
     - name: Sign with rpm --addsign the .rpm file